4 files changed, 8 insertions, 63 deletions

diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile
index a2f581e822bd..8ada735a1113 100644
--- a/japanese/postgresql-tcltk/Makefile
+++ b/japanese/postgresql-tcltk/Makefile
@@ -5,51 +5,17 @@
 # $FreeBSD$
 #
 
-PORTNAME=	postgresql-tcltk
-CATEGORIES=	japanese databases
+PORTNAME=	postgresql
+PORTREVISION=	0
+CATEGORIES=	japanese databases tcl${TCLVERSION:C/[^0-9]//g}
+PKGNAMESUFFIX=	-tcltk
 
 MAINTAINER=	saito@a2z.co.jp
-COMMENT=	An TCL interface to the database PostgreSQL, including a tk GUI
-
-POSTGRESQL_PORT?=	databases/postgresql7
-POSTGRESQL_SUBPORT=YES
-.include <${.CURDIR}/../../databases/postgresql7/Makefile>
-
-LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
-		pq:${PORTSDIR}/databases/postgresql7 \
-		tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
-		tk80jp.1:${PORTSDIR}/japanese/tk80
+COMMENT=	A TCL interface to the database PostgreSQL, including a tk GUI
 
 TCLVERSION?=	8.0jp
-PLIST_SUB+=	TCLVERSION=${TCLVERSION}
-CONFIGURE_ARGS=	--with-tcl \
-		--with-tclconfig=${TCLCONFIG} \
-		--with-includes=${INCDIRS}
-
-TCL_INCDIR=	${LOCALBASE}/include/tcl${TCLVERSION}
-TCLCONFIG=	${LOCALBASE}/lib/tcl${TCLVERSION}
-MAKE_ENV+=	TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV+=	LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
-	               CFLAGS=-DPGTCL_USE_TCLOBJ
-CONFIGURE_ARGS+= --with-tkconfig="${TKCONFIG}"
-TK_INCDIR=	${LOCALBASE}/include/tk${TCLVERSION}
-TKCONFIG=	${LOCALBASE}/lib/tk${TCLVERSION}
-INCDIRS=	${TCL_INCDIR}:${TK_INCDIR}
-PLIST_SUB+=	TK=""
-
-pre-build:
-	cd ${WRKSRC}/src/port; ${GMAKE}
-
-do-build:
-	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh
-	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl
 
-do-install:
-	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh install
-	@ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl install
-# Preparing a loadable TCL-package (pkgIndex.tcl)
-	@${MKDIR} ${PREFIX}/lib/tcl${TCLVERSION}/Pgtcl1.3
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \
-		> ${PREFIX}/lib/tcl${TCLVERSION}/Pgtcl1.3/pkgIndex.tcl
+TCLPORTDIR=	${PORTSDIR}/japanese/tcl
+TKPORTDIR=	${PORTSDIR}/japanese/tk
 
-.include <bsd.port.mk>
+.include <${.CURDIR}/../../databases/postgresql-tcltk/Makefile>
diff --git a/japanese/postgresql-tcltk/files/pkgIndex.tcl.in b/japanese/postgresql-tcltk/files/pkgIndex.tcl.in
deleted file mode 100644
index bd8329b15c69..000000000000
--- a/japanese/postgresql-tcltk/files/pkgIndex.tcl.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# Package-index file for Pgtcl-package. Enables you to load PostgreSQL
-# interface functions right into you TCL-interpreter as simply as
-#	package require Pgtcl
-package ifneeded Pgtcl 1.3 "load %%PREFIX%%/lib/libpgtcl.so"
diff --git a/japanese/postgresql-tcltk/pkg-descr b/japanese/postgresql-tcltk/pkg-descr
deleted file mode 100644
index 32561ddf75c7..000000000000
--- a/japanese/postgresql-tcltk/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-libpgtcl is a library that implements Tcl commands for front-end
-clients to interact with the Postgresql backends.
-
-pgaccess is a great graphical database management tool for PostgreSQL.
-
-This software is part of the standard PostgreSQL distribution.
-
-WWW: http://www.postgresql.org/
diff --git a/japanese/postgresql-tcltk/pkg-plist b/japanese/postgresql-tcltk/pkg-plist
deleted file mode 100644
index 0f3874b3acb0..000000000000
--- a/japanese/postgresql-tcltk/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/pgtclsh
-include/libpgtcl.h
-lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl
-@dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3
-lib/libpgtcl.a
-lib/libpgtcl.so
-lib/libpgtcl.so.2
-%%TK%%bin/pgtksh
-%%TK%%@unexec rmdir %D/share/postgresql 2>/dev/null || true