Update tk-postgresql to 7.1.1. There don't appear to be any functional

changes from version 7.0.3, only that this package is now built from sources
found in the PostgreSQL-7.1.1 sources.

2 files changed, 34 insertions, 26 deletions

diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile
index 034812bc5a9..15333ad79e6 100644
--- a/databases/tk-postgresql/Makefile
+++ b/databases/tk-postgresql/Makefile
@@ -1,45 +1,50 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:17:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/14 14:54:16 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		tk-${DISTNAME}
-
+PKGNAME=		tk-postgresql-${PG_VERS}
+PG_PKG_VERS=		# empty
 COMMENT=		Tk interface to PostgreSQL
 
-DEPENDS+=		tcl-postgresql-${PG_VERS}:../../databases/tcl-postgresql
+DEPENDS+=		postgresql-lib>=${PG_BASE_VERS}:../../databases/postgresql-lib
+DEPENDS+=		tcl-postgresql>=${PG_BASE_VERS}:../../databases/tcl-postgresql
 DEPENDS+=		tk>=8.3.2:../../x11/tk
 
-EVAL_PREFIX+=		TCLDIR=tcl
-TCLSH=			${TCLDIR}/bin/tclsh
-TCL_INCDIR=		${TCLDIR}/include
-TCL_CONFIGDIR=		${TCLDIR}/lib
-
-EVAL_PREFIX+=		TKDIR=tk
-TK_INCDIR=		${TKDIR}/include
-TK_CONFIGDIR=		${TKDIR}/lib
+TCLSH=			${LOCALBASE}/bin/tclsh
+TCL_CONFIGDIR=		${LOCALBASE}/lib
+TK_CONFIGDIR=		${LOCALBASE}/lib
 
 USE_X11=		# defined
 
 MAKE_ENV+=		INSTALLED_LIBPQ=1 INSTALLED_LIBPGTCL=1
 
-CONFIGURE_ARGS+=	--without-perl --without-odbc
-CONFIGURE_ARGS+=	--with-tcl \
-			--with-tclconfig="${TCL_CONFIGDIR}" \
-			--with-tkconfig="${TK_CONFIGDIR}" \
-			--with-includes="${TCL_INCDIR} ${TK_INCDIR}" \
-			--with-libraries="${LOCALBASE}/lib ${TCLDIR}/lib ${TKDIR}/lib"
+CONFIGURE_ARGS+=	--with-tcl
+CONFIGURE_ARGS+=	--with-tk
+CONFIGURE_ARGS+=	--with-tclconfig="${TCL_CONFIGDIR}"
+CONFIGURE_ARGS+=	--with-tkconfig="${TK_CONFIGDIR}"
+CONFIGURE_ARGS+=	--with-includes="${LOCALBASE}/include"
+CONFIGURE_ARGS+=	--with-libraries="${LOCALBASE}/lib"
 CONFIGURE_ENV+=		TCLSH="${TCLSH}"
 
+DIRS_TO_BUILD=		src/bin/pgtclsh
+ALL_TARGET=		pgtksh
+INSTALL_TARGET=		install-tk
+
 do-build:
-	cd ${WRKSRC}/bin/pgtclsh && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} pgtksh
+.for DIR in ${DIRS_TO_BUILD}
+	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
+.endfor
 
 do-install:
-	cd ${WRKSRC}/bin/pgtclsh && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} install_tk
-	strip ${PREFIX}/bin/pgtksh
-	${GTAR} zxCf ${PREFIX}/man \
-		${WRKDIR}/${DISTNAME}/doc/man.tar.gz \
-		`${SED} -e "s/#.*//" ${FILESDIR}/man.tk`
+.for DIR in ${DIRS_TO_BUILD}
+	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
+.endfor
+
+post-install:
+	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz		\
+		`${SED} -e "s|#.*||" ${FILESDIR}/man.tk`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tk-postgresql/files/man.tk b/databases/tk-postgresql/files/man.tk
new file mode 100644
index 00000000000..f02eb73184f
--- /dev/null
+++ b/databases/tk-postgresql/files/man.tk
@@ -0,0 +1,3 @@
+# $NetBSD: man.tk,v 1.1 2001/05/14 14:54:16 jlam Exp $
+#
+man1/pgtksh.1