3 files changed, 26 insertions, 30 deletions
diff --git a/system/postgresql/README.SBo b/system/postgresql/README.SBo
index dd088c0dd6..48b30ddc28 100644
--- a/system/postgresql/README.SBo
+++ b/system/postgresql/README.SBo
@@ -30,11 +30,8 @@ Additionally, rc.postgresql script has additionalg modes for stop/restart:
   unclean-stop|unclean-restart (i.e. pg_ctl 'immediate' mode)
 See http://www.postgresql.org/docs/8.4/static/app-pg-ctl.html
 
-This script builds postgresql with the 'adminpack' and 'pgcrypto' 
-features in the contrib directory.
+This script builds postgresql with some useful extension modules from
+the contrib directory, see PG_EXTENSIONS in SlackBuild file.
 
 Please note that in order to actually use extension, you must execute
 accompanying SQL scripts located in /usr/share/postgresql/contrib
-
-Additionally, you can enable tsearch2 compatibility module with:
-  TSEARCH2_COMPAT=yes ./postgresql.SlackBuild
diff --git a/system/postgresql/postgresql.SlackBuild b/system/postgresql/postgresql.SlackBuild
index 170c8ef5a6..4022b73721 100644
--- a/system/postgresql/postgresql.SlackBuild
+++ b/system/postgresql/postgresql.SlackBuild
@@ -1,16 +1,16 @@
 #!/bin/sh
 
 ## Slackware build script for PostgreSQL
-## $Revision: 5548380e2466 $
-## $Date: 2009/09/09 17:37:50 $
+## $Revision: 125327c245d3 $
+## $Date: 2010/10/20 20:09:12 $
 ##
-## Copyright 2007-2009 Adis Nezirovic <adis _at_ linux.org.ba>
+## Copyright 2007-2010 Adis Nezirovic <adis _at_ linux.org.ba>
 ## Licensed under GNU GPL v2
 
 # Modified by the SlackBuilds.org Project
 
 PRGNAM=postgresql
-VERSION=8.4.4
+VERSION=9.0.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,6 +74,7 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-openssl \
@@ -88,28 +89,26 @@ CFLAGS="$SLKCFLAGS" \
 
 make
 make install-strip DESTDIR=$PKG
+make install-docs DESTDIR=$PKG
 
-# adminpack extension for pgAdmin
-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.
-# You can enable it by with:
-#   TSEARCH2_COMPAT=yes ./postgresql.SlackBuild
-if ! [ "${TSEARCH2_COMPAT:-no}" == "no" ]; then
-  cd contrib/tsearch2
-    make
-    make install-strip DESTDIR=$PKG
-  cd $TMP/$PRGNAM-$VERSION
-fi
+# Some interesting additional modules:
+#   http://www.postgresql.org/docs/9.0/static/contrib.html
+#
+#  adminpack - helper extension for pgAdmin
+#  pgcrypto - extension for some business applications
+#  hstore, ltree, xml2 - useful extensions for developers
+#  pg_archivecleanup, pg_standby - high availability helpers
+#  pg_upgrade - online upgrade between postgresql versions
+
+PG_EXTENSIONS="adminpack pgcrypto hstore ltree xml2 pg_archivecleanup pg_standby pg_upgrade"
 
-# Some business oriented applications use this extension
-cd contrib/pgcrypto
+for ext in $PG_EXTENSIONS; do
+  cd $TMP/$PRGNAM-$VERSION/contrib/$ext
   make
   make install-strip DESTDIR=$PKG
+done
+
 cd $TMP/$PRGNAM-$VERSION
 
 ( cd $PKG/usr/man || exit 1
diff --git a/system/postgresql/postgresql.info b/system/postgresql/postgresql.info
index ebcee97217..9f0c015e8a 100644
--- a/system/postgresql/postgresql.info
+++ b/system/postgresql/postgresql.info
@@ -1,10 +1,10 @@
 PRGNAM="postgresql"
-VERSION="8.4.4"
+VERSION="9.0.1"
 HOMEPAGE="http://www.postgresql.org"
-DOWNLOAD="ftp://ftp.postgresql.org/pub/source/v8.4.4/postgresql-8.4.4.tar.bz2"
-MD5SUM="4bf2448ad965bca3940df648c02194df"
+DOWNLOAD="ftp://ftp.postgresql.org/pub/source/v9.0.1/postgresql-9.0.1.tar.bz2"
+MD5SUM="57ba57e43cfe29e16dacbf5789be98d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Adis Nezirovic"
 EMAIL="adis_at_linux.org.ba"
-APPROVED="rworkman"
+APPROVED="dsomero"