diff options
56 files changed, 112 insertions, 112 deletions
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql-devel-server/Makefile +++ b/databases/postgresql-devel-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql-devel-server/files/post-install-notes b/databases/postgresql-devel-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql-devel-server/files/post-install-notes +++ b/databases/postgresql-devel-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql-devel-server/pkg-message b/databases/postgresql-devel-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql-devel-server/pkg-message +++ b/databases/postgresql-devel-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql-devel-server/pkg-plist b/databases/postgresql-devel-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql-devel-server/pkg-plist +++ b/databases/postgresql-devel-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql-devel/Makefile +++ b/databases/postgresql-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql-devel/files/post-install-notes b/databases/postgresql-devel/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql-devel/files/post-install-notes +++ b/databases/postgresql-devel/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql-devel/pkg-message b/databases/postgresql-devel/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql-devel/pkg-message +++ b/databases/postgresql-devel/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql-devel/pkg-plist +++ b/databases/postgresql-devel/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql7/Makefile +++ b/databases/postgresql7/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql7/files/post-install-notes b/databases/postgresql7/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql7/files/post-install-notes +++ b/databases/postgresql7/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql7/pkg-message b/databases/postgresql7/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql7/pkg-message +++ b/databases/postgresql7/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql7/pkg-plist b/databases/postgresql7/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql7/pkg-plist +++ b/databases/postgresql7/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql73-server/files/post-install-notes b/databases/postgresql73-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql73-server/files/post-install-notes +++ b/databases/postgresql73-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql73-server/pkg-message b/databases/postgresql73-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql73-server/pkg-message +++ b/databases/postgresql73-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql73-server/pkg-plist b/databases/postgresql73-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql73-server/pkg-plist +++ b/databases/postgresql73-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql73/Makefile +++ b/databases/postgresql73/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql73/files/post-install-notes b/databases/postgresql73/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql73/files/post-install-notes +++ b/databases/postgresql73/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql73/pkg-message b/databases/postgresql73/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql73/pkg-message +++ b/databases/postgresql73/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql73/pkg-plist b/databases/postgresql73/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql73/pkg-plist +++ b/databases/postgresql73/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql74-server/files/post-install-notes b/databases/postgresql74-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql74-server/files/post-install-notes +++ b/databases/postgresql74-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql74-server/pkg-message b/databases/postgresql74-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql74-server/pkg-message +++ b/databases/postgresql74-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql74-server/pkg-plist +++ b/databases/postgresql74-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql80-server/files/post-install-notes b/databases/postgresql80-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql80-server/files/post-install-notes +++ b/databases/postgresql80-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql80-server/pkg-message b/databases/postgresql80-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql80-server/pkg-message +++ b/databases/postgresql80-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql80-server/pkg-plist b/databases/postgresql80-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql80-server/pkg-plist +++ b/databases/postgresql80-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql81-server/files/post-install-notes b/databases/postgresql81-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql81-server/files/post-install-notes +++ b/databases/postgresql81-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql81-server/pkg-message b/databases/postgresql81-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql81-server/pkg-message +++ b/databases/postgresql81-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql81-server/pkg-plist b/databases/postgresql81-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql81-server/pkg-plist +++ b/databases/postgresql81-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql82-server/files/post-install-notes b/databases/postgresql82-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql82-server/files/post-install-notes +++ b/databases/postgresql82-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql82-server/pkg-message b/databases/postgresql82-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql82-server/pkg-message +++ b/databases/postgresql82-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql82-server/pkg-plist b/databases/postgresql82-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql82-server/pkg-plist +++ b/databases/postgresql82-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql83-server/files/post-install-notes b/databases/postgresql83-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql83-server/files/post-install-notes +++ b/databases/postgresql83-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql83-server/pkg-message b/databases/postgresql83-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql83-server/pkg-message +++ b/databases/postgresql83-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql83-server/pkg-plist b/databases/postgresql83-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql83-server/pkg-plist +++ b/databases/postgresql83-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql84-server/files/post-install-notes b/databases/postgresql84-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql84-server/files/post-install-notes +++ b/databases/postgresql84-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql84-server/pkg-message b/databases/postgresql84-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql84-server/pkg-message +++ b/databases/postgresql84-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql84-server/pkg-plist b/databases/postgresql84-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql84-server/pkg-plist +++ b/databases/postgresql84-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql90-server/files/post-install-notes b/databases/postgresql90-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql90-server/files/post-install-notes +++ b/databases/postgresql90-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql90-server/pkg-message b/databases/postgresql90-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql90-server/pkg-message +++ b/databases/postgresql90-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql90-server/pkg-plist b/databases/postgresql90-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql90-server/pkg-plist +++ b/databases/postgresql90-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql91-server/files/post-install-notes b/databases/postgresql91-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql91-server/files/post-install-notes +++ b/databases/postgresql91-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql91-server/pkg-message b/databases/postgresql91-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql91-server/pkg-message +++ b/databases/postgresql91-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql91-server/pkg-plist b/databases/postgresql91-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql91-server/pkg-plist +++ b/databases/postgresql91-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 313ef570c06..e5d237658c2 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.0.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ ftp://ftp.de.postgresql.org/%SUBDIR%/ \ @@ -133,9 +134,9 @@ post-install: @ ${CHOWN} root:pgsql ${PREFIX}/pgsql/lib @ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib @ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \ - > ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh - @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh + > ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHMOD} 554 ${PREFIX}/etc/rc.d/010.pgsql.sh + @ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \ > ${PREFIX}/pgsql/post-install-notes .if defined(WITHOUT_MULTIBYTE) diff --git a/databases/postgresql92-server/files/post-install-notes b/databases/postgresql92-server/files/post-install-notes index 4c69908b267..f77271d8511 100644 --- a/databases/postgresql92-server/files/post-install-notes +++ b/databases/postgresql92-server/files/post-install-notes @@ -16,4 +16,4 @@ If you built in the TCL support, you can load the Pg package into your TCL scripts as easily as ``package require Pgtcl''. To start PostgreSQL, run the startup script: -%%PREFIX%%/etc/rc.d/pgsql.sh start +%%PREFIX%%/etc/rc.d/010.pgsql.sh start diff --git a/databases/postgresql92-server/pkg-message b/databases/postgresql92-server/pkg-message index 88cc50d642e..afda87898a2 100644 --- a/databases/postgresql92-server/pkg-message +++ b/databases/postgresql92-server/pkg-message @@ -8,5 +8,5 @@ Example: You can then start PostgreSQL by running: - /usr/local/etc/rc.d/pgsql.sh start + /usr/local/etc/rc.d/010.pgsql.sh start ========================================== diff --git a/databases/postgresql92-server/pkg-plist b/databases/postgresql92-server/pkg-plist index 4cf31ebc5bc..ff1866c0d63 100644 --- a/databases/postgresql92-server/pkg-plist +++ b/databases/postgresql92-server/pkg-plist @@ -1,5 +1,5 @@ @unexec if cmp -s %D/pgsql/.profile %D/pgsql/dot.profile.dist; then rm -f %D/pgsql/.profile; fi -etc/rc.d/pgsql.sh +etc/rc.d/010.pgsql.sh pgsql/dot.profile.dist @exec [ -f %D/pgsql/.profile ] || (cp %D/pgsql/dot.profile.dist %D/pgsql/.profile && chown pgsql:pgsql %D/pgsql/.profile) pgsql/bin/createdb @@ -92,5 +92,4 @@ pgsql/post-install-notes @dirrm pgsql/man/man1 @dirrm pgsql/man/manl @dirrm pgsql/man -@unexec rmdir %D/pgsql/data 2>/dev/null || true -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrm pgsql |