Update PostgreSQL tcl/tk to 7.3.1. pgaccess is no longer in of this port.

PR:		ports/45885
Submitted by:	Palle Girgensohn <girgen@pingpong.net>

2 files changed, 15 insertions, 150 deletions

diff --git a/databases/postgresql-tcltk/Makefile b/databases/postgresql-tcltk/Makefile
index 714339482ee2..7938ceb366da 100644
--- a/databases/postgresql-tcltk/Makefile
+++ b/databases/postgresql-tcltk/Makefile
@@ -8,16 +8,18 @@
 PORTNAME=	postgresql-tcltk
 CATEGORIES=	databases tcl83 tk83
 
-MAINTAINER=	girgen@partitur.se
+MAINTAINER=	girgen@pingpong.net
 
+POSTGRESQL_PORT?=	databases/postgresql7
 POSTGRESQL_SUBPORT=YES
-.include <${.CURDIR}/../postgresql7/Makefile>
+.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
 
 LIB_DEPENDS=	tcl${TCLVERSION:S/.//}:${PORTSDIR}/lang/tcl${TCLVERSION:S/.//} \
-		pq:${PORTSDIR}/databases/postgresql7
+		pq:${PORTSDIR}/${POSTGRESQL_PORT}
+RUN_DEPENDS=	postgres:${PORTSDIR}/${POSTGRESQL_PORT}
 
-# you can use "make TCLVERSION=8.4" or similar for your favourite tcl version
-TCLVERSION?=	8.3
+# you can use "make TCLVERSION=8.3" or similar for your favourite tcl version
+TCLVERSION?=	8.4
 PLIST_SUB+=	TCLVERSION=${TCLVERSION}
 CONFIGURE_ARGS=	--with-tcl \
 		--with-tclconfig=${TCLCONFIG} \
@@ -33,6 +35,13 @@ CONFIGURE_ENV+=	LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
 WITHOUT_TK=	yes
 .endif
 
+CONFIGURE_ENV+=	LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
+		CFLAGS=-DPGTCL_USE_TCLOBJ
+
+.if defined(WITHOUT_X11)
+WITHOUT_TK=	yes
+.endif
+
 .if defined(WITHOUT_TK)
 CONFIGURE_ARGS+=	--without-tk
 INCDIRS=	${TCL_INCDIR}
@@ -50,16 +59,10 @@ PLIST_SUB+=	TK=""
 do-build:
 	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh
 	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl
-.if !defined(WITHOUT_TK)
-	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgaccess
-.endif
 
 do-install:
 	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh install
 	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl install
-.if !defined(WITHOUT_TK)
-	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgaccess install
-.endif
 # Preparing a loadable TCL-package (pkgIndex.tcl)
 	@${MKDIR} ${PREFIX}/lib/tcl${TCLVERSION}/Pgtcl1.3
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \
diff --git a/databases/postgresql-tcltk/pkg-plist b/databases/postgresql-tcltk/pkg-plist
index bd3771fa3e75..4f968d3b1847 100644
--- a/databases/postgresql-tcltk/pkg-plist
+++ b/databases/postgresql-tcltk/pkg-plist
@@ -2,147 +2,9 @@ bin/pgtclsh
 include/libpgtcl.h
 lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl
 @dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3
+@dirrm lib/tcl%%TCLVERSION%%
 lib/libpgtcl.a
 lib/libpgtcl.so
 lib/libpgtcl.so.2
 %%TK%%bin/pgtksh
-%%TK%%bin/pgaccess
-%%TK%%share/postgresql/pgaccess/lib/help/abort.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/add_records.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/alter_table.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/alter_user.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/author.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/begin.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/close.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/cluster.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/commit.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/copy.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/copyrights.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_aggregate.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_database.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_function.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_index.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_language.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_operator.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_rule.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_sequence.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_table.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_table_as.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_trigger.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_type.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_user.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/create_view.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/data_types.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/datefunc.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/declare.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/delete.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_aggregate.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_database.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_function.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_index.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_language.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_operator.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_rule.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_sequence.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_table.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_trigger.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_type.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_user.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/drop_view.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/explain.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/fetch.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/form_design.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/forms.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/functions.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/geomfunc.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/grant.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/history.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/index.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/inheritance.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/insert.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/ipv4func.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/isolation.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/keywords.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/listen.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/load.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/lock.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/mathfunc.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/move.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/mvcc.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/new_query.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/new_table.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/notify.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/open_query.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/open_table.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/pgfunctions.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/postgresql.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/queries.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/reports.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/reset.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/revoke.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/rollback.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/schema.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/scripts.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/select.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/select_into.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/sequences.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/set.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/show.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/sql_guide.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/sqlfunc.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/stringfunc.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/tables.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/unlisten.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/update.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/users.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/vacuum.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/view_table_structure.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/views.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/visual_designer.hlp
-%%TK%%share/postgresql/pgaccess/lib/help/y2k.hlp
-%%TK%%@dirrm share/postgresql/pgaccess/lib/help
-%%TK%%share/postgresql/pgaccess/lib/languages/chinese_big5
-%%TK%%share/postgresql/pgaccess/lib/languages/chinese_gb
-%%TK%%share/postgresql/pgaccess/lib/languages/czech
-%%TK%%share/postgresql/pgaccess/lib/languages/deutsch
-%%TK%%share/postgresql/pgaccess/lib/languages/euskara
-%%TK%%share/postgresql/pgaccess/lib/languages/francais
-%%TK%%share/postgresql/pgaccess/lib/languages/italiano
-%%TK%%share/postgresql/pgaccess/lib/languages/japanese
-%%TK%%share/postgresql/pgaccess/lib/languages/magyar
-%%TK%%share/postgresql/pgaccess/lib/languages/nederlands
-%%TK%%share/postgresql/pgaccess/lib/languages/portugues
-%%TK%%share/postgresql/pgaccess/lib/languages/romana
-%%TK%%share/postgresql/pgaccess/lib/languages/russian.koi8r
-%%TK%%share/postgresql/pgaccess/lib/languages/russian_win
-%%TK%%share/postgresql/pgaccess/lib/languages/spanish
-%%TK%%@dirrm share/postgresql/pgaccess/lib/languages
-%%TK%%share/postgresql/pgaccess/lib/database.tcl
-%%TK%%share/postgresql/pgaccess/lib/forms.tcl
-%%TK%%share/postgresql/pgaccess/lib/functions.tcl
-%%TK%%share/postgresql/pgaccess/lib/help.tcl
-%%TK%%share/postgresql/pgaccess/lib/mainlib.tcl
-%%TK%%share/postgresql/pgaccess/lib/preferences.tcl
-%%TK%%share/postgresql/pgaccess/lib/queries.tcl
-%%TK%%share/postgresql/pgaccess/lib/reports.tcl
-%%TK%%share/postgresql/pgaccess/lib/schema.tcl
-%%TK%%share/postgresql/pgaccess/lib/scripts.tcl
-%%TK%%share/postgresql/pgaccess/lib/sequences.tcl
-%%TK%%share/postgresql/pgaccess/lib/tables.tcl
-%%TK%%share/postgresql/pgaccess/lib/users.tcl
-%%TK%%share/postgresql/pgaccess/lib/views.tcl
-%%TK%%share/postgresql/pgaccess/lib/visualqb.tcl
-%%TK%%@dirrm share/postgresql/pgaccess/lib
-%%TK%%share/postgresql/pgaccess/images/icon_button.gif
-%%TK%%share/postgresql/pgaccess/images/icon_checkbutton.gif
-%%TK%%share/postgresql/pgaccess/images/icon_entry.gif
-%%TK%%share/postgresql/pgaccess/images/icon_frame.gif
-%%TK%%share/postgresql/pgaccess/images/icon_label.gif
-%%TK%%share/postgresql/pgaccess/images/icon_listbox.gif
-%%TK%%share/postgresql/pgaccess/images/icon_query.gif
-%%TK%%share/postgresql/pgaccess/images/icon_radiobutton.gif
-%%TK%%share/postgresql/pgaccess/images/icon_text.gif
-%%TK%%@dirrm share/postgresql/pgaccess/images
-%%TK%%share/postgresql/pgaccess/main.tcl
-%%TK%%@dirrm share/postgresql/pgaccess
 %%TK%%@unexec rmdir %D/share/postgresql 2>/dev/null || true