diff options
| author | Chris Piazza <cpiazza@FreeBSD.org> | 1999-10-10 22:06:35 +0000 |
|---|---|---|
| committer | Chris Piazza <cpiazza@FreeBSD.org> | 1999-10-10 22:06:35 +0000 |
| commit | d72365ae81c0096bb3f7c2c40b46131ae3e1c565 (patch) | |
| tree | fc78adbfb80232f1b9160199c060cf18945ec28e | |
| parent | 134508746da4ddcc34c5f8a896327ce7650277ee (diff) | |
| download | ports-d72365ae81c0096bb3f7c2c40b46131ae3e1c565.tar.gz ports-d72365ae81c0096bb3f7c2c40b46131ae3e1c565.zip | |
Update to version 6.5.2.
and..
<quote>
This is a really small fix:
- When compiling postgresql-jdbc, the compilation process presents a
bad path to the installed jar-file.
</quote>
PR: 13838
PR: 13865
Submitted by: Palle Girgensohn <girgen@partitur.se>
Notes
Notes:
svn path=/head/; revision=22314
112 files changed, 350 insertions, 308 deletions
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql-devel-server/Makefile +++ b/databases/postgresql-devel-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql-devel-server/distinfo b/databases/postgresql-devel-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql-devel-server/distinfo +++ b/databases/postgresql-devel-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql-devel-server/files/patch-ar b/databases/postgresql-devel-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql-devel-server/files/patch-ar +++ b/databases/postgresql-devel-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql-devel-server/files/patch-ba b/databases/postgresql-devel-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql-devel-server/files/patch-ba +++ b/databases/postgresql-devel-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql-devel-server/files/post-install-notes b/databases/postgresql-devel-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql-devel-server/files/post-install-notes +++ b/databases/postgresql-devel-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql-devel-server/pkg-plist b/databases/postgresql-devel-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql-devel-server/pkg-plist +++ b/databases/postgresql-devel-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql-devel-server/pkg-plist.tcl b/databases/postgresql-devel-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql-devel-server/pkg-plist.tcl +++ b/databases/postgresql-devel-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql-devel-server/scripts/configure b/databases/postgresql-devel-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql-devel-server/scripts/configure +++ b/databases/postgresql-devel-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql-devel/Makefile +++ b/databases/postgresql-devel/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql-devel/distinfo b/databases/postgresql-devel/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql-devel/distinfo +++ b/databases/postgresql-devel/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql-devel/files/patch-ar b/databases/postgresql-devel/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql-devel/files/patch-ar +++ b/databases/postgresql-devel/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql-devel/files/patch-ba b/databases/postgresql-devel/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql-devel/files/patch-ba +++ b/databases/postgresql-devel/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql-devel/files/post-install-notes b/databases/postgresql-devel/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql-devel/files/post-install-notes +++ b/databases/postgresql-devel/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql-devel/pkg-plist +++ b/databases/postgresql-devel/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql-devel/pkg-plist.tcl b/databases/postgresql-devel/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql-devel/pkg-plist.tcl +++ b/databases/postgresql-devel/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql-devel/scripts/configure b/databases/postgresql-devel/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql-devel/scripts/configure +++ b/databases/postgresql-devel/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql7/Makefile +++ b/databases/postgresql7/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql7/distinfo b/databases/postgresql7/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql7/distinfo +++ b/databases/postgresql7/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql7/files/patch-ar b/databases/postgresql7/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql7/files/patch-ar +++ b/databases/postgresql7/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql7/files/patch-ba b/databases/postgresql7/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql7/files/patch-ba +++ b/databases/postgresql7/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql7/files/post-install-notes b/databases/postgresql7/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql7/files/post-install-notes +++ b/databases/postgresql7/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql7/pkg-plist b/databases/postgresql7/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql7/pkg-plist +++ b/databases/postgresql7/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql7/pkg-plist.tcl b/databases/postgresql7/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql7/pkg-plist.tcl +++ b/databases/postgresql7/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql7/scripts/configure b/databases/postgresql7/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql7/scripts/configure +++ b/databases/postgresql7/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql73-server/distinfo b/databases/postgresql73-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql73-server/distinfo +++ b/databases/postgresql73-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql73-server/files/patch-ar b/databases/postgresql73-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql73-server/files/patch-ar +++ b/databases/postgresql73-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql73-server/files/patch-ba b/databases/postgresql73-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql73-server/files/patch-ba +++ b/databases/postgresql73-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql73-server/files/post-install-notes b/databases/postgresql73-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql73-server/files/post-install-notes +++ b/databases/postgresql73-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql73-server/pkg-plist b/databases/postgresql73-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql73-server/pkg-plist +++ b/databases/postgresql73-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql73-server/pkg-plist.tcl b/databases/postgresql73-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql73-server/pkg-plist.tcl +++ b/databases/postgresql73-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql73-server/scripts/configure b/databases/postgresql73-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql73-server/scripts/configure +++ b/databases/postgresql73-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql73/Makefile +++ b/databases/postgresql73/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql73/distinfo b/databases/postgresql73/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql73/distinfo +++ b/databases/postgresql73/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql73/files/patch-ar b/databases/postgresql73/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql73/files/patch-ar +++ b/databases/postgresql73/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql73/files/patch-ba b/databases/postgresql73/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql73/files/patch-ba +++ b/databases/postgresql73/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql73/files/post-install-notes b/databases/postgresql73/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql73/files/post-install-notes +++ b/databases/postgresql73/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql73/pkg-plist b/databases/postgresql73/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql73/pkg-plist +++ b/databases/postgresql73/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql73/pkg-plist.tcl b/databases/postgresql73/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql73/pkg-plist.tcl +++ b/databases/postgresql73/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql73/scripts/configure b/databases/postgresql73/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql73/scripts/configure +++ b/databases/postgresql73/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql74-server/distinfo +++ b/databases/postgresql74-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql74-server/files/patch-ar b/databases/postgresql74-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql74-server/files/patch-ar +++ b/databases/postgresql74-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql74-server/files/patch-ba b/databases/postgresql74-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql74-server/files/patch-ba +++ b/databases/postgresql74-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql74-server/files/post-install-notes b/databases/postgresql74-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql74-server/files/post-install-notes +++ b/databases/postgresql74-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql74-server/pkg-plist +++ b/databases/postgresql74-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql74-server/pkg-plist.tcl b/databases/postgresql74-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql74-server/pkg-plist.tcl +++ b/databases/postgresql74-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql74-server/scripts/configure b/databases/postgresql74-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql74-server/scripts/configure +++ b/databases/postgresql74-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql80-server/distinfo +++ b/databases/postgresql80-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql80-server/files/patch-ar b/databases/postgresql80-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql80-server/files/patch-ar +++ b/databases/postgresql80-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql80-server/files/patch-ba b/databases/postgresql80-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql80-server/files/patch-ba +++ b/databases/postgresql80-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql80-server/files/post-install-notes b/databases/postgresql80-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql80-server/files/post-install-notes +++ b/databases/postgresql80-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql80-server/pkg-plist b/databases/postgresql80-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql80-server/pkg-plist +++ b/databases/postgresql80-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql80-server/pkg-plist.tcl b/databases/postgresql80-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql80-server/pkg-plist.tcl +++ b/databases/postgresql80-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql80-server/scripts/configure b/databases/postgresql80-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql80-server/scripts/configure +++ b/databases/postgresql80-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql81-server/distinfo +++ b/databases/postgresql81-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql81-server/files/patch-ar b/databases/postgresql81-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql81-server/files/patch-ar +++ b/databases/postgresql81-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql81-server/files/patch-ba b/databases/postgresql81-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql81-server/files/patch-ba +++ b/databases/postgresql81-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql81-server/files/post-install-notes b/databases/postgresql81-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql81-server/files/post-install-notes +++ b/databases/postgresql81-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql81-server/pkg-plist b/databases/postgresql81-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql81-server/pkg-plist +++ b/databases/postgresql81-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql81-server/pkg-plist.tcl b/databases/postgresql81-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql81-server/pkg-plist.tcl +++ b/databases/postgresql81-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql81-server/scripts/configure b/databases/postgresql81-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql81-server/scripts/configure +++ b/databases/postgresql81-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql82-server/distinfo +++ b/databases/postgresql82-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql82-server/files/patch-ar b/databases/postgresql82-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql82-server/files/patch-ar +++ b/databases/postgresql82-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql82-server/files/patch-ba b/databases/postgresql82-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql82-server/files/patch-ba +++ b/databases/postgresql82-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql82-server/files/post-install-notes b/databases/postgresql82-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql82-server/files/post-install-notes +++ b/databases/postgresql82-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql82-server/pkg-plist b/databases/postgresql82-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql82-server/pkg-plist +++ b/databases/postgresql82-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql82-server/pkg-plist.tcl b/databases/postgresql82-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql82-server/pkg-plist.tcl +++ b/databases/postgresql82-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql82-server/scripts/configure b/databases/postgresql82-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql82-server/scripts/configure +++ b/databases/postgresql82-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql83-server/distinfo +++ b/databases/postgresql83-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql83-server/files/patch-ar b/databases/postgresql83-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql83-server/files/patch-ar +++ b/databases/postgresql83-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql83-server/files/patch-ba b/databases/postgresql83-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql83-server/files/patch-ba +++ b/databases/postgresql83-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql83-server/files/post-install-notes b/databases/postgresql83-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql83-server/files/post-install-notes +++ b/databases/postgresql83-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql83-server/pkg-plist b/databases/postgresql83-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql83-server/pkg-plist +++ b/databases/postgresql83-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql83-server/pkg-plist.tcl b/databases/postgresql83-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql83-server/pkg-plist.tcl +++ b/databases/postgresql83-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql83-server/scripts/configure b/databases/postgresql83-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql83-server/scripts/configure +++ b/databases/postgresql83-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql84-server/distinfo +++ b/databases/postgresql84-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql84-server/files/patch-ar b/databases/postgresql84-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql84-server/files/patch-ar +++ b/databases/postgresql84-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql84-server/files/patch-ba b/databases/postgresql84-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql84-server/files/patch-ba +++ b/databases/postgresql84-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql84-server/files/post-install-notes b/databases/postgresql84-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql84-server/files/post-install-notes +++ b/databases/postgresql84-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql84-server/pkg-plist b/databases/postgresql84-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql84-server/pkg-plist +++ b/databases/postgresql84-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql84-server/pkg-plist.tcl b/databases/postgresql84-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql84-server/pkg-plist.tcl +++ b/databases/postgresql84-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql84-server/scripts/configure b/databases/postgresql84-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql84-server/scripts/configure +++ b/databases/postgresql84-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql90-server/distinfo +++ b/databases/postgresql90-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql90-server/files/patch-ar b/databases/postgresql90-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql90-server/files/patch-ar +++ b/databases/postgresql90-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql90-server/files/patch-ba b/databases/postgresql90-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql90-server/files/patch-ba +++ b/databases/postgresql90-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql90-server/files/post-install-notes b/databases/postgresql90-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql90-server/files/post-install-notes +++ b/databases/postgresql90-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql90-server/pkg-plist b/databases/postgresql90-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql90-server/pkg-plist +++ b/databases/postgresql90-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql90-server/pkg-plist.tcl b/databases/postgresql90-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql90-server/pkg-plist.tcl +++ b/databases/postgresql90-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql90-server/scripts/configure b/databases/postgresql90-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql90-server/scripts/configure +++ b/databases/postgresql90-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql91-server/distinfo +++ b/databases/postgresql91-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql91-server/files/patch-ar b/databases/postgresql91-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql91-server/files/patch-ar +++ b/databases/postgresql91-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql91-server/files/patch-ba b/databases/postgresql91-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql91-server/files/patch-ba +++ b/databases/postgresql91-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql91-server/files/post-install-notes b/databases/postgresql91-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql91-server/files/post-install-notes +++ b/databases/postgresql91-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql91-server/pkg-plist b/databases/postgresql91-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql91-server/pkg-plist +++ b/databases/postgresql91-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql91-server/pkg-plist.tcl b/databases/postgresql91-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql91-server/pkg-plist.tcl +++ b/databases/postgresql91-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql91-server/scripts/configure b/databases/postgresql91-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql91-server/scripts/configure +++ b/databases/postgresql91-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index aae3a1708ffb..7a13440c0200 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.postgresql.org/pub/ \ ftp://ftp.iodynamics.com/pub/mirror/postgresql/ \ @@ -106,13 +106,14 @@ post-patch: ${WRKSRC}/Makefile.global.in.old \ >> ${WRKSRC}/Makefile.global.in -.if defined(USE_TCL) - @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig - @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ - ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ - >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl -.endif +# pgaccess (accidentally?) removed from distribution, so leave it for now +#.if defined(USE_TCL) +# @ ${MV} ${WRKSRC}/bin/pgaccess/pgaccess.tcl \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig +# @ ${SED} -e "s=/usr/bin/wish=`/usr/bin/which wish8.0`=" \ +# ${WRKSRC}/bin/pgaccess/pgaccess.tcl.orig \ +# >> ${WRKSRC}/bin/pgaccess/pgaccess.tcl +#.endif post-build: diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo index 60c8af1a3087..b4f12d5fb3cb 100644 --- a/databases/postgresql92-server/distinfo +++ b/databases/postgresql92-server/distinfo @@ -1 +1 @@ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql92-server/files/patch-ar b/databases/postgresql92-server/files/patch-ar index bc54daf60a4a..c5c8096fc141 100644 --- a/databases/postgresql92-server/files/patch-ar +++ b/databases/postgresql92-server/files/patch-ar @@ -1,11 +1,11 @@ ---- configure~ Sun May 30 09:01:09 1999 -+++ configure Mon Jun 21 16:52:53 1999 -@@ -663,7 +663,7 @@ - exit;; - esac - --if test "X$elf" = "Xyes" -+if test "X$PORTOBJFORMAT" = "Xelf" +--- configure.orig Sun Oct 10 14:37:07 1999 ++++ configure Sun Oct 10 14:37:29 1999 +@@ -1429,7 +1429,7 @@ + ELF_SYS=true + else + rm -rf conftest* +- if test "X$elf" = "Xyes" ++ if test "X$PORTOBJFORMAT" = "Xelf" then ELF_SYS=true else diff --git a/databases/postgresql92-server/files/patch-ba b/databases/postgresql92-server/files/patch-ba index 5d64eff4e1d9..129a60c3d2f3 100644 --- a/databases/postgresql92-server/files/patch-ba +++ b/databases/postgresql92-server/files/patch-ba @@ -26,7 +26,7 @@ - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" + @echo other applications, add the path -+ @echo !!JAVA_HOME!!/share/java/postgresql.jar ++ @echo !!PREFIX!!/share/java/postgresql.jar @echo to the class path. @echo @echo Then either add -Djdbc.drivers=postgresql.Driver to the diff --git a/databases/postgresql92-server/files/post-install-notes b/databases/postgresql92-server/files/post-install-notes index a57562fe871e..d99f47615730 100644 --- a/databases/postgresql92-server/files/post-install-notes +++ b/databases/postgresql92-server/files/post-install-notes @@ -8,6 +8,7 @@ You may wish to subscribe to the PostgreSQL user-support mailing list. Send an e-mail to pgsql-questions-request@postgresql.org with the text "subscribe" in the message body. -If you build PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +If you built PostgreSQL with TCL support, you can install the port +"pgaccess" to get a TCL/TK based database frontend for database +operations. diff --git a/databases/postgresql92-server/pkg-plist b/databases/postgresql92-server/pkg-plist index 2999ef8daf56..d58a27f31eb5 100644 --- a/databases/postgresql92-server/pkg-plist +++ b/databases/postgresql92-server/pkg-plist @@ -127,7 +127,9 @@ share/doc/pgsql/FAQ_FreeBSD share/doc/pgsql/FAQ_HPUX share/doc/pgsql/FAQ_Irix share/doc/pgsql/FAQ_Linux +share/doc/pgsql/FAQ_Solaris share/doc/pgsql/FAQ_SCO +share/doc/pgsql/README.Charsets share/doc/pgsql/README.NT share/doc/pgsql/README.fsync share/doc/pgsql/README.inet diff --git a/databases/postgresql92-server/pkg-plist.tcl b/databases/postgresql92-server/pkg-plist.tcl index 99dca5c488c4..f3d0a042d747 100644 --- a/databases/postgresql92-server/pkg-plist.tcl +++ b/databases/postgresql92-server/pkg-plist.tcl @@ -1,4 +1,3 @@ -pgsql/bin/pgaccess pgsql/bin/pgtclsh pgsql/bin/pgtksh pgsql/include/libpgtcl.h diff --git a/databases/postgresql92-server/scripts/configure b/databases/postgresql92-server/scripts/configure index 8f35cd4d686a..4a92ee450ebe 100644 --- a/databases/postgresql92-server/scripts/configure +++ b/databases/postgresql92-server/scripts/configure @@ -4,4 +4,4 @@ cd $WRKSRC || exit 1 -perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=" ${WRKSRC}/interfaces/jdbc/Makefile +perl -pi -e "s=!!JAVA_HOME!!=${JAVA_HOME}=; s=!!PREFIX!!=${PREFIX}=" ${WRKSRC}/interfaces/jdbc/Makefile |