Maj de postgresql#8.4.2-1

1 files changed, 16 insertions, 31 deletions

diff --git a/extra/postgresql/Pkgfile b/extra/postgresql/Pkgfile
index e70da5e44..dbcfdc18b 100644
--- a/extra/postgresql/Pkgfile
+++ b/extra/postgresql/Pkgfile
@@ -1,16 +1,20 @@
-# Description: A sophisticated object-relational DBMS 
+# Description: Système de base de données relationnelles très complète basée sur les objects
 # URL: http://www.postgresql.org/
 # Maintainer: NuTyX core team
 # Packager: lesibel at free dot fr
-# Depends on: postgresql-libs, libxml2, linux-pam
+# Depends on: libxml2, linux-pam
 
 name=postgresql
-version=8.4.1
+version=8.4.2
 release=1
 source=(ftp://ftp.postgresql.org/pub/source/v$version/postgresql-$version.tar.bz2 \
-        postgresql postgresql.confd build.patch postgresql.pam)
+        nutyx-01.patch build.patch postgresql.pam)
 
 build() {
+  source /etc/blfs-bootscripts
+  wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+  tar xvf $scripts-$scriptsversion.tar.bz2
+
   cd $name-$version
 
   # patch to remove regress/test make target (won't build with it present)
@@ -19,43 +23,24 @@ build() {
   # configure
   ./configure --prefix=/usr --mandir=/usr/share/man \
   --with-docdir=/usr/share/doc --with-openssl \
-  --datadir=/srv/pgsql/data --with-pam --with-libxml
-
-  sed -i -e '/interfaces/d' src/Makefile 
+  --enable-thread-safety \
+  --with-pam --with-libxml
 
   # build
-  make 
+  make -j3
 
   # install
   make DESTDIR=$PKG install 
 
-  (
-  cd contrib/adminpack;
-  make 
-  make DESTDIR=$PKG install
-  );
-
-
-  # clean up unneeded installed items
-#  rm -rf $PKG/usr/include/postgresql/internal 
-#  rm -rf $PKG/usr/include/libpq 
-  # the below line is expected to produce an error; fix this one day
-#  rm -rf $PKG/usr/include/*
-#  rm -f $PKG/usr/bin/pg_config 
-  
-  # Maintaining the lib below because of qt
-  #rm -f $startdir/pkg/usr/lib/libpgport.a || return 1
-
-  # install launch script
-  install -D -m755 ../postgresql $PKG/etc/rc.d/postgresql
-
   # install license
   install -D -m644 COPYRIGHT $PKG/usr/share/licenses/$name/LICENSE 
 
-  # install conf file
-  install -D -m644 $SRC/postgresql.confd $PKG/etc/conf.d/postgresql 
+  cd ../$scripts-$scriptsversion
+  patch -Np1 -i ../nutyx-01.patch
+  make DESTDIR=$PKG install-postgresql
 
+  # install pam file
   install -D -m644 $SRC/postgresql.pam  $PKG/etc/pam.d/postgresql
 
-#  chown root:root $PKG/usr/share/doc/postgresql/html/*
+  chown -v root:root $PKG/usr/share/doc/postgresql/html/*
 }