aboutsummaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2000-06-20 05:08:07 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2000-06-20 05:08:07 +0000
commit7145c7d0d1f07cb4b8a01045b9dc89e1ef7e3060 (patch)
tree0e2c287e9ee287c407285420bfaf825241e23bf5 /databases
parent75d6e619b822ccff9338e52a13d553cfc390ed84 (diff)
downloadports-7145c7d0d1f07cb4b8a01045b9dc89e1ef7e3060.tar.gz
ports-7145c7d0d1f07cb4b8a01045b9dc89e1ef7e3060.zip
Notes
Diffstat (limited to 'databases')
-rw-r--r--databases/postgresql-devel-server/Makefile48
-rw-r--r--databases/postgresql-devel-server/distinfo8
-rw-r--r--databases/postgresql-devel-server/files/patch-bb2
-rw-r--r--databases/postgresql-devel-server/files/post-install-notes2
-rw-r--r--databases/postgresql-devel-server/pkg-plist4
-rw-r--r--databases/postgresql-devel-server/pkg-plist.doc9
-rw-r--r--databases/postgresql-devel-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql-devel/Makefile48
-rw-r--r--databases/postgresql-devel/distinfo8
-rw-r--r--databases/postgresql-devel/files/patch-bb2
-rw-r--r--databases/postgresql-devel/files/post-install-notes2
-rw-r--r--databases/postgresql-devel/pkg-plist4
-rw-r--r--databases/postgresql-devel/pkg-plist.doc9
-rw-r--r--databases/postgresql-devel/pkg-plist.tcl256
-rw-r--r--databases/postgresql7/Makefile48
-rw-r--r--databases/postgresql7/distinfo8
-rw-r--r--databases/postgresql7/files/patch-bb2
-rw-r--r--databases/postgresql7/files/post-install-notes2
-rw-r--r--databases/postgresql7/pkg-plist4
-rw-r--r--databases/postgresql7/pkg-plist.doc9
-rw-r--r--databases/postgresql7/pkg-plist.tcl256
-rw-r--r--databases/postgresql73-server/Makefile48
-rw-r--r--databases/postgresql73-server/distinfo8
-rw-r--r--databases/postgresql73-server/files/patch-bb2
-rw-r--r--databases/postgresql73-server/files/post-install-notes2
-rw-r--r--databases/postgresql73-server/pkg-plist4
-rw-r--r--databases/postgresql73-server/pkg-plist.doc9
-rw-r--r--databases/postgresql73-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql73/Makefile48
-rw-r--r--databases/postgresql73/distinfo8
-rw-r--r--databases/postgresql73/files/patch-bb2
-rw-r--r--databases/postgresql73/files/post-install-notes2
-rw-r--r--databases/postgresql73/pkg-plist4
-rw-r--r--databases/postgresql73/pkg-plist.doc9
-rw-r--r--databases/postgresql73/pkg-plist.tcl256
-rw-r--r--databases/postgresql74-server/Makefile48
-rw-r--r--databases/postgresql74-server/distinfo8
-rw-r--r--databases/postgresql74-server/files/patch-bb2
-rw-r--r--databases/postgresql74-server/files/post-install-notes2
-rw-r--r--databases/postgresql74-server/pkg-plist4
-rw-r--r--databases/postgresql74-server/pkg-plist.doc9
-rw-r--r--databases/postgresql74-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql80-server/Makefile48
-rw-r--r--databases/postgresql80-server/distinfo8
-rw-r--r--databases/postgresql80-server/files/patch-bb2
-rw-r--r--databases/postgresql80-server/files/post-install-notes2
-rw-r--r--databases/postgresql80-server/pkg-plist4
-rw-r--r--databases/postgresql80-server/pkg-plist.doc9
-rw-r--r--databases/postgresql80-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql81-server/Makefile48
-rw-r--r--databases/postgresql81-server/distinfo8
-rw-r--r--databases/postgresql81-server/files/patch-bb2
-rw-r--r--databases/postgresql81-server/files/post-install-notes2
-rw-r--r--databases/postgresql81-server/pkg-plist4
-rw-r--r--databases/postgresql81-server/pkg-plist.doc9
-rw-r--r--databases/postgresql81-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql82-server/Makefile48
-rw-r--r--databases/postgresql82-server/distinfo8
-rw-r--r--databases/postgresql82-server/files/patch-bb2
-rw-r--r--databases/postgresql82-server/files/post-install-notes2
-rw-r--r--databases/postgresql82-server/pkg-plist4
-rw-r--r--databases/postgresql82-server/pkg-plist.doc9
-rw-r--r--databases/postgresql82-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql83-server/Makefile48
-rw-r--r--databases/postgresql83-server/distinfo8
-rw-r--r--databases/postgresql83-server/files/patch-bb2
-rw-r--r--databases/postgresql83-server/files/post-install-notes2
-rw-r--r--databases/postgresql83-server/pkg-plist4
-rw-r--r--databases/postgresql83-server/pkg-plist.doc9
-rw-r--r--databases/postgresql83-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql84-server/Makefile48
-rw-r--r--databases/postgresql84-server/distinfo8
-rw-r--r--databases/postgresql84-server/files/patch-bb2
-rw-r--r--databases/postgresql84-server/files/post-install-notes2
-rw-r--r--databases/postgresql84-server/pkg-plist4
-rw-r--r--databases/postgresql84-server/pkg-plist.doc9
-rw-r--r--databases/postgresql84-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql90-server/Makefile48
-rw-r--r--databases/postgresql90-server/distinfo8
-rw-r--r--databases/postgresql90-server/files/patch-bb2
-rw-r--r--databases/postgresql90-server/files/post-install-notes2
-rw-r--r--databases/postgresql90-server/pkg-plist4
-rw-r--r--databases/postgresql90-server/pkg-plist.doc9
-rw-r--r--databases/postgresql90-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql91-server/Makefile48
-rw-r--r--databases/postgresql91-server/distinfo8
-rw-r--r--databases/postgresql91-server/files/patch-bb2
-rw-r--r--databases/postgresql91-server/files/post-install-notes2
-rw-r--r--databases/postgresql91-server/pkg-plist4
-rw-r--r--databases/postgresql91-server/pkg-plist.doc9
-rw-r--r--databases/postgresql91-server/pkg-plist.tcl256
-rw-r--r--databases/postgresql92-server/Makefile48
-rw-r--r--databases/postgresql92-server/distinfo8
-rw-r--r--databases/postgresql92-server/files/patch-bb2
-rw-r--r--databases/postgresql92-server/files/post-install-notes2
-rw-r--r--databases/postgresql92-server/pkg-plist4
-rw-r--r--databases/postgresql92-server/pkg-plist.doc9
-rw-r--r--databases/postgresql92-server/pkg-plist.tcl256
98 files changed, 2310 insertions, 2296 deletions
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql-devel-server/distinfo b/databases/postgresql-devel-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql-devel-server/distinfo
+++ b/databases/postgresql-devel-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql-devel-server/files/patch-bb b/databases/postgresql-devel-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql-devel-server/files/patch-bb
+++ b/databases/postgresql-devel-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql-devel-server/files/post-install-notes b/databases/postgresql-devel-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql-devel-server/files/post-install-notes
+++ b/databases/postgresql-devel-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql-devel-server/pkg-plist b/databases/postgresql-devel-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql-devel-server/pkg-plist
+++ b/databases/postgresql-devel-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql-devel-server/pkg-plist.doc b/databases/postgresql-devel-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql-devel-server/pkg-plist.doc
+++ b/databases/postgresql-devel-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql-devel-server/pkg-plist.tcl b/databases/postgresql-devel-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql-devel-server/pkg-plist.tcl
+++ b/databases/postgresql-devel-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql-devel/distinfo b/databases/postgresql-devel/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql-devel/distinfo
+++ b/databases/postgresql-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql-devel/files/patch-bb b/databases/postgresql-devel/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql-devel/files/patch-bb
+++ b/databases/postgresql-devel/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql-devel/files/post-install-notes b/databases/postgresql-devel/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql-devel/files/post-install-notes
+++ b/databases/postgresql-devel/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql-devel/pkg-plist
+++ b/databases/postgresql-devel/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql-devel/pkg-plist.doc b/databases/postgresql-devel/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql-devel/pkg-plist.doc
+++ b/databases/postgresql-devel/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql-devel/pkg-plist.tcl b/databases/postgresql-devel/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql-devel/pkg-plist.tcl
+++ b/databases/postgresql-devel/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql7/distinfo b/databases/postgresql7/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql7/distinfo
+++ b/databases/postgresql7/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql7/files/patch-bb b/databases/postgresql7/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql7/files/patch-bb
+++ b/databases/postgresql7/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql7/files/post-install-notes b/databases/postgresql7/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql7/files/post-install-notes
+++ b/databases/postgresql7/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql7/pkg-plist b/databases/postgresql7/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql7/pkg-plist
+++ b/databases/postgresql7/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql7/pkg-plist.doc b/databases/postgresql7/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql7/pkg-plist.doc
+++ b/databases/postgresql7/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql7/pkg-plist.tcl b/databases/postgresql7/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql7/pkg-plist.tcl
+++ b/databases/postgresql7/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql73-server/distinfo b/databases/postgresql73-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql73-server/distinfo
+++ b/databases/postgresql73-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql73-server/files/patch-bb b/databases/postgresql73-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql73-server/files/patch-bb
+++ b/databases/postgresql73-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql73-server/files/post-install-notes b/databases/postgresql73-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql73-server/files/post-install-notes
+++ b/databases/postgresql73-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql73-server/pkg-plist b/databases/postgresql73-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql73-server/pkg-plist
+++ b/databases/postgresql73-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql73-server/pkg-plist.doc b/databases/postgresql73-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql73-server/pkg-plist.doc
+++ b/databases/postgresql73-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql73-server/pkg-plist.tcl b/databases/postgresql73-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql73-server/pkg-plist.tcl
+++ b/databases/postgresql73-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql73/distinfo b/databases/postgresql73/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql73/distinfo
+++ b/databases/postgresql73/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql73/files/patch-bb b/databases/postgresql73/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql73/files/patch-bb
+++ b/databases/postgresql73/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql73/files/post-install-notes b/databases/postgresql73/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql73/files/post-install-notes
+++ b/databases/postgresql73/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql73/pkg-plist b/databases/postgresql73/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql73/pkg-plist
+++ b/databases/postgresql73/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql73/pkg-plist.doc b/databases/postgresql73/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql73/pkg-plist.doc
+++ b/databases/postgresql73/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql73/pkg-plist.tcl b/databases/postgresql73/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql73/pkg-plist.tcl
+++ b/databases/postgresql73/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql74-server/files/patch-bb b/databases/postgresql74-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql74-server/files/patch-bb
+++ b/databases/postgresql74-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql74-server/files/post-install-notes b/databases/postgresql74-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql74-server/files/post-install-notes
+++ b/databases/postgresql74-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql74-server/pkg-plist
+++ b/databases/postgresql74-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql74-server/pkg-plist.doc b/databases/postgresql74-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql74-server/pkg-plist.doc
+++ b/databases/postgresql74-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql74-server/pkg-plist.tcl b/databases/postgresql74-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql74-server/pkg-plist.tcl
+++ b/databases/postgresql74-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql80-server/files/patch-bb b/databases/postgresql80-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql80-server/files/patch-bb
+++ b/databases/postgresql80-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql80-server/files/post-install-notes b/databases/postgresql80-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql80-server/files/post-install-notes
+++ b/databases/postgresql80-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql80-server/pkg-plist b/databases/postgresql80-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql80-server/pkg-plist
+++ b/databases/postgresql80-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql80-server/pkg-plist.doc b/databases/postgresql80-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql80-server/pkg-plist.doc
+++ b/databases/postgresql80-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql80-server/pkg-plist.tcl b/databases/postgresql80-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql80-server/pkg-plist.tcl
+++ b/databases/postgresql80-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql81-server/files/patch-bb b/databases/postgresql81-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql81-server/files/patch-bb
+++ b/databases/postgresql81-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql81-server/files/post-install-notes b/databases/postgresql81-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql81-server/files/post-install-notes
+++ b/databases/postgresql81-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql81-server/pkg-plist b/databases/postgresql81-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql81-server/pkg-plist
+++ b/databases/postgresql81-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql81-server/pkg-plist.doc b/databases/postgresql81-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql81-server/pkg-plist.doc
+++ b/databases/postgresql81-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql81-server/pkg-plist.tcl b/databases/postgresql81-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql81-server/pkg-plist.tcl
+++ b/databases/postgresql81-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql82-server/files/patch-bb b/databases/postgresql82-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql82-server/files/patch-bb
+++ b/databases/postgresql82-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql82-server/files/post-install-notes b/databases/postgresql82-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql82-server/files/post-install-notes
+++ b/databases/postgresql82-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql82-server/pkg-plist b/databases/postgresql82-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql82-server/pkg-plist
+++ b/databases/postgresql82-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql82-server/pkg-plist.doc b/databases/postgresql82-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql82-server/pkg-plist.doc
+++ b/databases/postgresql82-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql82-server/pkg-plist.tcl b/databases/postgresql82-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql82-server/pkg-plist.tcl
+++ b/databases/postgresql82-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql83-server/files/patch-bb b/databases/postgresql83-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql83-server/files/patch-bb
+++ b/databases/postgresql83-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql83-server/files/post-install-notes b/databases/postgresql83-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql83-server/files/post-install-notes
+++ b/databases/postgresql83-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql83-server/pkg-plist b/databases/postgresql83-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql83-server/pkg-plist
+++ b/databases/postgresql83-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql83-server/pkg-plist.doc b/databases/postgresql83-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql83-server/pkg-plist.doc
+++ b/databases/postgresql83-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql83-server/pkg-plist.tcl b/databases/postgresql83-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql83-server/pkg-plist.tcl
+++ b/databases/postgresql83-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql84-server/files/patch-bb b/databases/postgresql84-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql84-server/files/patch-bb
+++ b/databases/postgresql84-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql84-server/files/post-install-notes b/databases/postgresql84-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql84-server/files/post-install-notes
+++ b/databases/postgresql84-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql84-server/pkg-plist b/databases/postgresql84-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql84-server/pkg-plist
+++ b/databases/postgresql84-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql84-server/pkg-plist.doc b/databases/postgresql84-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql84-server/pkg-plist.doc
+++ b/databases/postgresql84-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql84-server/pkg-plist.tcl b/databases/postgresql84-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql84-server/pkg-plist.tcl
+++ b/databases/postgresql84-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql90-server/files/patch-bb b/databases/postgresql90-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql90-server/files/patch-bb
+++ b/databases/postgresql90-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql90-server/files/post-install-notes b/databases/postgresql90-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql90-server/files/post-install-notes
+++ b/databases/postgresql90-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql90-server/pkg-plist b/databases/postgresql90-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql90-server/pkg-plist
+++ b/databases/postgresql90-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql90-server/pkg-plist.doc b/databases/postgresql90-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql90-server/pkg-plist.doc
+++ b/databases/postgresql90-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql90-server/pkg-plist.tcl b/databases/postgresql90-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql90-server/pkg-plist.tcl
+++ b/databases/postgresql90-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql91-server/files/patch-bb b/databases/postgresql91-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql91-server/files/patch-bb
+++ b/databases/postgresql91-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql91-server/files/post-install-notes b/databases/postgresql91-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql91-server/files/post-install-notes
+++ b/databases/postgresql91-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql91-server/pkg-plist b/databases/postgresql91-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql91-server/pkg-plist
+++ b/databases/postgresql91-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql91-server/pkg-plist.doc b/databases/postgresql91-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql91-server/pkg-plist.doc
+++ b/databases/postgresql91-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql91-server/pkg-plist.tcl b/databases/postgresql91-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql91-server/pkg-plist.tcl
+++ b/databases/postgresql91-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 2c799c1b647f..8f37cfe1196e 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,19 +6,18 @@
#
PORTNAME= postgresql
-PORTVERSION= 7.0
+PORTVERSION= 7.0.2
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.postgresql.org/pub/source/v7.0/ \
- ftp://ftp.de.postgresql.org/source/v7.0/ \
- ftp://ftp.iodynamics.com/pub/mirror/postgresql/source/v7.0/ \
- ftp://ftp.digex.net/pub/packages/database/postgresql/source/v7.0/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/source/v7.0/
-DISTFILES= $(PORTNAME)-$(PORTVERSION).base.tar.gz \
- $(PORTNAME)-$(PORTVERSION).support.tar.gz
-# $(PORTNAME)-$(PORTVERSION).test.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+= $(PORTNAME)-$(PORTVERSION).docs.tar.gz
-.endif
+MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
+ ftp://ftp.de.postgresql.org/%SUBDIR%/ \
+ ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
+ ftp://ftp.digex.net/pub/packages/database/postgresql/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/%SUBDIR%/
+MASTER_SITE_SUBDIR= source/v${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION}.base${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.support${EXTRACT_SUFX} \
+ ${PORTNAME}-${PORTVERSION}.docs${EXTRACT_SUFX}
+# ${PORTNAME}-${PORTVERSION}.test${EXTRACT_SUFX}
DIST_SUBDIR= postgresql
MAINTAINER= andreas@FreeBSD.org
@@ -29,16 +28,19 @@ BROKEN= doesn\'t build on the alpha yet
Y2K= http://www.postgresql.org/y2k.html
+INSTALLS_SHLIB= YES
+LDCONFIG_DIRS= %%PREFIX%%/pgsql
+
# if you want to use the tcl/tk frontend pgaccess, then you need to build
# postgresql with tcl support by typing: make -DWITH_TCL
.if defined(WITH_TCL)
-TCL_INCDIR= ${LOCALBASE}/include/tcl8.2
-TK_INCDIR= ${LOCALBASE}/include/tk8.2
+TCL_INCDIR= ${LOCALBASE}/include/tcl8.3
+TK_INCDIR= ${LOCALBASE}/include/tk8.3
MAKE_ENV= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.2
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.2 ${LOCALBASE}/lib/tk8.2"
+CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.3
+LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 \
+ tk83.1:${PORTSDIR}/x11-toolkits/tk83
+CONFIGURE_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.3 ${LOCALBASE}/lib/tk8.3"
.endif
# if you want to disable the multibyte support, type:
@@ -197,19 +199,23 @@ post-install:
@ ${CHOWN} -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
- @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
+ @ su -l pgsql -c 'PATH=${PREFIX}/pgsql/bin:${PATH} LD_LIBRARY_PATH=${PREFIX}/pgsql/lib ${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${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
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+.if defined(WITHOUT_MULTIBYTE)
+ @${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
+ @${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
+.endif
.if defined(WITH_TCL)
@${CP} ${TMPPLIST} ${TMPPLIST}.notcl
@${CAT} ${PKGDIR}/PLIST.tcl ${TMPPLIST}.notcl > ${TMPPLIST}
@${RM} ${TMPPLIST}.notcl
.endif
.if defined(WITH_JDBC)
- @ ${MKDIR} -m 0555 ${PREFIX}/share/java
+ @ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes
@ ${INSTALL_DATA} ${WRKSRC}/interfaces/jdbc/postgresql.jar \
${PREFIX}/share/java/classes/postgresql.jar
@ ${ECHO_MSG} "---------------------------------------------------------"
@@ -239,7 +245,7 @@ post-install:
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/FAQ* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/README* ${PREFIX}/share/doc/pgsql
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/TODO ${PREFIX}/share/doc/pgsql
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
+# ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
.endif
.if !defined(BATCH)
@ more -e ${FILESDIR}/post-install-notes
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index b7d4cc6db9ac..309ea1e11614 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-7.0.base.tar.gz) = dfa6b0a1241b59049edfccff3f14ed7f
-MD5 (postgresql/postgresql-7.0.support.tar.gz) = 2cb3285bbfa367536141fbc7e4fcb5ab
-MD5 (postgresql/postgresql-7.0.test.tar.gz) = 77f1ce5f8a4a5a63cae85390319097c9
-MD5 (postgresql/postgresql-7.0.docs.tar.gz) = e999c54e52e1d6c93522788beafe4b5a
+MD5 (postgresql/postgresql-7.0.2.base.tar.gz) = 871d23b85d9a3599a7ed75dfc7da7ba7
+MD5 (postgresql/postgresql-7.0.2.support.tar.gz) = c21180a6485d85785c8e69f0cbff05dd
+MD5 (postgresql/postgresql-7.0.2.docs.tar.gz) = efac1f87463f252e54d72b256885b883
+MD5 (postgresql/postgresql-7.0.2.test.tar.gz) = 3443b3d83194c396f20aee2adc6f93bf
diff --git a/databases/postgresql92-server/files/patch-bb b/databases/postgresql92-server/files/patch-bb
index 21759027a23e..ea0f1732dcb0 100644
--- a/databases/postgresql92-server/files/patch-bb
+++ b/databases/postgresql92-server/files/patch-bb
@@ -3,7 +3,7 @@
@@ -71,7 +71,9 @@
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
- CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
-
+
+CFLAGS+= -I$(TCL_INCDIR)
diff --git a/databases/postgresql92-server/files/post-install-notes b/databases/postgresql92-server/files/post-install-notes
index d99f47615730..289a7651109a 100644
--- a/databases/postgresql92-server/files/post-install-notes
+++ b/databases/postgresql92-server/files/post-install-notes
@@ -12,3 +12,5 @@ If you built PostgreSQL with TCL support, you can install the port
"pgaccess" to get a TCL/TK based database frontend for database
operations.
+To start PostgreSQL, run the startup script:
+$PREFIX/etc/rc.d/pgsql.sh start
diff --git a/databases/postgresql92-server/pkg-plist b/databases/postgresql92-server/pkg-plist
index 16aeb6625388..9992da1174ae 100644
--- a/databases/postgresql92-server/pkg-plist
+++ b/databases/postgresql92-server/pkg-plist
@@ -13,6 +13,7 @@ pgsql/bin/ipcclean
pgsql/bin/pg_ctl
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
+pgsql/bin/pg_encoding
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_upgrade
@@ -140,12 +141,11 @@ pgsql/lib/local1_template1.bki.source
pgsql/lib/local1_template1.description
pgsql/lib/pg_geqo.sample
pgsql/lib/pg_hba.conf.sample
+pgsql/lib/pg_ident.conf.sample
pgsql/lib/pg_options.sample
pgsql/lib/plpgsql.so
pgsql/lib/postmaster.opts.default.sample
pgsql/post-install-notes
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
diff --git a/databases/postgresql92-server/pkg-plist.doc b/databases/postgresql92-server/pkg-plist.doc
index f93d599c59ee..06b7bd9ea116 100644
--- a/databases/postgresql92-server/pkg-plist.doc
+++ b/databases/postgresql92-server/pkg-plist.doc
@@ -1,5 +1,6 @@
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
+share/doc/pgsql/FAQ_BSDI
share/doc/pgsql/FAQ_DEV
share/doc/pgsql/FAQ_DigitalUnix
share/doc/pgsql/FAQ_FreeBSD
@@ -87,8 +88,6 @@ share/doc/pgsql/admin/trouble.htm
share/doc/pgsql/admin/trouble1721.htm
share/doc/pgsql/admin/trouble1738.htm
share/doc/pgsql/admin/y2k.htm
-share/doc/pgsql/admin.ps.gz
-share/doc/pgsql/adminA4.ps.gz
share/doc/pgsql/postgres/about.htm
share/doc/pgsql/postgres/advanced.htm
share/doc/pgsql/postgres/advanced27923.htm
@@ -677,8 +676,6 @@ share/doc/pgsql/programmer/xoper.htm
share/doc/pgsql/programmer/xplang.htm
share/doc/pgsql/programmer/xtypes.htm
share/doc/pgsql/programmer/y2k.htm
-share/doc/pgsql/programmer.ps.gz
-share/doc/pgsql/programmerA4.ps.gz
share/doc/pgsql/tutorial/about.htm
share/doc/pgsql/tutorial/advanced.htm
share/doc/pgsql/tutorial/advanced1511.htm
@@ -715,8 +712,6 @@ share/doc/pgsql/tutorial/terminology.htm
share/doc/pgsql/tutorial/tutorial.htm
share/doc/pgsql/tutorial/tutorial.html
share/doc/pgsql/tutorial/y2k.htm
-share/doc/pgsql/tutorial.ps.gz
-share/doc/pgsql/tutorialA4.ps.gz
share/doc/pgsql/user/about.htm
share/doc/pgsql/user/app-createdb.htm
share/doc/pgsql/user/app-createlang.htm
@@ -885,8 +880,6 @@ share/doc/pgsql/user/user.htm
share/doc/pgsql/user/user.html
share/doc/pgsql/user/utilities.htm
share/doc/pgsql/user/y2k.htm
-share/doc/pgsql/user.ps.gz
-share/doc/pgsql/userA4.ps.gz
@dirrm share/doc/pgsql/admin
@dirrm share/doc/pgsql/postgres
@dirrm share/doc/pgsql/programmer
diff --git a/databases/postgresql92-server/pkg-plist.tcl b/databases/postgresql92-server/pkg-plist.tcl
index d4de00a7d3c2..b01eaf1571ed 100644
--- a/databases/postgresql92-server/pkg-plist.tcl
+++ b/databases/postgresql92-server/pkg-plist.tcl
@@ -6,134 +6,134 @@ pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so
pgsql/lib/libpgtcl.so.2
pgsql/lib/pltcl.so
-share/pgaccess/images/icon_button.gif
-share/pgaccess/images/icon_checkbutton.gif
-share/pgaccess/images/icon_entry.gif
-share/pgaccess/images/icon_frame.gif
-share/pgaccess/images/icon_label.gif
-share/pgaccess/images/icon_listbox.gif
-share/pgaccess/images/icon_query.gif
-share/pgaccess/images/icon_radiobutton.gif
-share/pgaccess/images/icon_text.gif
-share/pgaccess/lib/database.tcl
-share/pgaccess/lib/forms.tcl
-share/pgaccess/lib/functions.tcl
-share/pgaccess/lib/help/abort.hlp
-share/pgaccess/lib/help/add_records.hlp
-share/pgaccess/lib/help/alter_table.hlp
-share/pgaccess/lib/help/alter_user.hlp
-share/pgaccess/lib/help/author.hlp
-share/pgaccess/lib/help/begin.hlp
-share/pgaccess/lib/help/close.hlp
-share/pgaccess/lib/help/cluster.hlp
-share/pgaccess/lib/help/commit.hlp
-share/pgaccess/lib/help/copy.hlp
-share/pgaccess/lib/help/copyrights.hlp
-share/pgaccess/lib/help/create_aggregate.hlp
-share/pgaccess/lib/help/create_database.hlp
-share/pgaccess/lib/help/create_function.hlp
-share/pgaccess/lib/help/create_index.hlp
-share/pgaccess/lib/help/create_language.hlp
-share/pgaccess/lib/help/create_operator.hlp
-share/pgaccess/lib/help/create_rule.hlp
-share/pgaccess/lib/help/create_sequence.hlp
-share/pgaccess/lib/help/create_table.hlp
-share/pgaccess/lib/help/create_table_as.hlp
-share/pgaccess/lib/help/create_trigger.hlp
-share/pgaccess/lib/help/create_type.hlp
-share/pgaccess/lib/help/create_user.hlp
-share/pgaccess/lib/help/create_view.hlp
-share/pgaccess/lib/help/data_types.hlp
-share/pgaccess/lib/help/datefunc.hlp
-share/pgaccess/lib/help/declare.hlp
-share/pgaccess/lib/help/delete.hlp
-share/pgaccess/lib/help/drop_aggregate.hlp
-share/pgaccess/lib/help/drop_database.hlp
-share/pgaccess/lib/help/drop_function.hlp
-share/pgaccess/lib/help/drop_index.hlp
-share/pgaccess/lib/help/drop_language.hlp
-share/pgaccess/lib/help/drop_operator.hlp
-share/pgaccess/lib/help/drop_rule.hlp
-share/pgaccess/lib/help/drop_sequence.hlp
-share/pgaccess/lib/help/drop_table.hlp
-share/pgaccess/lib/help/drop_trigger.hlp
-share/pgaccess/lib/help/drop_type.hlp
-share/pgaccess/lib/help/drop_user.hlp
-share/pgaccess/lib/help/drop_view.hlp
-share/pgaccess/lib/help/explain.hlp
-share/pgaccess/lib/help/fetch.hlp
-share/pgaccess/lib/help/form_design.hlp
-share/pgaccess/lib/help/forms.hlp
-share/pgaccess/lib/help/functions.hlp
-share/pgaccess/lib/help/geomfunc.hlp
-share/pgaccess/lib/help/grant.hlp
-share/pgaccess/lib/help/history.hlp
-share/pgaccess/lib/help/index.hlp
-share/pgaccess/lib/help/inheritance.hlp
-share/pgaccess/lib/help/insert.hlp
-share/pgaccess/lib/help/ipv4func.hlp
-share/pgaccess/lib/help/isolation.hlp
-share/pgaccess/lib/help/keywords.hlp
-share/pgaccess/lib/help/listen.hlp
-share/pgaccess/lib/help/load.hlp
-share/pgaccess/lib/help/lock.hlp
-share/pgaccess/lib/help/mathfunc.hlp
-share/pgaccess/lib/help/move.hlp
-share/pgaccess/lib/help/mvcc.hlp
-share/pgaccess/lib/help/new_query.hlp
-share/pgaccess/lib/help/new_table.hlp
-share/pgaccess/lib/help/notify.hlp
-share/pgaccess/lib/help/open_query.hlp
-share/pgaccess/lib/help/open_table.hlp
-share/pgaccess/lib/help/pgfunctions.hlp
-share/pgaccess/lib/help/postgresql.hlp
-share/pgaccess/lib/help/queries.hlp
-share/pgaccess/lib/help/reports.hlp
-share/pgaccess/lib/help/reset.hlp
-share/pgaccess/lib/help/revoke.hlp
-share/pgaccess/lib/help/rollback.hlp
-share/pgaccess/lib/help/schema.hlp
-share/pgaccess/lib/help/scripts.hlp
-share/pgaccess/lib/help/select.hlp
-share/pgaccess/lib/help/select_into.hlp
-share/pgaccess/lib/help/sequences.hlp
-share/pgaccess/lib/help/set.hlp
-share/pgaccess/lib/help/show.hlp
-share/pgaccess/lib/help/sql_guide.hlp
-share/pgaccess/lib/help/sqlfunc.hlp
-share/pgaccess/lib/help/stringfunc.hlp
-share/pgaccess/lib/help/tables.hlp
-share/pgaccess/lib/help/unlisten.hlp
-share/pgaccess/lib/help/update.hlp
-share/pgaccess/lib/help/users.hlp
-share/pgaccess/lib/help/vacuum.hlp
-share/pgaccess/lib/help/view_table_structure.hlp
-share/pgaccess/lib/help/views.hlp
-share/pgaccess/lib/help/visual_designer.hlp
-share/pgaccess/lib/help/y2k.hlp
-share/pgaccess/lib/help.tcl
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
-share/pgaccess/lib/languages/francais
-share/pgaccess/lib/languages/italiano
-share/pgaccess/lib/languages/magyar
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/russian.koi8r
-share/pgaccess/lib/languages/russian_win
-share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/mainlib.tcl
-share/pgaccess/lib/preferences.tcl
-share/pgaccess/lib/queries.tcl
-share/pgaccess/lib/reports.tcl
-share/pgaccess/lib/schema.tcl
-share/pgaccess/lib/scripts.tcl
-share/pgaccess/lib/sequences.tcl
-share/pgaccess/lib/tables.tcl
-share/pgaccess/lib/users.tcl
-share/pgaccess/lib/views.tcl
-share/pgaccess/lib/visualqb.tcl
-share/pgaccess/main.tcl
+pgsql/pgaccess/images/icon_button.gif
+pgsql/pgaccess/images/icon_checkbutton.gif
+pgsql/pgaccess/images/icon_entry.gif
+pgsql/pgaccess/images/icon_frame.gif
+pgsql/pgaccess/images/icon_label.gif
+pgsql/pgaccess/images/icon_listbox.gif
+pgsql/pgaccess/images/icon_query.gif
+pgsql/pgaccess/images/icon_radiobutton.gif
+pgsql/pgaccess/images/icon_text.gif
+pgsql/pgaccess/lib/database.tcl
+pgsql/pgaccess/lib/forms.tcl
+pgsql/pgaccess/lib/functions.tcl
+pgsql/pgaccess/lib/help/abort.hlp
+pgsql/pgaccess/lib/help/add_records.hlp
+pgsql/pgaccess/lib/help/alter_table.hlp
+pgsql/pgaccess/lib/help/alter_user.hlp
+pgsql/pgaccess/lib/help/author.hlp
+pgsql/pgaccess/lib/help/begin.hlp
+pgsql/pgaccess/lib/help/close.hlp
+pgsql/pgaccess/lib/help/cluster.hlp
+pgsql/pgaccess/lib/help/commit.hlp
+pgsql/pgaccess/lib/help/copy.hlp
+pgsql/pgaccess/lib/help/copyrights.hlp
+pgsql/pgaccess/lib/help/create_aggregate.hlp
+pgsql/pgaccess/lib/help/create_database.hlp
+pgsql/pgaccess/lib/help/create_function.hlp
+pgsql/pgaccess/lib/help/create_index.hlp
+pgsql/pgaccess/lib/help/create_language.hlp
+pgsql/pgaccess/lib/help/create_operator.hlp
+pgsql/pgaccess/lib/help/create_rule.hlp
+pgsql/pgaccess/lib/help/create_sequence.hlp
+pgsql/pgaccess/lib/help/create_table.hlp
+pgsql/pgaccess/lib/help/create_table_as.hlp
+pgsql/pgaccess/lib/help/create_trigger.hlp
+pgsql/pgaccess/lib/help/create_type.hlp
+pgsql/pgaccess/lib/help/create_user.hlp
+pgsql/pgaccess/lib/help/create_view.hlp
+pgsql/pgaccess/lib/help/data_types.hlp
+pgsql/pgaccess/lib/help/datefunc.hlp
+pgsql/pgaccess/lib/help/declare.hlp
+pgsql/pgaccess/lib/help/delete.hlp
+pgsql/pgaccess/lib/help/drop_aggregate.hlp
+pgsql/pgaccess/lib/help/drop_database.hlp
+pgsql/pgaccess/lib/help/drop_function.hlp
+pgsql/pgaccess/lib/help/drop_index.hlp
+pgsql/pgaccess/lib/help/drop_language.hlp
+pgsql/pgaccess/lib/help/drop_operator.hlp
+pgsql/pgaccess/lib/help/drop_rule.hlp
+pgsql/pgaccess/lib/help/drop_sequence.hlp
+pgsql/pgaccess/lib/help/drop_table.hlp
+pgsql/pgaccess/lib/help/drop_trigger.hlp
+pgsql/pgaccess/lib/help/drop_type.hlp
+pgsql/pgaccess/lib/help/drop_user.hlp
+pgsql/pgaccess/lib/help/drop_view.hlp
+pgsql/pgaccess/lib/help/explain.hlp
+pgsql/pgaccess/lib/help/fetch.hlp
+pgsql/pgaccess/lib/help/form_design.hlp
+pgsql/pgaccess/lib/help/forms.hlp
+pgsql/pgaccess/lib/help/functions.hlp
+pgsql/pgaccess/lib/help/geomfunc.hlp
+pgsql/pgaccess/lib/help/grant.hlp
+pgsql/pgaccess/lib/help/history.hlp
+pgsql/pgaccess/lib/help/index.hlp
+pgsql/pgaccess/lib/help/inheritance.hlp
+pgsql/pgaccess/lib/help/insert.hlp
+pgsql/pgaccess/lib/help/ipv4func.hlp
+pgsql/pgaccess/lib/help/isolation.hlp
+pgsql/pgaccess/lib/help/keywords.hlp
+pgsql/pgaccess/lib/help/listen.hlp
+pgsql/pgaccess/lib/help/load.hlp
+pgsql/pgaccess/lib/help/lock.hlp
+pgsql/pgaccess/lib/help/mathfunc.hlp
+pgsql/pgaccess/lib/help/move.hlp
+pgsql/pgaccess/lib/help/mvcc.hlp
+pgsql/pgaccess/lib/help/new_query.hlp
+pgsql/pgaccess/lib/help/new_table.hlp
+pgsql/pgaccess/lib/help/notify.hlp
+pgsql/pgaccess/lib/help/open_query.hlp
+pgsql/pgaccess/lib/help/open_table.hlp
+pgsql/pgaccess/lib/help/pgfunctions.hlp
+pgsql/pgaccess/lib/help/postgresql.hlp
+pgsql/pgaccess/lib/help/queries.hlp
+pgsql/pgaccess/lib/help/reports.hlp
+pgsql/pgaccess/lib/help/reset.hlp
+pgsql/pgaccess/lib/help/revoke.hlp
+pgsql/pgaccess/lib/help/rollback.hlp
+pgsql/pgaccess/lib/help/schema.hlp
+pgsql/pgaccess/lib/help/scripts.hlp
+pgsql/pgaccess/lib/help/select.hlp
+pgsql/pgaccess/lib/help/select_into.hlp
+pgsql/pgaccess/lib/help/sequences.hlp
+pgsql/pgaccess/lib/help/set.hlp
+pgsql/pgaccess/lib/help/show.hlp
+pgsql/pgaccess/lib/help/sql_guide.hlp
+pgsql/pgaccess/lib/help/sqlfunc.hlp
+pgsql/pgaccess/lib/help/stringfunc.hlp
+pgsql/pgaccess/lib/help/tables.hlp
+pgsql/pgaccess/lib/help/unlisten.hlp
+pgsql/pgaccess/lib/help/update.hlp
+pgsql/pgaccess/lib/help/users.hlp
+pgsql/pgaccess/lib/help/vacuum.hlp
+pgsql/pgaccess/lib/help/view_table_structure.hlp
+pgsql/pgaccess/lib/help/views.hlp
+pgsql/pgaccess/lib/help/visual_designer.hlp
+pgsql/pgaccess/lib/help/y2k.hlp
+pgsql/pgaccess/lib/help.tcl
+pgsql/pgaccess/lib/languages/czech
+pgsql/pgaccess/lib/languages/deutsch
+pgsql/pgaccess/lib/languages/francais
+pgsql/pgaccess/lib/languages/italiano
+pgsql/pgaccess/lib/languages/magyar
+pgsql/pgaccess/lib/languages/portugues
+pgsql/pgaccess/lib/languages/romana
+pgsql/pgaccess/lib/languages/russian.koi8r
+pgsql/pgaccess/lib/languages/russian_win
+pgsql/pgaccess/lib/languages/spanish
+pgsql/pgaccess/lib/mainlib.tcl
+pgsql/pgaccess/lib/preferences.tcl
+pgsql/pgaccess/lib/queries.tcl
+pgsql/pgaccess/lib/reports.tcl
+pgsql/pgaccess/lib/schema.tcl
+pgsql/pgaccess/lib/scripts.tcl
+pgsql/pgaccess/lib/sequences.tcl
+pgsql/pgaccess/lib/tables.tcl
+pgsql/pgaccess/lib/users.tcl
+pgsql/pgaccess/lib/views.tcl
+pgsql/pgaccess/lib/visualqb.tcl
+pgsql/pgaccess/main.tcl
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib/languages