[pkgsrc/trunk]: pkgsrc/databases Switch to Tcl/Tk 8.4 and bl3ify tcl-postgres...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f70149b6f33
branches:  trunk
changeset: 471083:0f70149b6f33
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Mar 17 15:45:49 2004 +0000

description:
Switch to Tcl/Tk 8.4 and bl3ify tcl-postgresql, tk-postgresql, and
postgresql-pltcl.  Closes PR pkg/24816 and pkg/24817.

diffstat:

 databases/postgresql-pltcl/Makefile    |   8 ++++----
 databases/tcl-postgresql/Makefile      |  10 +++++-----
 databases/tcl-postgresql/buildlink2.mk |   4 ++--
 databases/tcl-postgresql/buildlink3.mk |  21 +++++++++++++++++++++
 databases/tk-postgresql/Makefile       |  13 +++++++------
 5 files changed, 39 insertions(+), 17 deletions(-)

diffs (128 lines):

diff -r 71ed8db8d3a7 -r 0f70149b6f33 databases/postgresql-pltcl/Makefile
--- a/databases/postgresql-pltcl/Makefile       Wed Mar 17 14:38:02 2004 +0000
+++ b/databases/postgresql-pltcl/Makefile       Wed Mar 17 15:45:49 2004 +0000
@@ -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 @@
 
 DEPENDS+=              postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 
 .include "../postgresql/Makefile.common"
 
@@ -18,7 +18,7 @@
 
 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 -r 71ed8db8d3a7 -r 0f70149b6f33 databases/tcl-postgresql/Makefile
--- a/databases/tcl-postgresql/Makefile Wed Mar 17 14:38:02 2004 +0000
+++ b/databases/tcl-postgresql/Makefile Wed Mar 17 15:45:49 2004 +0000
@@ -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 @@
        ${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 -r 71ed8db8d3a7 -r 0f70149b6f33 databases/tcl-postgresql/buildlink2.mk
--- a/databases/tcl-postgresql/buildlink2.mk    Wed Mar 17 14:38:02 2004 +0000
+++ b/databases/tcl-postgresql/buildlink2.mk    Wed Mar 17 15:45:49 2004 +0000
@@ -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_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 -r 71ed8db8d3a7 -r 0f70149b6f33 databases/tcl-postgresql/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/tcl-postgresql/buildlink3.mk    Wed Mar 17 15:45:49 2004 +0000
@@ -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 -r 71ed8db8d3a7 -r 0f70149b6f33 databases/tk-postgresql/Makefile
--- a/databases/tk-postgresql/Makefile  Wed Mar 17 14:38:02 2004 +0000
+++ b/databases/tk-postgresql/Makefile  Wed Mar 17 15:45:49 2004 +0000
@@ -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 @@
        ${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"