system/postgresql: Updated for version 8.3.5

1 files changed, 52 insertions, 56 deletions

diff --git a/system/postgresql/postgresql.SlackBuild b/system/postgresql/postgresql.SlackBuild
index 379541eed0..1db01e2f1b 100644
--- a/system/postgresql/postgresql.SlackBuild
+++ b/system/postgresql/postgresql.SlackBuild
@@ -1,17 +1,18 @@
 #!/bin/sh
 
 ## Slackware build script for PostgreSQL
-## $Revision: 1addf65317c9 $
-## $Date: 2007/04/25 02:58:20 $
+## $Revision: a8b7a8527f9a $
+## $Date: 2008/06/11 08:11:50 $
 ## 
-## Copyright 2007 Adis Nezirovic <adis _at_ linux.org.ba>
+## Copyright 2007-2008 Adis Nezirovic <adis _at_ linux.org.ba>
 ## Licensed under GNU GPL v2
 
-# Slightly modified by the SlackBuilds Project
+# Modified by the SlackBuilds.org Project
+
 PRGNAM=postgresql
-VERSION=8.3.0
+VERSION=8.3.5
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -19,9 +20,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Exit on any and all errors
-set -e
-
 # Bail out if user or group isn't valid on your system
 # For slackbuilds.org, assigned postgres uid/gid are 209/209
 # see http://slackbuilds.org/uid_gid.txt
@@ -43,39 +41,39 @@ if [ "$ARCH" = "i486" ]; then
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
-# Make sure we start from clean state
+set -e # Exit on any and all errors
+
 rm -rf $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
-
 cd $TMP
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-
-# Fix permissions here.
-chmod -R a-s,u+w,go+r-w $PRGNAM-$VERSION
-chown -R root:root $PRGNAM-$VERSION
-
-cd $TMP/$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod -R a-s,u+w,go+r-w .
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-	--prefix=/usr \
-	--with-openssl \
-	--with-tcl \
-	--with-perl \
-	--with-python \
-	--with-ldap \
-	--with-xml \
-	--enable-thread-safety || exit 1
-make || exit 1
-make DESTDIR=$PKG install-strip || exit 1
+  --prefix=/usr \
+  --with-openssl \
+  --with-tcl \
+  --with-perl \
+  --with-python \
+  --with-ldap \
+  --with-libxml \
+  --enable-thread-safety \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG 
 
 # adminpack extension for pgAdmin
-cd $TMP/$PRGNAM-$VERSION/contrib/adminpack
-make || exit 1
-make DESTDIR=$PKG install-strip || exit 1
+cd contrib/adminpack
+  make
+  make install-strip DESTDIR=$PKG
+cd $TMP/$PRGNAM-$VERSION
 
 # Since version 8.3 tsearch2 is directly supported by PostgreSQL
 # This contrib module is now a compatibility layer.
@@ -83,25 +81,26 @@ make DESTDIR=$PKG install-strip || exit 1
 # compatibility layer by running:
 #   TSEARCH2_COMPAT=no ./postgresql.SlackBuild
 if [ "$TSEARCH2_COMPAT" != "no" ]; then
-	cd $TMP/$PRGNAM-$VERSION/contrib/tsearch2
-	make || exit 1
-	make DESTDIR=$PKG install-strip || exit 1
+  cd contrib/tsearch2
+    make
+    make install-strip DESTDIR=$PKG
+  cd $TMP/$PRGNAM-$VERSION
 fi
 
+# some business oriented applications use this extension
+cd contrib/pgcrypto
+  make
+  make install-strip DESTDIR=$PKG
 cd $TMP/$PRGNAM-$VERSION
 
-# man pages
 gzip -9 $PKG/usr/man/man?/*
 
-# docs
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYRIGHT \
-      HISTORY \
-      README \
-      doc/* \
-      $PKG/usr/doc/$PRGNAM-$VERSION/
-rm -fr $PKG/usr/doc/$PRGNAM-$VERSION/{man.tar.gz,man1,manl,man7,postgres.tar.gz}
+cp -a COPYRIGHT HISTORY README doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/{man.tar.gz,man1,manl,man7,postgres.tar.gz}
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
+chown -R root:root $PKG/usr/doc
 
 # base database directory
 # assumes you are using /var/lib/pgsql as a homedir for postgres user
@@ -111,24 +110,21 @@ chmod 700 $PKG/var/lib/pgsql
 # permissions for DATADIR should be u=rwx (0700)
 chmod 700 $PKG/var/lib/pgsql/data
 
-# description file
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-# pkgtool setup procedure
-mkdir -p $PKG/var/log/setup
-cat $CWD/setup.$PRGNAM > $PKG/var/log/setup/setup.$PRGNAM
-chmod 755 $PKG/var/log/setup/setup.$PRGNAM
-
-# rc script
+# Install init script
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.postgresql.new > $PKG/etc/rc.d/rc.postgresql.new
 
-# logrotation
+# Install logrotate script
 mkdir -p $PKG/etc/logrotate.d
 cat $CWD/postgresql.logrotate > $PKG/etc/logrotate.d/postgresql.new
 
-## make the package
+mkdir -p $PKG/var/log/setup
+cat $CWD/setup.$PRGNAM > $PKG/var/log/setup/setup.$PRGNAM
+chmod 755 $PKG/var/log/setup/setup.$PRGNAM
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz