diff options
| author | olgeni <olgeni@FreeBSD.org> | 2001-04-26 01:17:56 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2001-04-26 01:17:56 +0800 |
| commit | e49d1d49d957693cdbd919d6d39eb7e6a8460a16 (patch) | |
| tree | e7d2af3c8d13aedd74719cf508d5d501d8572328 | |
| parent | 023c8a7e05316ba7f6621a10186087a732ac1080 (diff) | |
| download | freebsd-ports-gnome-e49d1d49d957693cdbd919d6d39eb7e6a8460a16.tar.gz freebsd-ports-gnome-e49d1d49d957693cdbd919d6d39eb7e6a8460a16.tar.zst freebsd-ports-gnome-e49d1d49d957693cdbd919d6d39eb7e6a8460a16.zip | |
Misc. changes and cleanups.
* Move the call to configure.postgresql7 from pre-fetch to pre-extract, so it
won't hang while performing batch fetch operations (like portupgrade -F)
* Add some TCL related files to pkg-plist.tcl, and add a PLIST_SUB in the
Makefile to register the correct tcl version in the plist.
* Do not start postgresql if the database directory does not exist: the
startup sequence could hang because of this.
* Use the "-s" option when starting postgresql with pg_ctl, so it won't
display informational messages. Display only the port name, as do other
packages startup scripts.
Approved by: Palle Girgensohn <girgen@partitur.se>
42 files changed, 112 insertions, 112 deletions
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql-devel-server/Makefile +++ b/databases/postgresql-devel-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql-devel-server/files/pgsql.sh.tmpl b/databases/postgresql-devel-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql-devel-server/files/pgsql.sh.tmpl +++ b/databases/postgresql-devel-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql-devel-server/pkg-plist.tcl b/databases/postgresql-devel-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql-devel-server/pkg-plist.tcl +++ b/databases/postgresql-devel-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql-devel/Makefile +++ b/databases/postgresql-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql-devel/files/pgsql.sh.tmpl b/databases/postgresql-devel/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql-devel/files/pgsql.sh.tmpl +++ b/databases/postgresql-devel/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql-devel/pkg-plist.tcl b/databases/postgresql-devel/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql-devel/pkg-plist.tcl +++ b/databases/postgresql-devel/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql7/Makefile +++ b/databases/postgresql7/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql7/files/pgsql.sh.tmpl b/databases/postgresql7/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql7/files/pgsql.sh.tmpl +++ b/databases/postgresql7/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql7/pkg-plist.tcl b/databases/postgresql7/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql7/pkg-plist.tcl +++ b/databases/postgresql7/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql73-server/files/pgsql.sh.tmpl b/databases/postgresql73-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql73-server/files/pgsql.sh.tmpl +++ b/databases/postgresql73-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql73-server/pkg-plist.tcl b/databases/postgresql73-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql73-server/pkg-plist.tcl +++ b/databases/postgresql73-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql73/Makefile +++ b/databases/postgresql73/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql73/files/pgsql.sh.tmpl b/databases/postgresql73/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql73/files/pgsql.sh.tmpl +++ b/databases/postgresql73/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql73/pkg-plist.tcl b/databases/postgresql73/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql73/pkg-plist.tcl +++ b/databases/postgresql73/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql74-server/files/pgsql.sh.tmpl b/databases/postgresql74-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql74-server/files/pgsql.sh.tmpl +++ b/databases/postgresql74-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql74-server/pkg-plist.tcl b/databases/postgresql74-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql74-server/pkg-plist.tcl +++ b/databases/postgresql74-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql80-server/files/pgsql.sh.tmpl b/databases/postgresql80-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql80-server/files/pgsql.sh.tmpl +++ b/databases/postgresql80-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql80-server/pkg-plist.tcl b/databases/postgresql80-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql80-server/pkg-plist.tcl +++ b/databases/postgresql80-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql81-server/files/pgsql.sh.tmpl b/databases/postgresql81-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql81-server/files/pgsql.sh.tmpl +++ b/databases/postgresql81-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql81-server/pkg-plist.tcl b/databases/postgresql81-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql81-server/pkg-plist.tcl +++ b/databases/postgresql81-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql82-server/files/pgsql.sh.tmpl b/databases/postgresql82-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql82-server/files/pgsql.sh.tmpl +++ b/databases/postgresql82-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql82-server/pkg-plist.tcl b/databases/postgresql82-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql82-server/pkg-plist.tcl +++ b/databases/postgresql82-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql83-server/files/pgsql.sh.tmpl b/databases/postgresql83-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql83-server/files/pgsql.sh.tmpl +++ b/databases/postgresql83-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql83-server/pkg-plist.tcl b/databases/postgresql83-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql83-server/pkg-plist.tcl +++ b/databases/postgresql83-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql84-server/files/pgsql.sh.tmpl b/databases/postgresql84-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql84-server/files/pgsql.sh.tmpl +++ b/databases/postgresql84-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql84-server/pkg-plist.tcl b/databases/postgresql84-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql84-server/pkg-plist.tcl +++ b/databases/postgresql84-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql90-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql90-server/files/pgsql.sh.tmpl +++ b/databases/postgresql90-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql90-server/pkg-plist.tcl b/databases/postgresql90-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql90-server/pkg-plist.tcl +++ b/databases/postgresql90-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql91-server/files/pgsql.sh.tmpl b/databases/postgresql91-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql91-server/files/pgsql.sh.tmpl +++ b/databases/postgresql91-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql91-server/pkg-plist.tcl b/databases/postgresql91-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql91-server/pkg-plist.tcl +++ b/databases/postgresql91-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 08d7b0775770..28d87052487d 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -55,7 +55,7 @@ PG_PREFIX="" PG_INCLUDE= include/pgsql .endif -PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" +PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}" MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \ dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \ @@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql pre-install: @@ -143,11 +143,9 @@ post-install: @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh .if defined(WITH_TCL) # Preparing a loadable TCL-package (pkgIndex.tcl) -# XXX This directory and the single file are not registered in -# XXX the PLIST, because of different PREFIX. - @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3 + @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3 @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl + > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl .endif .if defined(WITH_JDBC) @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes diff --git a/databases/postgresql92-server/files/pgsql.sh.tmpl b/databases/postgresql92-server/files/pgsql.sh.tmpl index e775aab1d5fd..46aff1eb4718 100644 --- a/databases/postgresql92-server/files/pgsql.sh.tmpl +++ b/databases/postgresql92-server/files/pgsql.sh.tmpl @@ -11,7 +11,7 @@ start) [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib [ -x ${PGBIN}/pg_ctl ] && { su -l pgsql -c \ - 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -w -l ~pgsql/errlog' + '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' echo -n ' pgsql' } ;; diff --git a/databases/postgresql92-server/pkg-plist.tcl b/databases/postgresql92-server/pkg-plist.tcl index bb3ecd307193..da5f4367cb80 100644 --- a/databases/postgresql92-server/pkg-plist.tcl +++ b/databases/postgresql92-server/pkg-plist.tcl @@ -6,6 +6,7 @@ %%PG_PREFIX%%lib/libpgtcl.so %%PG_PREFIX%%lib/libpgtcl.so.2 %%PG_PREFIX%%lib/pltcl.so +lib/tcl%%WITH_TCL%%/Pgtcl1.3/pkgIndex.tcl share/postgresql/pgaccess/images/icon_button.gif share/postgresql/pgaccess/images/icon_checkbutton.gif share/postgresql/pgaccess/images/icon_entry.gif @@ -144,3 +145,4 @@ share/postgresql/pgaccess/main.tcl @dirrm share/postgresql/pgaccess/lib/languages @dirrm share/postgresql/pgaccess/lib @dirrm share/postgresql/pgaccess +@dirrm lib/tcl%%WITH_TCL%%/Pgtcl1.3 |