[arch-commits] Commit in postgresql/repos (3 files)
Daniel Griffiths
dgriffiths at archlinux.org
Thu Feb 11 03:04:05 UTC 2010
Date: Wednesday, February 10, 2010 @ 22:04:05
Author: dgriffiths
Revision: 68152
Merged revisions 68151 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/postgresql/trunk
........
r68151 | dgriffiths | 2010-02-10 21:03:50 -0600 (Wed, 10 Feb 2010) | 2 lines
Fixed FS#16507,16741,16495; moved to splitpkg
........
Modified:
postgresql/repos/extra-i686/ (properties)
postgresql/repos/extra-i686/PKGBUILD
postgresql/repos/extra-i686/postgresql
------------+
PKGBUILD | 94 ++++++++++++++++++++++++++++++++++++++++++++++-------------
postgresql | 2 -
2 files changed, 75 insertions(+), 21 deletions(-)
Property changes on: postgresql/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /postgresql/trunk:1-68147
+ /postgresql/trunk:1-68151
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2010-02-11 03:03:50 UTC (rev 68151)
+++ extra-i686/PKGBUILD 2010-02-11 03:04:05 UTC (rev 68152)
@@ -1,46 +1,100 @@
# $Id$
# Maintainer: Douglas Soares de Andrade <douglas at archlinux.org>
-pkgname=postgresql
+pkgbase=('postgresql')
+pkgname=('postgresql-libs' 'postgresql')
pkgver=8.4.2
-pkgrel=3
-pkgdesc="A sophisticated object-relational DBMS"
+pkgrel=4
arch=('i686' 'x86_64')
url="http://www.postgresql.org"
license=('BSD')
-backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql')
-depends=("postgresql-libs>=${pkgver}" "libxml2" 'readline>=6.0')
-optdepends=('python: for PL/Python support')
+makedepends=('libxml2' 'python')
options=('!makeflags')
source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
postgresql postgresql.confd build.patch postgresql.pam)
build() {
- cd ${srcdir}/${pkgname}-${pkgver} || return 1
+ cd ${srcdir}/${pkgbase}-${pkgver} || return 1
# patch to remove regress/test make target (won't build with it present)
patch -Np1 -i ../build.patch || return 1
# configure
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --with-docdir=/usr/share/doc --with-openssl --with-python \
- --datadir=/usr/share/postgresql --with-pam --with-libxml || return 1
+ ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \
+ --with-docdir=/usr/share/doc --with-openssl --with-python --with-pam \
+ --datadir=/usr/share/postgresql --enable-thread-safety || return 1
sed -i -e '/interfaces/d' src/Makefile || return 1
# build
make || return 1
+ # build libs
+ for dir in src/interfaces src/bin/pg_config; do
+ pushd ${dir} || return 1
+ make || return 1
+ popd
+ done
+
+ cd src/include || return 1
+ make || return 1
+
+ # build adminpack
+ cd ../../contrib/adminpack || return 1
+ make || return 1
+}
+
+package_postgresql-libs() {
+ pkgdesc="Libraries for use with PostgreSQL"
+ depends=('openssl>=0.9.8b' 'readline>=6.0')
+
+ cd ${srcdir}/${pkgbase}-${pkgver} || return 1
+
+ # install libs
+ for dir in src/interfaces src/bin/pg_config; do
+ pushd ${dir} || return 1
+ make DESTDIR=${pkgdir} install || return 1
+ popd
+ done
+
+ cd src/include || return 1
+
+ mkdir -p ${pkgdir}/usr/include/{libpq,postgresql/internal/libpq} || return 1
+
+ # these headers are needed by the public headers of the interfaces
+ install -m644 pg_config.h ${pkgdir}/usr/include/ || return 1
+ install -m644 pg_config_os.h ${pkgdir}/usr/include/ || return 1
+ install -m644 postgres_ext.h ${pkgdir}/usr/include/ || return 1
+ install -m644 libpq/libpq-fs.h ${pkgdir}/usr/include/libpq/ || return 1
+ install -m644 pg_config_manual.h ${pkgdir}/usr/include/ || return 1
+
+ # these headers are needed by the not-so-public headers of the interfaces
+ install -m644 c.h ${pkgdir}/usr/include/postgresql/internal/ || return 1
+ install -m644 port.h ${pkgdir}/usr/include/postgresql/internal/ || return 1
+ install -m644 postgres_fe.h ${pkgdir}/usr/include/postgresql/internal/ || return 1
+ install -m644 libpq/pqcomm.h ${pkgdir}/usr/include/postgresql/internal/libpq/ || return 1
+
+ install -Dm644 ../../COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+}
+
+
+package_postgresql() {
+ pkgdesc="A sophisticated object-relational DBMS"
+ backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql')
+ depends=("postgresql-libs>=${pkgver}" 'libxml2' 'python')
+ optdepends=('python: for PL/Python support')
+ provides=('postgresql-client')
+ conflicts=('postgresql-client')
+
+ cd ${srcdir}/${pkgbase}-${pkgver} || return 1
+
# install
make DESTDIR=${pkgdir} install || return 1
- (
- cd contrib/adminpack;
- make || return 1;
+ # install adminpack
+ cd contrib/adminpack || return 1
make DESTDIR=${pkgdir} install || return 1;
- );
-
# clean up unneeded installed items
rm -rf ${pkgdir}/usr/include/postgresql/internal || return 1
rm -rf ${pkgdir}/usr/include/libpq || return 1
@@ -53,23 +107,23 @@
#rm -f ${pkgdir}/usr/lib/libpgport.a || return 1
# install launch script
- install -D -m755 ../postgresql ${pkgdir}/etc/rc.d/postgresql \
- || return 1
+ install -D -m755 ${srcdir}/postgresql ${pkgdir}/etc/rc.d/postgresql || return 1
# install license
- install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+ install -D -m644 ../../COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE || return 1
# install conf file
install -D -m644 ${srcdir}/postgresql.confd \
${pkgdir}/etc/conf.d/postgresql || return 1
install -D -m644 ${srcdir}/postgresql.pam \
- ${pkgdir}/etc/pam.d/postgresql
+ ${pkgdir}/etc/pam.d/postgresql || return 1
chown root:root ${pkgdir}/usr/share/doc/postgresql/html/*
}
+
md5sums=('d738227e2f1f742d2f2d4ab56496c5c6'
- '2c9a8bf7942b627931e3242daa6c58d4'
+ 'de8da7eb3a2aa02d284bf904b2af4d20'
'd63a05943cf0a2726aa2070f3033c569'
'4d74f4227dc5e12bf95b3490758d86c9'
'96f82c38f3f540b53f3e5144900acf17')
Modified: extra-i686/postgresql
===================================================================
--- extra-i686/postgresql 2010-02-11 03:03:50 UTC (rev 68151)
+++ extra-i686/postgresql 2010-02-11 03:04:05 UTC (rev 68152)
@@ -20,7 +20,7 @@
stat_done
fi
if [ ! -d $PGROOT ]; then
- mkdir -p $PGROOT/data && chown postgres.postgres $PGROOT/data
+ mkdir -p $PGROOT/data && chown -R postgres.postgres $PGROOT/data
su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
fi
if [ ! -e /var/log/postgresql.log ]; then
More information about the arch-commits
mailing list