From 5a8842e5c57d430129d12842a32661ef8e1986c5 Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 21 Aug 2017 07:39:18 +0000
Subject: [PATCH] databases/tdbc: update to 1.0.5, cleanup Makefile

---
 databases/tdbc/Makefile  | 18 +++++++++++-------
 databases/tdbc/distinfo  | 21 +++++++++++----------
 databases/tdbc/pkg-plist |  1 +
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile
index f66a863a8a68..748fd1a07e90 100644
--- a/databases/tdbc/Makefile
+++ b/databases/tdbc/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	tdbc
-DISTVERSION=	1.0.4
+DISTVERSION=	1.0.5
 CATEGORIES=	databases
-MASTER_SITES=	TCLTK/tcl8_6 \
-		SF/tcl/Tcl/8.6.5
+MASTER_SITES=	SF/tcl/Tcl/8.6.7
 DISTFILES=	${PORTNAME}${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	tcltk@FreeBSD.org
@@ -23,9 +22,7 @@ OPTIONS_SUB=	yes
 USES=		tcl:86,tea
 USE_LDCONFIG=	yes
 MAKE_ENV+=	DESTDIR=${STAGEDIR}
-CONFIGURE_ARGS+=--with-tcloo=${TCL_LIBDIR} \
-		--with-tdbc=${WRKDIR}/tdbc${PORTVERSION} \
-		--enable-threads \
+CONFIGURE_ARGS+=--enable-threads \
 		--mandir=${PREFIX}/man \
 		--includedir=${PREFIX}/include/tdbc
 PLIST_SUB+=	VERSION=${DISTVERSION} \
@@ -34,6 +31,9 @@ PLIST_SUB+=	VERSION=${DISTVERSION} \
 
 MODULES=	tdbc
 
+# TDBC (code)
+tdbc_CONFIGURE_ARGS=	--with-tcloo=${TCL_LIBDIR}
+
 # MySQL
 MYSQL_VARS=		MODULES+=tdbcmysql
 MYSQL_USES=		mysql:client
@@ -43,6 +43,7 @@ MYSQL_DISTFILES=	${PORTNAME}mysql${PORTVERSION}${EXTRACT_SUFX}
 ODBC_VARS=		MODULES+=tdbcodbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_DISTFILES=		${PORTNAME}odbc${PORTVERSION}${EXTRACT_SUFX}
+tdbcodbc_CONFIGURE_ARGS=--with-tdbc=${WRKDIR}/tdbc${PORTVERSION}
 
 # PostgreSQL
 PGSQL_VARS=		MODULES+=tdbcpostgres
@@ -72,7 +73,10 @@ do-configure:
 .for module in ${MODULES}
 	@echo "================================="
 	@echo "Configuring ${module}"
-	cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}
+	cd ${WRKDIR}/${module}${PORTVERSION} && \
+	    ${SETENV} ${CONFIGURE_ENV} ${SH} configure \
+	    ${CONFIGURE_ARGS} ${${module}_CONFIGURE_ARGS}
+
 .endfor
 
 post-configure:
diff --git a/databases/tdbc/distinfo b/databases/tdbc/distinfo
index 0f76c5927a41..0e3843f773ff 100644
--- a/databases/tdbc/distinfo
+++ b/databases/tdbc/distinfo
@@ -1,10 +1,11 @@
-SHA256 (tdbc1.0.4.tar.gz) = e8ae67a937ad14bd4190ab1a491b7527251eb7b7d66cfba74a8bd9b78a81914f
-SIZE (tdbc1.0.4.tar.gz) = 191586
-SHA256 (tdbcmysql1.0.4.tar.gz) = c339c6408dcdbb6c58ebd0400cd57029d6ab9472e7c45bfdf6136044a4561572
-SIZE (tdbcmysql1.0.4.tar.gz) = 171639
-SHA256 (tdbcodbc1.0.4.tar.gz) = 6fb3f4d55ce390d89038f6cef2b8f3b9a07c83db4056f12ffe58c2bebd7faad5
-SIZE (tdbcodbc1.0.4.tar.gz) = 188779
-SHA256 (tdbcpostgres1.0.4.tar.gz) = ad120fdd22dbc3143988460f5fd11240de29448c625fcabcb0e4353c7deb6d6e
-SIZE (tdbcpostgres1.0.4.tar.gz) = 166760
-SHA256 (tdbcsqlite3-1.0.4.tar.gz) = 4fe8838c8b2094c2b2e19a64029a166841c7b065cd605dcd705429942b4f74fb
-SIZE (tdbcsqlite3-1.0.4.tar.gz) = 111715
+TIMESTAMP = 1503300376
+SHA256 (tdbc1.0.5.tar.gz) = 8f5c9a890dd1041079d7643fdf81713916624ebaa65a03d1c7404ff9a0c225b6
+SIZE (tdbc1.0.5.tar.gz) = 191591
+SHA256 (tdbcmysql1.0.5.tar.gz) = db34feb72b809f1f7cb326d9e53b2f8f3be765d5fcebb1d081492089cfdf4e26
+SIZE (tdbcmysql1.0.5.tar.gz) = 173395
+SHA256 (tdbcodbc1.0.5.tar.gz) = ae72bbc769d97742d06b037a7318029c332edf633588b9e3935fefdfce55a1cc
+SIZE (tdbcodbc1.0.5.tar.gz) = 191334
+SHA256 (tdbcpostgres1.0.5.tar.gz) = a5676d6f6b1229e05fff7a00abc97808ddecf72760431dedf2c07aa6aa55be2e
+SIZE (tdbcpostgres1.0.5.tar.gz) = 181170
+SHA256 (tdbcsqlite3-1.0.5.tar.gz) = cd5fe5a073ca76f8bc8cf46422a903c77f9a2cb2e1b6035c98e666239fabc4bf
+SIZE (tdbcsqlite3-1.0.5.tar.gz) = 115119
diff --git a/databases/tdbc/pkg-plist b/databases/tdbc/pkg-plist
index ff00f4b27258..748a7266976f 100644
--- a/databases/tdbc/pkg-plist
+++ b/databases/tdbc/pkg-plist
@@ -33,6 +33,7 @@ man/mann/tdbc_tokenize.n.gz
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/libtdbcpostgres%%VERSION%%.so
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/tdbcpostgres.tcl
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/pkgIndex.tcl
+%%PGSQL%%man/mann/tdbc_postgres.n.gz
 @comment SQLITE
 %%SQLITE%%lib/tcl%%TCL_MAJ%%/%%TCL_VER%%/tdbc/sqlite3-%%VERSION%%.tm
 %%SQLITE%%man/mann/tdbc_sqlite3.n.gz