[pkgsrc/trunk]: pkgsrc/lang/tcl Export TDBC_VERSION like ITCL_VERSION.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c5682f59552
branches:  trunk
changeset: 354178:7c5682f59552
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Fri Oct 21 11:45:44 2016 +0000

description:
Export TDBC_VERSION like ITCL_VERSION.

Use these versions as well in Makefile and PLIST.

It's unclear whether buildlink3.mk might include Makefile.version, this
is the reason to duplicate this information.

There are other packages that might be versioned similarily:
 - sqlite3,
 - thread.

No user-visible change in the main package.

diffstat:

 lang/tcl/Makefile         |  14 ++++++++------
 lang/tcl/Makefile.version |   6 ++++--
 lang/tcl/PLIST            |  46 +++++++++++++++++++++++-----------------------
 lang/tcl/buildlink3.mk    |   3 ++-
 4 files changed, 37 insertions(+), 32 deletions(-)

diffs (139 lines):

diff -r fef485234a59 -r 7c5682f59552 lang/tcl/Makefile
--- a/lang/tcl/Makefile Fri Oct 21 11:37:31 2016 +0000
+++ b/lang/tcl/Makefile Fri Oct 21 11:45:44 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2016/09/05 13:24:38 adam Exp $
+# $NetBSD: Makefile,v 1.93 2016/10/21 11:45:44 kamil Exp $
 
 DISTNAME=      tcl${TCL_VERSION}-src
 PKGNAME=       tcl-${TCL_VERSION}
@@ -45,6 +45,8 @@
 
 PLIST_SUBST+=          SONUM=${TCL_SONUM}
 PLIST_SUBST+=          BASEVER=${TCL_BASEVER}
+PLIST_SUBST+=          ITCL_VERSION=${ITCL_VERSION}
+PLIST_SUBST+=          TDBC_VERSION=${TDBC_VERSION}
 
 CONFIGURE_ARGS+=       --with-system-sqlite
 SUBST_CLASSES+=                sqllink
@@ -54,12 +56,12 @@
 
 .if ${OPSYS} == "Darwin"
 post-build:
-.  for lib in itcl4.0.5/libitcl4.0.5.dylib \
+.  for lib in itcl${ITCL_VERSION}/libitcl${ITCL_VERSION}.dylib \
              sqlite3.13.0/libsqlite3.13.0.dylib \
-             tdbc1.0.4/libtdbc1.0.4.dylib \
-             tdbcmysql1.0.4/libtdbcmysql1.0.4.dylib \
-             tdbcodbc1.0.4/libtdbcodbc1.0.4.dylib \
-             tdbcpostgres1.0.4/libtdbcpostgres1.0.4.dylib \
+             tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.dylib \
+             tdbcmysql${TDBC_VERSION}/libtdbcmysql${TDBC_VERSION}.dylib \
+             tdbcodbc${TDBC_VERSION}/libtdbcodbc${TDBC_VERSION}.dylib \
+             tdbcpostgres${TDBC_VERSION}/libtdbcpostgres${TDBC_VERSION}.dylib \
              thread2.8.0/libthread2.8.0.dylib
        install_name_tool -id ${PREFIX}/lib/${lib} ${WRKSRC}/unix/pkgs/${lib}
 .  endfor
diff -r fef485234a59 -r 7c5682f59552 lang/tcl/Makefile.version
--- a/lang/tcl/Makefile.version Fri Oct 21 11:37:31 2016 +0000
+++ b/lang/tcl/Makefile.version Fri Oct 21 11:45:44 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.20 2016/10/21 01:44:24 kamil Exp $
+# $NetBSD: Makefile.version,v 1.21 2016/10/21 11:45:44 kamil Exp $
 # used by cad/xcircuit/Makefile
 # used by devel/tcl-tclcl/Makefile
 # used by lang/tcl/Makefile
@@ -9,4 +9,6 @@
 TCL_BASEVER=   8.6
 TCL_VERSION=   8.6.6
 
-# Update bundled itcl version (ITCL_VERSION) in lang/tcl/buildlink3.mk
+# Update bundled versions in lang/tcl/buildlink3.mk
+ITCL_VERSION=  4.0.5
+TDBC_VERSION=  1.0.4
diff -r fef485234a59 -r 7c5682f59552 lang/tcl/PLIST
--- a/lang/tcl/PLIST    Fri Oct 21 11:37:31 2016 +0000
+++ b/lang/tcl/PLIST    Fri Oct 21 11:45:44 2016 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2016/09/03 20:28:39 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2016/10/21 11:45:44 kamil Exp $
 bin/sqlite3_analyzer
 bin/tclsh
 bin/tclsh${BASEVER}
@@ -52,13 +52,13 @@
 include/tdbc.h
 include/tdbcDecls.h
 include/tdbcInt.h
