- STAGE-clean

- Add LICENSE

2 files changed, 30 insertions, 19 deletions

diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile
index cf61ad042634..fe4e83e4182a 100644
--- a/databases/tdbc/Makefile
+++ b/databases/tdbc/Makefile
@@ -4,16 +4,22 @@
 PORTNAME=	tdbc
 DISTVERSION=	1.0.0
 CATEGORIES=	databases
-MASTER_SITES=	SF/tcl/Tcl/8.6.0
+MASTER_SITES=	SF/tcl/Tcl/8.6.1
 DISTFILES=	${PORTNAME}${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	tcltk@FreeBSD.org
-COMMENT=	The common database access interface for Tcl
+COMMENT=	Common database access interface for Tcl
+
+LICENSE=	TclTk
+LICENSE_NAME=	Tcl/Tk License
+LICENSE_FILE=	${WRKDIR}/${PORTNAME}${PORTVERSION}/license.terms
+LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC
 
-USES+=		tcl:86
+USES=		tcl:86
 USE_LDCONFIG=	yes
+MAKE_ENV+=	DESTDIR=${STAGEDIR}
 CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} --with-tcloo=${TCL_LIBDIR} \
 		--prefix=${PREFIX} --exec-prefix=${PREFIX} \
 		--with-tdbc=${WRKDIR}/tdbc${PORTVERSION} --enable-threads \
@@ -24,15 +30,6 @@ PLIST_SUB+=	VERSION=${DISTVERSION} \
 
 MODULES=	tdbc
 
-MAN3=	Tdbc_Init.3
-MANN=	tdbc.n \
-	tdbc_connection.n \
-	tdbc_mapSqlState.n \
-	tdbc_resultset.n \
-	tdbc_statement.n \
-	tdbc_tokenize.n
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 #
@@ -42,7 +39,6 @@ NO_STAGE=	yes
 DISTFILES+=	${PORTNAME}mysql${PORTVERSION}${EXTRACT_SUFX}
 MODULES+=	tdbcmysql
 PLIST_SUB+=	MYSQL=""
-MANN+=		tdbc_mysql.n
 USE_MYSQL=	client
 .else
 PLIST_SUB+=	MYSQL="@comment "
@@ -56,7 +52,6 @@ LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 DISTFILES+=	${PORTNAME}odbc${PORTVERSION}${EXTRACT_SUFX}
 MODULES+=	tdbcodbc
 PLIST_SUB+=	ODBC=""
-MANN+=		tdbc_odbc.n
 .else
 PLIST_SUB+=	ODBC="@comment "
 .endif
@@ -81,7 +76,6 @@ DISTFILES+=	${PORTNAME}sqlite3-${PORTVERSION}${EXTRACT_SUFX}
 MODULES+=	tdbcsqlite3
 PLIST_SUB+=	SQLITE="" \
 		TCL_LIBDIR="${TCL_LIBDIR:S/${LOCALBASE}\///}"
-MANN+=		tdbc_sqlite3.n
 .else
 PLIST_SUB+=	SQLITE="@comment "
 .endif
@@ -91,11 +85,15 @@ post-extract:
 	    ${MV} ${WRKDIR}/tdbcsqlite3-${PORTVERSION} ${WRKDIR}/tdbcsqlite3${PORTVERSION}; \
 	fi
 
+post-patch:
+	${FIND} ${WRKDIR} -name Makefile.in | ${XARGS} \
+	    ${REINPLACE_CMD} -e '/^DESTDIR/s|=|?=|'
+
 do-configure:
 .for module in ${MODULES}
 	@echo "================================="
 	@echo "Configuring ${module}"
-	cd ${WRKDIR}/${module}${PORTVERSION} && ${SH} configure ${CONFIGURE_ARGS}
+	cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}
 .endfor
 
 post-configure:
@@ -105,21 +103,21 @@ do-build:
 .for module in ${MODULES}
 	@echo "================================="
 	@echo "Building ${module}"
-	cd ${WRKDIR}/${module}${PORTVERSION} && ${MAKE} ${ALL_TARGET}
+	cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
 .endfor
 
 do-install:
 .for module in ${MODULES}
 	@echo "================================="
 	@echo "Installing ${module}"
-	cd ${WRKDIR}/${module}${PORTVERSION} && ${MAKE} ${INSTALL_TARGET}
+	cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
 .endfor
 
 test:
 .for module in ${MODULES}
 	@echo "================================="
 	@echo "Testing ${module}"
-	cd ${WRKDIR}/${module}${PORTVERSION} && ${MAKE} test
+	cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${MAKE_ENV} ${MAKE} test
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/tdbc/pkg-plist b/databases/tdbc/pkg-plist
index 52054bc6054f..9ac848a4d54f 100644
--- a/databases/tdbc/pkg-plist
+++ b/databases/tdbc/pkg-plist
@@ -6,6 +6,13 @@ lib/tdbc%%VERSION%%/libtdbcstub.a
 lib/tdbc%%VERSION%%/pkgIndex.tcl
 lib/tdbc%%VERSION%%/tdbc.tcl
 lib/tdbc%%VERSION%%/tdbcConfig.sh
+man/man3/Tdbc_Init.3.gz
+man/mann/tdbc.n.gz
+man/mann/tdbc_connection.n.gz
+man/mann/tdbc_mapSqlState.n.gz
+man/mann/tdbc_resultset.n.gz
+man/mann/tdbc_statement.n.gz
+man/mann/tdbc_tokenize.n.gz
 @dirrm lib/tdbc%%VERSION%%
 
 @comment MySQL
@@ -15,6 +22,7 @@ lib/tdbc%%VERSION%%/tdbcConfig.sh
 %%MYSQL%%lib/tdbcmysql%%VERSION%%/tdbcmysql.tcl
 %%MYSQL%%lib/tdbcmysql%%VERSION%%/pkgIndex.tcl
 %%MYSQL%%@dirrm lib/tdbcmysql%%VERSION%%
+%%MYSQL%%man/mann/tdbc_mysql.n.gz
 
 @comment ODBC
 %%ODBC%%include/fakesql.h
@@ -23,6 +31,7 @@ lib/tdbc%%VERSION%%/tdbcConfig.sh
 %%ODBC%%lib/tdbcodbc%%VERSION%%/tdbcodbc.tcl
 %%ODBC%%lib/tdbcodbc%%VERSION%%/pkgIndex.tcl
 %%ODBC%%@dirrm lib/tdbcodbc%%VERSION%%
+%%ODBC%%man/mann/tdbc_odbc.n.gz
 
 @comment PGSQL
 %%PGSQL%%include/fakepq.h
@@ -32,6 +41,10 @@ lib/tdbc%%VERSION%%/tdbcConfig.sh
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/pkgIndex.tcl
 %%PGSQL%%@dirrm lib/tdbcpostgres%%VERSION%%
 
+
 @comment SQLITE
 %%SQLITE%%lib/tcl%%TCL_MAJ%%/%%TCL_VER%%/tdbc/sqlite3-%%VERSION%%.tm
+%%SQLITE%%man/mann/tdbc_sqlite3.n.gz
 %%SQLITE%%@dirrm lib/tcl%%TCL_MAJ%%/%%TCL_VER%%/tdbc
+%%SQLITE%%@dirrmtry lib/tcl%%TCL_MAJ%%/%%TCL_VER%%
+%%SQLITE%%@dirrmtry lib/tcl%%TCL_MAJ%%