Update to 1.1.3.

Update HOMEPAGE.

Add TESTFLAGS var for Tdbc test control.

Add a SUBST_VAR to help reduce PLIST churn.

databases/tdbc/Makefile

@@ -1,12 +1,12 @@
 COMMENT =		Tcl Database Connectivity
 
-V =			1.0.6
+V =			1.1.3
 
 DISTNAME =		tdbc${V}
 PKGNAME =		tdbc-${V}
-SHARED_LIBS =		tdbc${V:S/.//g} 0.0
+SHARED_LIBS =		tdbc${VER} 0.0
 CATEGORIES =		databases
-HOMEPAGE =		http://tdbc.tcl.tk/
+HOMEPAGE =		http://tdbc.tcl-lang.org/
 MAINTAINER =		Stuart Cassoff <stwo@users.sourceforge.net>
 
 # BSD
@@ -14,23 +14,27 @@ PERMIT_PACKAGE =	Yes
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=tcl/}
 MODULES =		lang/tcl
-
-# TDBC needs TclOO, which is in Tcl 8.6
 MODTCL_VERSION =	8.6
-
 BUILD_DEPENDS =		${MODTCL_BUILD_DEPENDS}
 RUN_DEPENDS =		${MODTCL_RUN_DEPENDS}
 
 FAKE_FLAGS =		PKG_DIR=tdbc \
 			pkglibdir='$$(libdir)/tcl/$$(PKG_DIR)'
 
+TEST_FLAGS =		TESTFLAGS='${TESTFLAGS}'
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
 
 CONFIGURE_ARGS +=	--with-tcl=${MODTCL_LIBDIR} \
 			--includedir=${PREFIX}/include/tdbc \
-			SHLIB_VERSION=${LIBtdbc${V:S/.//g}_VERSION}
+			SHLIB_VERSION=${LIBtdbc${VER}_VERSION}
 
 TEST_TARGET =		test
+SUBST_VARS =		VER
+
+VER =			${V:S/.//g}
+
+# Use TESTFLAGS to control the Tdbc tests
+TESTFLAGS =
 
 .include <bsd.port.mk>

databases/tdbc/distinfo

@@ -1,2 +1,2 @@
-SHA256 (tdbc1.0.6.tar.gz) = fFLU86yDn5ADX2O5O10jlQWrMCI3yJSMF8WmBUfV3XI=
-SIZE (tdbc1.0.6.tar.gz) = 202184
+SHA256 (tdbc1.1.3.tar.gz) = lGJ+96NRy4YHH17wB5qRmJGbYHwwb8r9BC1Chy5m8q0=
+SIZE (tdbc1.1.3.tar.gz) = 186499

databases/tdbc/patches/patch-Makefile_in

@@ -1,25 +1,14 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -422,15 +422,15 @@ install-lib-binaries: binaries
- 	@$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
+@@ -434,8 +434,8 @@ install-lib-binaries: binaries
+ 	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(pkglibdir)"
  	@list='$(lib_BINARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
 -	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+-	    $(INSTALL_LIBRARY) $$p "$(DESTDIR)$(pkglibdir)/$$p"; \
 +	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \
- 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- 	    if test "x$$stub" = "xstub"; then \
--		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
- 	    else \
--		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	    fi; \
++	    $(INSTALL_LIBRARY) $$p "$(DESTDIR)$(libdir)/$$p"; \
  	    ext=`echo $$p|sed -e "s/.*\.//"`; \
  	    if test "x$$ext" = "xdll"; then \
+ 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \

databases/tdbc/patches/patch-configure

@@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -9019,7 +9019,7 @@ tdbc_SRC_DIR=`cd "${tdbc_SRC_DIR}"; $CYGPATH $(pwd)`
+@@ -9250,7 +9250,7 @@ tdbc_SRC_DIR=`cd "${tdbc_SRC_DIR}"; $CYGPATH $(pwd)`
  
  # Develop a fully qualified path for where .tcl files for the tdbc package
  # appear at run time.
@@ -10,12 +10,12 @@ Index: configure
  if test -d "${tdbc_LIB_DIR}" ; then
      tdbc_LIB_DIR=`cd "${tdbc_LIB_DIR}"; $CYGPATH $(pwd)`
  fi
-@@ -9033,7 +9033,7 @@ fi
+@@ -9264,7 +9264,7 @@ fi
      #--------------------------------------------------------------------
  
      # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
 -    eval pkglibdir="${libdir}/tdbc${PACKAGE_VERSION}"
 +    eval pkglibdir="${libdir}"
      if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
- 	eval tdbc_LIB_FLAG="-ltdbc${PACKAGE_VERSION}${DBGX}"
- 	eval tdbc_STUB_LIB_FLAG="-ltdbcstub${PACKAGE_VERSION}${DBGX}"
+ 	eval tdbc_LIB_FLAG="-ltdbc${PACKAGE_VERSION}"
+ 	eval tdbc_STUB_LIB_FLAG="-ltdbcstub${PACKAGE_VERSION}"

databases/tdbc/patches/patch-pkgIndex_tcl_in

@@ -1,9 +1,12 @@
---- pkgIndex.tcl.in.orig	Sat Apr 15 14:08:19 2017
-+++ pkgIndex.tcl.in	Sat Apr 15 14:09:32 2017
-@@ -8,5 +8,5 @@ if {[catch {package present Tcl @TCL_VERSION_REQ@}]} {
- }
- package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \
-     "package require TclOO @TCLOO_VERSION_REQ@-;\
--    [list load [file join $dir @PKG_LIB_FILE@] @PACKAGE_NAME@]\;\
-+    [list load [file join $dir .. .. @PKG_LIB_FILE@] @PACKAGE_NAME@]\;\
-     [list source [file join $dir @PACKAGE_NAME@.tcl]]"
+Index: pkgIndex.tcl.in
+--- pkgIndex.tcl.in.orig
++++ pkgIndex.tcl.in
+@@ -20,7 +20,7 @@ apply {{dir} {
+     } else {
+ 	package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \
+ 		"package require TclOO;\
+-		[list load [file join $dir @PKG_LIB_FILE8@] [string totitle @PACKAGE_NAME@]]\;\
++		[list load [file join $dir .. .. @PKG_LIB_FILE8@] [string totitle @PACKAGE_NAME@]]\;\
+ 		[list source $libraryfile]"
+     }
+ }} $dir

databases/tdbc/pkg/PLIST

@@ -2,8 +2,8 @@ include/tdbc/
 include/tdbc/tdbc.h
 include/tdbc/tdbcDecls.h
 include/tdbc/tdbcInt.h
-@lib lib/libtdbc106.so.${LIBtdbc106_VERSION}
-lib/libtdbcstub106.a
+@lib lib/libtdbc${VER}.so.${LIBtdbc${VER}_VERSION}
+@static-lib lib/libtdbcstub${VER}.a
 lib/tcl/tdbc/
 lib/tcl/tdbc/pkgIndex.tcl
 lib/tcl/tdbc/tdbc.tcl