Switch to Tcl/Tk 8.4 and bl3ify tcl-postgresql, tk-postgresql, and

postgresql-pltcl.  Closes PR pkg/24816 and pkg/24817.

5 files changed, 39 insertions, 17 deletions

diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index e12ddfa7034..94464a70369 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/08 19:52:50 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/17 15:45:49 minskim Exp $
 
 PKGNAME=		postgresql-pltcl-${BASE_VERS}
 PKGREVISION=		1
@@ -6,7 +6,7 @@ COMMENT=		PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=		postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 .include "../postgresql/Makefile.common"
 
@@ -18,7 +18,7 @@ TCLSH=			${LOCALBASE}/bin/tclsh
 
 BUILD_DIRS=		${WRKSRC}/src/pl/tcl
 
-.include "../postgresql-lib/buildlink2.mk"
-.include "../../lang/tcl83/buildlink2.mk"
+.include "../postgresql-lib/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile
index 5b72cde62a6..37ec4b2efe2 100644
--- a/databases/tcl-postgresql/Makefile
+++ b/databases/tcl-postgresql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2004/03/08 19:52:50 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/17 15:45:49 minskim Exp $
 
 PKGNAME=		tcl-postgresql-${BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT=		Tcl interface to PostgreSQL
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 .include "../postgresql/Makefile.common"
 
@@ -22,7 +22,7 @@ post-install:
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz		\
 		`${SED} -e "s|#.*||" ${FILESDIR}/man.tcl`
 
-.include "../postgresql-lib/buildlink2.mk"
-.include "../../lang/tcl83/buildlink2.mk"
+.include "../postgresql-lib/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tcl-postgresql/buildlink2.mk b/databases/tcl-postgresql/buildlink2.mk
index a0c7993a404..b12a06e04d5 100644
--- a/databases/tcl-postgresql/buildlink2.mk
+++ b/databases/tcl-postgresql/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/03/08 19:52:50 minskim Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/03/17 15:45:49 minskim Exp $
 
 .if !defined(TCL_POSTGRESQL_BUILDLINK2_MK)
 TCL_POSTGRESQL_BUILDLINK2_MK=	# defined
@@ -12,7 +12,7 @@ BUILDLINK_PREFIX.tcl-postgresql_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.tcl-postgresql=		include/pgsql/libpgtcl.h
 BUILDLINK_FILES.tcl-postgresql+=	lib/libpgtcl.*
 
-.include "../../lang/tcl83/buildlink2.mk"
+.include "../../lang/tcl/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	tcl-postgresql-buildlink
 
diff --git a/databases/tcl-postgresql/buildlink3.mk b/databases/tcl-postgresql/buildlink3.mk
new file mode 100644
index 00000000000..b44389694ef
--- /dev/null
+++ b/databases/tcl-postgresql/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/17 15:45:49 minskim Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+TCL_POSTGRESQL_BUILDLINK3_MK:=	${TCL_POSTGRESQL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	tcl-postgresql
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-postgresql}
+BUILDLINK_PACKAGES+=	tcl-postgresql
+
+.if !empty(TCL_POSTGRESQL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tcl-postgresql+=	tcl-postgresql>=7.3.1
+BUILDLINK_PKGSRCDIR.tcl-postgresql?=	../../databases/tcl-postgresql
+
+.include "../../lang/tcl/buildlink3.mk"
+
+.endif	# TCL_POSTGRESQL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile
index 7be8c7663ab..0cd50e60790 100644
--- a/databases/tk-postgresql/Makefile
+++ b/databases/tk-postgresql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2004/03/08 20:27:14 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/17 15:45:49 minskim Exp $
 
 PKGNAME=		tk-postgresql-${BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT=		Tk interface to PostgreSQL
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 .include "../postgresql/Makefile.common"
 
@@ -26,8 +26,9 @@ post-install:
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz		\
 		`${SED} -e "s|#.*||" ${FILESDIR}/man.tk`
 
-.include "../postgresql-lib/buildlink2.mk"
-.include "../tcl-postgresql/buildlink2.mk"
-.include "../../x11/tk83/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../databases/tcl-postgresql/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"