Please test: postgresql-8.1.4-1 (new layout)

Please test: postgresql-8.1.4-1 (new layout)

[Reini Urban]

[-- Attachment #1: Type: text/plain, Size: 863 bytes --]

As advertised I split up the monolithic postgresql package into a
debian-like layout, just multiple parallel installations are not yet
supported.
The only changes from debian are non-versioned names, -dev renamed to
-devel to be consistent with our naming, and postgresql-server-dev
renamed to postgresql-devel.

I'd appreciate external testing esp. from the php and xemacs
maintainers, so that they can fix their setup.hint's to include only the
smaller libpq4.

Max,
esp. for your php setup.hint: libpq4 instead of postgresql

You can also add "http://xarch.tu-graz.ac.at/publ/cygwin/" to your
mirror site to install the as test marked libpq4-8.1.4 and
postgresql-8.1.4 packages. [Exp]

I've created various backwards compatible libpq's:
libpq3-7.4.5
libpq4-8.0.7
libpq4-8.1.4

-- 
Reini Urban
http://phpwiki.org/
http://helsinki.at/  http://spacemovie.mur.at/

[-- Attachment #2: get.sh --]
[-- Type: text/plain, Size: 2467 bytes --]

# create the new postgresql 8.1.4 layout and download it
mkdir libecpg-compat1 \
libecpg-compat2 \
libecpg-devel \
libecpg4 \
libecpg5 \
libpgtypes1 \
libpgtypes2 \
libpq-devel \
libpq3 \
libpq4 \
postgresql-client \
postgresql-contrib \
postgresql-devel \
postgresql-doc \
postgresql-plperl \
postgresql-plpython

url="http://xarch.tu-graz.ac.at/publ/cygwin/release/postgresql"

wget $url/setup.hint
wget $url/$url/postgresql-8.1.4-1-src.tar.bz2
wget $url/$url/postgresql-8.1.4-1.tar.bz2

cd libecpg-compat1
wget $url/libecpg-compat1/libecpg_compat1-7.4.5-1.tar.bz2
wget $url/libecpg-compat1/setup.hint

cd ../libecpg-compat2
wget $url/libecpg-compat2/libecpg-compat2-8.1.4-1.tar.bz2
wget $url/libecpg-compat2/setup.hint

cd ../libecpg-devel
wget $url/libecpg-devel/libecpg-devel-8.1.4-1.tar.bz2
wget $url/libecpg-devel/setup.hint

cd ../libecpg4
wget $url/libecpg4/libecpg4-7.4.5-1.tar.bz2
wget $url/libecpg4/setup.hint

cd ../libecpg5
wget $url/libecpg5/libecpg5-8.1.4-1.tar.bz2
wget $url/libecpg5/setup.hint

cd ../libpgtypes1
wget $url/libpgtypes1/libpgtypes1-7.4.5-1.tar.bz2
wget $url/libpgtypes1/setup.hint

cd ../libpgtypes2
wget $url/libpgtypes2/libpgtypes2-8.1.4-1.tar.bz2
wget $url/libpgtypes2/setup.hint

cd ../libpq-devel
wget $url/libpq-devel/libpq-devel-8.1.4-1.tar.bz2
wget $url/libpq-devel/setup.hint

# external source for 7.4.5
cd ../libpq3
mv ../postgresql-7.4.5-1-src.tar.bz2 ./libpq3-7.4.5-1-src.tar.bz2
wget $url/libpq3/libpq3-7.4.5-1.tar.bz2
wget $url/libpq3/setup.hint

cd ../libpq4
wget $url/libpq4/libpq4-8.0.7-1.tar.bz2
wget $url/libpq4/libpq4-8.1.4-1.tar.bz2
wget $url/libpq4/setup.hint

cd ../postgresql-client
wget $url/postgresql-client/postgresql-client-8.0.7-1.tar.bz2
wget $url/postgresql-client/postgresql-client-8.1.4-1.tar.bz2
wget $url/postgresql-client/setup.hint

cd ../postgresql-contrib
wget $url/postgresql-contrib/postgresql-contrib-8.1.4-1.tar.bz2
wget $url/postgresql-contrib/setup.hint

cd ../postgresql-devel
wget $url/postgresql-devel/postgresql-devel-8.1.4-1.tar.bz2
wget $url/postgresql-devel/setup.hint

cd ../postgresql-doc
wget $url/postgresql-doc/postgresql-doc-8.1.4-1.tar.bz2
wget $url/postgresql-doc/setup.hint

cd ../postgresql-plperl
wget $url/postgresql-plperl/postgresql-plperl-8.1.4-1.tar.bz2
wget $url/postgresql-plperl/setup.hint

cd ../postgresql-plpython
wget $url/postgresql-plpython/postgresql-plpython-8.1.4-1.tar.bz2
wget $url/postgresql-plpython/setup.hint

cd ..
rm postgresql-7.4.5-1.tar.bz2

Re: Please test: postgresql-8.1.4-1 (new layout)

[Dr. Volker Zell]

>>>>> Reini Urban writes:

    > As advertised I split up the monolithic postgresql package into a
    > debian-like layout, just multiple parallel installations are not yet
    > supported.
    > The only changes from debian are non-versioned names, -dev renamed to
    > -devel to be consistent with our naming, and postgresql-server-dev
    > renamed to postgresql-devel.

    > I'd appreciate external testing esp. from the php and xemacs
    > maintainers, so that they can fix their setup.hint's to include only the
    > smaller libpq4.

cygport postgresql-8.1.4-1 compile

..... snip ....

gcc -O2 -pipe -Wall -Wmissing-prototypes -Wpointer-arith -Winline -Wdeclaration-after-statement -Wendif-labels -fno-strict-aliasing   -DFRONTEND -I/usr/src/postgresql-8.1.4-1/src/postgresql-8.1.4/src/interfaces/libpq -I../../../src/include -I/usr/src/postgresql-8.1.4-1/src/postgresql-8.1.4/src/include  -I../../../src/port  -c -o getaddrinfo.o getaddrinfo.c
dlltool --export-all  --output-def pq.def fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o getaddrinfo.o
dlltool --export-all  --output-def pq.def fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o getaddrinfo.o
dllwrap -Wl,--enable-auto-import -o cygpq.dll --dllname cygpq.dll  --def pq.def fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o getaddrinfo.o  -L../../../src/port -L/usr/local/lib -lintl -lssl -lcrypto -lcrypt -lresolv 
dllwrap -Wl,--enable-auto-import -o cygpq.dll --dllname cygpq.dll  --def pq.def fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o getaddrinfo.o  -L../../../src/port -L/usr/local/lib -lintl -lssl -lcrypto -lcrypt -lresolv 
dlltool --dllname cygpq.dll  --def pq.def --output-lib libpq.a
dlltool --dllname cygpq.dll  --def pq.def --output-lib libpq.a
dlltool: Can't open .lib file: libpq.a
make[3]: *** [cygpq.dll] Error 1
make[3]: *** Deleting file `cygpq.dll'
make[3]: *** Waiting for unfinished jobs....
make[3]: Leaving directory `/usr/src/postgresql-8.1.4-1/build/src/interfaces/libpq'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/usr/src/postgresql-8.1.4-1/build/src/interfaces'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/usr/src/postgresql-8.1.4-1/build/src'
make: *** [all] Error 2
*** ERROR: make failed


Ciao
  Volker

Re: Please test: postgresql-8.1.4-1 (new layout)

[Yaakov S (Cygwin Ports)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dr. Volker Zell wrote:
> cygport postgresql-8.1.4-1 compile
> 
> ..... snip ....
> 
> gcc -O2 -pipe -Wall -Wmissing-prototypes -Wpointer-arith -Winline -Wdeclaration-after-statement -Wendif-labels -fno-strict-aliasing   -DFRONTEND -I/usr/src/postgresql-8.1.4-1/src/postgresql-8.1.4/src/interfaces/libpq -I../../../src/include -I/usr/src/postgresql-8.1.4-1/src/postgresql-8.1.4/src/include  -I../../../src/port  -c -o getaddrinfo.o getaddrinfo.c
> dlltool --export-all  --output-def pq.def fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o getaddrinfo.o
> dlltool --export-all  --output-def pq.def fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o getaddrinfo.o
> dllwrap -Wl,--enable-auto-import -o cygpq.dll --dllname cygpq.dll  --def pq.def fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o getaddrinfo.o  -L../../../src/port -L/usr/local/lib -lintl -lssl -lcrypto -lcrypt -lresolv 
> dllwrap -Wl,--enable-auto-import -o cygpq.dll --dllname cygpq.dll  --def pq.def fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o getaddrinfo.o  -L../../../src/port -L/usr/local/lib -lintl -lssl -lcrypto -lcrypt -lresolv 
> dlltool --dllname cygpq.dll  --def pq.def --output-lib libpq.a
> dlltool --dllname cygpq.dll  --def pq.def --output-lib libpq.a
> dlltool: Can't open .lib file: libpq.a
> make[3]: *** [cygpq.dll] Error 1
> make[3]: *** Deleting file `cygpq.dll'
> make[3]: *** Waiting for unfinished jobs....
> make[3]: Leaving directory `/usr/src/postgresql-8.1.4-1/build/src/interfaces/libpq'
> make[2]: *** [all] Error 2
> make[2]: Leaving directory `/usr/src/postgresql-8.1.4-1/build/src/interfaces'
> make[1]: *** [all] Error 2
> make[1]: Leaving directory `/usr/src/postgresql-8.1.4-1/build/src'
> make: *** [all] Error 2
> *** ERROR: make failed

Looks as if postgresql's build system is broken wrt parallel make, and
so it would seem from Gentoo[1] as well.  You'll need to use 'cygmake
- -j1' to fix this.

[1] http://www.gentoo.org/cgi-bin/viewcvs.cgi/dev-db/postgresql/


Yaakov
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEhJ3npiWmPGlmQSMRAlQTAJ4/QktLuWzSmqmOFagkynK0FqWY2wCfXGUq
R0qZcw1tmAJn/11X/g/eeR4=
=SNSt
-----END PGP SIGNATURE-----

Re: Please test: postgresql-8.1.4-1 (new layout)

[Reini Urban]

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

Yaakov S (Cygwin Ports) schrieb:
> Dr. Volker Zell wrote:
>> cygport postgresql-8.1.4-1 compile
>>
>> ..... snip ....
>>
>> dlltool --dllname cygpq.dll  --def pq.def --output-lib libpq.a
>> dlltool: Can't open .lib file: libpq.a
>> make[3]: *** [cygpq.dll] Error 1
> 
> Looks as if postgresql's build system is broken wrt parallel make, and
> so it would seem from Gentoo[1] as well.  You'll need to use 'cygmake
> - -j1' to fix this.
> 
> [1] http://www.gentoo.org/cgi-bin/viewcvs.cgi/dev-db/postgresql/

Thanks.
Binary packages will be almost the same, just -contrib missed the *.sql 
files. Attached is the diff for postgresql-8.1.4-2.cygport

-- 
Reini

[-- Attachment #2: postgresql-8.1.4-2.cygport --]
[-- Type: text/plain, Size: 5913 bytes --]

# -*- sh -*-
DESCRIPTION="object-relational SQL database management system"
HOMEPAGE="http://www.postgresql.org/"
SRC_URI="ftp://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${PN}-${PV}.tar.bz2"
#CVS_URI="..."

MAKEOPTS="$(MAKEOPTS) -j1"
PACKAGE_BUGREPORT="cygwin@cygwin.com"
LDFLAGS="${LDFLAGS} -Wl,--enable-auto-image-base"
CYGCONF_ARGS="--enable-nls --with-CXX --with-openssl --with-perl --with-python"
#  --enable-multibyte --disable-thread-safety --disable-integer-datetimes --with-tcl --with-java

PKG_NAMES="${PN} ${PN}-devel ${PN}-client ${PN}-contrib ${PN}-doc \
  ${PN}-plperl ${PN}-plpython \
  libpq4 libpq-devel libpgtypes2 libecpg5 libecpg-compat2 libecpg-devel"
# ${PN}-pltcl
PKG_HINTS="${PKG_NAMES}"

# postgresql
PKG_CONTENTS[0]=" \
--exclude=usr/share/postgresql/contrib \
etc/ \
usr/sbin/initdb.exe \
usr/sbin/ipcclean \
usr/sbin/pg_controldata.exe \
usr/sbin/pg_ctl.exe \
usr/sbin/pg_resetxlog.exe \
usr/sbin/postgres.exe \
usr/sbin/postmaster.exe \
usr/lib/postgresql/*_and_*.dll \
usr/lib/postgresql/plpgsql.dll \
usr/share/locale/*/LC_MESSAGES/initdb.mo \
usr/share/locale/*/LC_MESSAGES/pg_controldata.mo \
usr/share/locale/*/LC_MESSAGES/pg_ctl.mo \
usr/share/locale/*/LC_MESSAGES/pg_resetxlog.mo \
usr/share/locale/*/LC_MESSAGES/postgres.mo \
usr/share/man/man1/ipcclean.1.gz \
usr/share/man/man1/initdb.1.gz \
usr/share/man/man1/pg_controldata.1.gz \
usr/share/man/man1/pg_ctl.1.gz \
usr/share/man/man1/pg_resetxlog.1.gz \
usr/share/man/man1/postgres.1.gz \
usr/share/doc/Cygwin/${P}.README \
usr/share/postgresql"

# postgresql-devel
PKG_CONTENTS[1]=" \
usr/include/ \
usr/lib/postgresql/pgxs/ \
usr/lib/libpostgres.a"

# TODO: usr/lib/pkgconfig/

# postgresql-client
PKG_CONTENTS[2]=" \
--exclude=usr/share/locale/*/LC_MESSAGES/initdb.mo \
--exclude=usr/share/locale/*/LC_MESSAGES/pg_controldata.mo \
--exclude=usr/share/locale/*/LC_MESSAGES/pg_ctl.mo \
--exclude=usr/share/locale/*/LC_MESSAGES/pg_resetxlog.mo \
--exclude=usr/share/locale/*/LC_MESSAGES/postgres.mo \
usr/bin/clusterdb.exe \
usr/bin/createdb.exe \
usr/bin/dropdb.exe \
usr/bin/pg_dump.exe \
usr/bin/pg_dumpall.exe \
usr/bin/psql.exe \
usr/bin/reindexdb.exe \
usr/sbin/createlang.exe \
usr/sbin/createuser.exe \
usr/sbin/droplang.exe \
usr/sbin/dropuser.exe \
usr/sbin/pg_restore.exe \
usr/sbin/vacuumdb.exe \
usr/share/man/man1/clusterdb.1.gz \
usr/share/man/man1/createdb.1.gz \
usr/share/man/man1/createlang.1.gz \
usr/share/man/man1/createuser.1.gz \
usr/share/man/man1/dropdb.1.gz \
usr/share/man/man1/droplang.1.gz \
usr/share/man/man1/dropuser.1.gz \
usr/share/man/man1/initdb.1.gz \
usr/share/man/man1/ipcclean.1.gz \
usr/share/man/man1/pg_controldata.1.gz \
usr/share/man/man1/pg_ctl.1.gz \
usr/share/man/man1/pg_dump.1.gz \
usr/share/man/man1/pg_dumpall.1.gz \
usr/share/man/man1/pg_restore.1.gz \
usr/share/man/man1/postgres.1.gz \
usr/share/man/man1/postmaster.1.gz \
usr/share/man/man1/psql.1.gz \
usr/share/man/man1/reindexdb.1.gz \
usr/share/man/man1/vacuumdb.1.gz \
usr/share/man/man7 \
usr/share/postgresql/psqlrc.sample \
usr/share/locale/*/LC_MESSAGES/"

# postgresql-contrib
PKG_CONTENTS[3]=" \
--exclude=usr/lib/postgresql/*_and_*.dll \
--exclude=usr/lib/postgresql/pgxs/ \
--exclude=usr/lib/postgresql/pl*.dll \
usr/lib/postgresql/ \
usr/share/postgresql/contrib/ \
usr/share/doc/${P}/contrib/"

# ${PN}-doc 
PKG_CONTENTS[4]=" \
--exclude=usr/share/doc/${P}/contrib/ \
usr/share/doc/${P}"

# ${PN}-plperl 
PKG_CONTENTS[5]="usr/lib/postgresql/plperl.dll"

# ${PN}-plpython 
PKG_CONTENTS[6]="usr/lib/postgresql/plpython.dll"
# libpq4  
PKG_CONTENTS[7]="usr/bin/cygpq.dll"

# libpq-devel  
PKG_CONTENTS[8]=" \
usr/bin/pg_config.exe \
usr/include/postgresql/internal \
usr/include/libpq-fe.h \
usr/include/libpq/libpq-fs.h \
usr/include/pg_config*.h \
usr/include/postgres_ext.h \
usr/include/postgresql/server/catalog/pg_type.h \
usr/include/postgresql/server/nodes/nodes.h \
usr/include/postgresql/server/utils/elog.h \
usr/include/postgresql/server/utils/errcodes.h \
usr/include/postgresql/server/utils/palloc.h \
usr/include/postgresql/server/c.h \
usr/include/postgresql/server/pg_config.h \
usr/include/postgresql/server/pg_config_manual.h \
usr/include/postgresql/server/pg_config_os.h \
usr/include/postgresql/server/port.h \
usr/include/postgresql/server/postgres.h \
usr/include/postgresql/server/postgres_fe.h \
usr/include/postgresql/server/postgres_ext.h \
usr/lib/libpgport.a \
usr/lib/libpq.a \
usr/share/man/man1/pg_config.1.gz \
usr/share/locale/*/LC_MESSAGES/pg_config.mo"

# libpgtypes2  
PKG_CONTENTS[9]="usr/bin/cygpgtypes.dll"

# libecpg5  
PKG_CONTENTS[10]=" \
usr/bin/ecpg.exe \
usr/bin/cygecpg.dll \
usr/share/man/man1/ecpg.1.gz"

# libecpg-compat2  
PKG_CONTENTS[11]="usr/bin/cygecpg_compat.dll"

# libecpg-devel
PKG_CONTENTS[12]=" \
usr/include/ecpg*.h \
usr/include/postgresql/informix \
usr/include/pgtypes_*.h \
usr/include/sql3types.h \
usr/include/sqlca.h \
usr/lib/libecpg.a \
usr/lib/libecpg_compat.a \
usr/lib/libpgtypes.a"

# ${PN}-pltcl  
#PKG_CONTENTS[13]="usr/lib/postgresql/pltcl.dll"

src_compile() {
  # cd ${S}
  # cygautoreconf
  cd ${B}
  cygconf
  cygmake
  cygmake contrib
}

src_test() {
  cd ${B}
  make check
}

src_install() {
  cd ${B}
  cyginstall docdir=/usr/share/doc/${P}/
  # I prefer to have that in postgresql-devel already
  dolib ${B}/src/backend/libpostgres.a

  mv ${D}/usr/lib/*.dll ${D}/usr/bin/
  dodir /usr/sbin
  for admin in createlang createuser droplang dropuser initdb \
               pg_ctl pg_controldata pg_resetxlog pg_restore postgres \
               postmaster vacuumdb; do
    mv ${D}/usr/bin/$admin.exe ${D}/usr/sbin/;
  done
  mv ${D}/usr/bin/ipcclean ${D}/usr/sbin/

  dodir /etc/rc.d/init.d
  cp ${C}/postgresql.initd ${D}/etc/rc.d/init.d/postgresql

  cp -r ${S}/doc/src/FAQ ${D}/usr/share/doc/${P}/

  make -j1 -C contrib install DESTDIR=${D} bindir=/usr/lib/postgresql/bin/ docdir=/usr/share/doc/${P}/
}

Re: Please test: postgresql-8.1.4-1 (new layout)

[Reini Urban]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

Reini Urban schrieb:
...
> Binary packages will be almost the same, just -contrib missed the *.sql 
> files. Attached is the diff for postgresql-8.1.4-2.cygport

Sorry, this IS the diff now.


[-- Attachment #2: 8.1.4-1-2.cygport.diff --]
[-- Type: text/plain, Size: 1252 bytes --]

--- postgresql-8.1.4-1.cygport	2006-06-06 05:43:23.633000000 +0000
+++ postgresql-8.1.4-2.cygport	2006-06-06 06:00:24.383000000 +0000
@@ -4,6 +4,7 @@
 SRC_URI="ftp://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${PN}-${PV}.tar.bz2"
 #CVS_URI="..."
 
+MAKEOPTS="$(MAKEOPTS) -j1"
 PACKAGE_BUGREPORT="cygwin@cygwin.com"
 LDFLAGS="${LDFLAGS} -Wl,--enable-auto-image-base"
 CYGCONF_ARGS="--enable-nls --with-CXX --with-openssl --with-perl --with-python"
@@ -14,6 +15,7 @@
   libpq4 libpq-devel libpgtypes2 libecpg5 libecpg-compat2 libecpg-devel"
 # ${PN}-pltcl
 PKG_HINTS="${PKG_NAMES}"
+
 # postgresql
 PKG_CONTENTS[0]=" \
 --exclude=usr/share/postgresql/contrib \
@@ -98,6 +100,7 @@
 --exclude=usr/lib/postgresql/pgxs/ \
 --exclude=usr/lib/postgresql/pl*.dll \
 usr/lib/postgresql/ \
+usr/share/postgresql/contrib/ \
 usr/share/doc/${P}/contrib/"
 
 # ${PN}-doc 
@@ -176,7 +179,7 @@
 
 src_test() {
   cd ${B}
-  make check
+  make -j1 check
 }
 
 src_install() {
@@ -199,5 +202,5 @@
 
   cp -r ${S}/doc/src/FAQ ${D}/usr/share/doc/${P}/
 
-  make -C contrib install DESTDIR=${D} bindir=/usr/lib/postgresql/bin/ docdir=/usr/share/doc/${P}/
+  make -j1 -C contrib install DESTDIR=${D} bindir=/usr/lib/postgresql/bin/ docdir=/usr/share/doc/${P}/
 }

Re: Please test: postgresql-8.1.4-1 (new layout)

[Dr. Volker Zell]

>>>>> Reini Urban writes:

    > Reini Urban schrieb:
    > ...
    >> Binary packages will be almost the same, just -contrib missed the
    >> *.sql files. Attached is the diff for postgresql-8.1.4-2.cygport

    > Sorry, this IS the diff now.

    > --- postgresql-8.1.4-1.cygport	2006-06-06 05:43:23.633000000 +0000
    > +++ postgresql-8.1.4-2.cygport	2006-06-06 06:00:24.383000000 +0000
    > @@ -4,6 +4,7 @@
    >  SRC_URI="ftp://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${PN}-${PV}.tar.bz2"
    >  #CVS_URI="..."
 
    > +MAKEOPTS="$(MAKEOPTS) -j1"
    >  PACKAGE_BUGREPORT="cygwin@cygwin.com"
    >  LDFLAGS="${LDFLAGS} -Wl,--enable-auto-image-base"
    >  CYGCONF_ARGS="--enable-nls --with-CXX --with-openssl --with-perl --with-python"
    > @@ -14,6 +15,7 @@
    >    libpq4 libpq-devel libpgtypes2 libecpg5 libecpg-compat2 libecpg-devel"
    >  # ${PN}-pltcl
    >  PKG_HINTS="${PKG_NAMES}"
    > +
    >  # postgresql
    >  PKG_CONTENTS[0]=" \
    >  --exclude=usr/share/postgresql/contrib \
    > @@ -98,6 +100,7 @@
    >  --exclude=usr/lib/postgresql/pgxs/ \
    >  --exclude=usr/lib/postgresql/pl*.dll \
    >  usr/lib/postgresql/ \
    > +usr/share/postgresql/contrib/ \
    >  usr/share/doc/${P}/contrib/"
 
    >  # ${PN}-doc 
    > @@ -176,7 +179,7 @@
 
    >  src_test() {
    >    cd ${B}
    > -  make check
    > +  make -j1 check
    >  }
 
    >  src_install() {
    > @@ -199,5 +202,5 @@
 
    >    cp -r ${S}/doc/src/FAQ ${D}/usr/share/doc/${P}/
 
    > -  make -C contrib install DESTDIR=${D} bindir=/usr/lib/postgresql/bin/ docdir=/usr/share/doc/${P}/
    > +  make -j1 -C contrib install DESTDIR=${D} bindir=/usr/lib/postgresql/bin/ docdir=/usr/share/doc/${P}/
    >  }

With the diff applied:

 cygport postgresql-8.1.4-1 prep
/usr/src/postgresql-8.1.4-1.cygport: line 7: MAKEOPTS: command not found

Ciao
  Volker