diff options
| author | Andreas Klemm <andreas@FreeBSD.org> | 1997-06-14 21:10:42 +0000 |
|---|---|---|
| committer | Andreas Klemm <andreas@FreeBSD.org> | 1997-06-14 21:10:42 +0000 |
| commit | 8293f985d04e55d11fde2af50126208dd8cfb2b3 (patch) | |
| tree | 287dab6320aa7c45e95259c1e08a5b03a65890a1 | |
| parent | Fix DSN args handling (diff) | |
- Add shared lib using ldconfig -m before trying to init databases
- Added missing ldconfig -m in startup file
- Modified pgsql user environment
- Make port NOPORTDOCS aware
- Add additional port docs to post-install target and updated PLIST
- recursively change owner of pgsql directory after creating .profile,
so that .profile can be modified by the pgsql user.
Hope everything is fine now.
Notes
Notes:
svn path=/head/; revision=6936
28 files changed, 336 insertions, 84 deletions
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql-devel-server/Makefile +++ b/databases/postgresql-devel-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql-devel-server/pkg-plist b/databases/postgresql-devel-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql-devel-server/pkg-plist +++ b/databases/postgresql-devel-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql-devel/Makefile +++ b/databases/postgresql-devel/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql-devel/pkg-plist +++ b/databases/postgresql-devel/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql7/Makefile +++ b/databases/postgresql7/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql7/pkg-plist b/databases/postgresql7/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql7/pkg-plist +++ b/databases/postgresql7/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql73-server/pkg-plist b/databases/postgresql73-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql73-server/pkg-plist +++ b/databases/postgresql73-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql73/Makefile +++ b/databases/postgresql73/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql73/pkg-plist b/databases/postgresql73/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql73/pkg-plist +++ b/databases/postgresql73/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql74-server/pkg-plist +++ b/databases/postgresql74-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql80-server/pkg-plist b/databases/postgresql80-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql80-server/pkg-plist +++ b/databases/postgresql80-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql81-server/pkg-plist b/databases/postgresql81-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql81-server/pkg-plist +++ b/databases/postgresql81-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql82-server/pkg-plist b/databases/postgresql82-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql82-server/pkg-plist +++ b/databases/postgresql82-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql83-server/pkg-plist b/databases/postgresql83-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql83-server/pkg-plist +++ b/databases/postgresql83-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql84-server/pkg-plist b/databases/postgresql84-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql84-server/pkg-plist +++ b/databases/postgresql84-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql90-server/pkg-plist b/databases/postgresql90-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql90-server/pkg-plist +++ b/databases/postgresql90-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql91-server/pkg-plist b/databases/postgresql91-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql91-server/pkg-plist +++ b/databases/postgresql91-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 163b68506fb0..de14030f5fc3 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -3,7 +3,7 @@ # Date created: April 2, 1997 # Whom: Marc G. Fournier <scrappy@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.11 1997/06/14 19:40:03 andreas Exp $ DISTNAME= postgresql-v6.1 PKGNAME= postgresql-6.1 @@ -46,28 +46,34 @@ pre-install: @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser post-install: - @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ if [ ! -f ${PREFIX}/pgsql/.profile ]; then \ - echo "PATH=\${PATH}:${PREFIX}/pgsql/bin" \ + echo "PATH=${PATH}:${PREFIX}/pgsql/bin" \ > ${PREFIX}/pgsql/.profile; \ - echo "MANPATH=\${MANPATH}:${PREFIX}/pgsql/bin" \ + echo "MANPATH=${MANPATH}:${PREFIX}/pgsql/bin" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGLIB=${PREFIX}/pgsql/bin" \ + echo "PGLIB=${PREFIX}/pgsql/lib" \ >> ${PREFIX}/pgsql/.profile; \ - echo "PGDATA=${PREFIX}/pgsql/bin" \ + echo "PGDATA=${PREFIX}/pgsql/data" \ >> ${PREFIX}/pgsql/.profile; \ echo "export PATH MANPATH PGLIB PGDATA" \ >> ${PREFIX}/pgsql/.profile; \ fi + @ chown -R pgsql:pgsql ${PREFIX}/pgsql @ echo 'Initializing PostgreSQL Databases - this may take a few minutes...' + @ /sbin/ldconfig -m ${PREFIX}/pgsql/lib @ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data' @ if [ ! -f ${PREFIX}/etc/rc.d/postgresql.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/postgresql.sh startup file."; \ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/postgresql.sh; \ + echo "[ -d ${PREFIX}/pgsql/lib ] && /sbin/ldconfig -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ echo "[ -x ${PREFIX}/pgsql/bin/postmaster ] && su -l pgsql -c '${PREFIX}/pgsql/bin/postmaster -D${PREFIX}/pgsql/data -o -F > ${PREFIX}/pgsql/errlog &' && echo -n ' pgsql'" >> ${PREFIX}/etc/rc.d/postgresql.sh; \ chmod 751 ${PREFIX}/etc/rc.d/postgresql.sh; \ fi @ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/pgsql + ${CP} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql +.endif .if !defined(BATCH) @ more -e ${FILESDIR}/post-install-notes .endif diff --git a/databases/postgresql92-server/pkg-plist b/databases/postgresql92-server/pkg-plist index 162d85812ab6..88b2a45ecafa 100644 --- a/databases/postgresql92-server/pkg-plist +++ b/databases/postgresql92-server/pkg-plist @@ -151,6 +151,18 @@ pgsql/man/manl/sql.l.gz pgsql/man/manl/update.l.gz pgsql/man/manl/vacuum.l.gz pgsql/post-install-notes +share/doc/pgsql/FAQ +share/doc/pgsql/FAQ-Irix +share/doc/pgsql/FAQ-Linux +share/doc/pgsql/README.GEQO +share/doc/pgsql/README.fsync +share/doc/pgsql/README.support +share/doc/pgsql/TODO +share/doc/pgsql/TODO.GEQO +share/doc/pgsql/bug.template +share/doc/pgsql/libpgtcl.doc +share/doc/pgsql/userguide.ps +@dirrm share/doc/pgsql @dirrm pgsql/lib @dirrm pgsql/bin @dirrm pgsql/include/port/BSD44_derived |