-lib/itcl4.0.5/itcl.tcl
-lib/itcl4.0.5/itclConfig.sh
-lib/itcl4.0.5/itclHullCmds.tcl
-lib/itcl4.0.5/itclWidget.tcl
-lib/itcl4.0.5/libitcl4.0.5.so
-lib/itcl4.0.5/libitclstub4.0.5.a
-lib/itcl4.0.5/pkgIndex.tcl
+lib/itcl${ITCL_VERSION}/itcl.tcl
+lib/itcl${ITCL_VERSION}/itclConfig.sh
+lib/itcl${ITCL_VERSION}/itclHullCmds.tcl
+lib/itcl${ITCL_VERSION}/itclWidget.tcl
+lib/itcl${ITCL_VERSION}/libitcl${ITCL_VERSION}.so
+lib/itcl${ITCL_VERSION}/libitclstub${ITCL_VERSION}.a
+lib/itcl${ITCL_VERSION}/pkgIndex.tcl
 lib/libtcl${SONUM}.a
 lib/libtcl${SONUM}.so
 lib/libtcl${SONUM}.so.1.0
@@ -301,23 +301,23 @@
 lib/tcl8/8.5/msgcat-1.6.0.tm
 lib/tcl8/8.5/tcltest-2.4.0.tm
 lib/tcl8/8.6/http-2.8.9.tm
-lib/tcl8/8.6/tdbc/sqlite3-1.0.4.tm
+lib/tcl8/8.6/tdbc/sqlite3-${TDBC_VERSION}.tm
 lib/tclConfig.sh
 lib/tclooConfig.sh
-lib/tdbc1.0.4/libtdbc1.0.4.so
-lib/tdbc1.0.4/libtdbcstub1.0.4.a
-lib/tdbc1.0.4/pkgIndex.tcl
-lib/tdbc1.0.4/tdbc.tcl
-lib/tdbc1.0.4/tdbcConfig.sh
-lib/tdbcmysql1.0.4/libtdbcmysql1.0.4.so
-lib/tdbcmysql1.0.4/pkgIndex.tcl
-lib/tdbcmysql1.0.4/tdbcmysql.tcl
-lib/tdbcodbc1.0.4/libtdbcodbc1.0.4.so
-lib/tdbcodbc1.0.4/pkgIndex.tcl
-lib/tdbcodbc1.0.4/tdbcodbc.tcl
-lib/tdbcpostgres1.0.4/libtdbcpostgres1.0.4.so
-lib/tdbcpostgres1.0.4/pkgIndex.tcl
-lib/tdbcpostgres1.0.4/tdbcpostgres.tcl
+lib/tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.so
+lib/tdbc${TDBC_VERSION}/libtdbcstub${TDBC_VERSION}.a
+lib/tdbc${TDBC_VERSION}/pkgIndex.tcl
+lib/tdbc${TDBC_VERSION}/tdbc.tcl
+lib/tdbc${TDBC_VERSION}/tdbcConfig.sh
+lib/tdbcmysql${TDBC_VERSION}/libtdbcmysql${TDBC_VERSION}.so
+lib/tdbcmysql${TDBC_VERSION}/pkgIndex.tcl
+lib/tdbcmysql${TDBC_VERSION}/tdbcmysql.tcl
+lib/tdbcodbc${TDBC_VERSION}/libtdbcodbc${TDBC_VERSION}.so
+lib/tdbcodbc${TDBC_VERSION}/pkgIndex.tcl
+lib/tdbcodbc${TDBC_VERSION}/tdbcodbc.tcl
+lib/tdbcpostgres${TDBC_VERSION}/libtdbcpostgres${TDBC_VERSION}.so
+lib/tdbcpostgres${TDBC_VERSION}/pkgIndex.tcl
+lib/tdbcpostgres${TDBC_VERSION}/tdbcpostgres.tcl
 lib/thread2.8.0/libthread2.8.0.so
 lib/thread2.8.0/pkgIndex.tcl
 lib/thread2.8.0/ttrace.tcl
diff -r fef485234a59 -r 7c5682f59552 lang/tcl/buildlink3.mk
--- a/lang/tcl/buildlink3.mk    Fri Oct 21 11:37:31 2016 +0000
+++ b/lang/tcl/buildlink3.mk    Fri Oct 21 11:45:44 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2016/10/21 01:44:24 kamil Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2016/10/21 11:45:44 kamil Exp $
 
 BUILDLINK_TREE+=       tcl
 
@@ -23,6 +23,7 @@
 TCLSH=                 ${BUILDLINK_PREFIX.tcl}/bin/tclsh
 # Bundled library
 ITCL_VERSION=          4.0.5
+TDBC_VERSION=          1.0.4
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"