Date: Tue, 1 Mar 2016 16:37:53 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409883 - head/databases/tdbc Message-ID: <201603011637.u21GbruT042020@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Mar 1 16:37:53 2016 New Revision: 409883 URL: https://svnweb.freebsd.org/changeset/ports/409883 Log: databases/tdbc: update to 1.0.4 While at it, switch to OPTIONS helper and install header files in a dedicated directory to avoid potential clashes. Modified: head/databases/tdbc/Makefile head/databases/tdbc/distinfo head/databases/tdbc/pkg-plist Modified: head/databases/tdbc/Makefile ============================================================================== --- head/databases/tdbc/Makefile Tue Mar 1 16:32:31 2016 (r409882) +++ head/databases/tdbc/Makefile Tue Mar 1 16:37:53 2016 (r409883) @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= tdbc -DISTVERSION= 1.0.3 +DISTVERSION= 1.0.4 CATEGORIES= databases -MASTER_SITES= SF/tcl/TDBC/${PORTVERSION} +MASTER_SITES= TCLTK/tcl8_6 \ + SF/tcl/Tcl/8.6.5 DISTFILES= ${PORTNAME}${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= tcltk@FreeBSD.org @@ -16,6 +17,8 @@ LICENSE_FILE= ${WRKDIR}/${PORTNAME}${POR LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept OPTIONS_DEFINE= MYSQL PGSQL SQLITE ODBC +OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC +OPTIONS_SUB= yes USES= tcl:86 USE_LDCONFIG= yes @@ -23,62 +26,35 @@ 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 \ - --mandir=${PREFIX}/man + --mandir=${PREFIX}/man \ + --includedir=${PREFIX}/include/tdbc PLIST_SUB+= VERSION=${DISTVERSION} \ TCL_MAJ=${TCL_VER:R} \ TCL_VER=${TCL_VER} MODULES= tdbc -.include <bsd.port.options.mk> - -# # MySQL -# -.if ${PORT_OPTIONS:MMYSQL} -DISTFILES+= ${PORTNAME}mysql${PORTVERSION}${EXTRACT_SUFX} -MODULES+= tdbcmysql -PLIST_SUB+= MYSQL="" -USE_MYSQL= client -.else -PLIST_SUB+= MYSQL="@comment " -.endif +MYSQL_VARS= MODULES+=tdbcmysql USE_MYSQL=client +MYSQL_DISTFILES= ${PORTNAME}mysql${PORTVERSION}${EXTRACT_SUFX} -# # ODBC -# -.if ${PORT_OPTIONS:MODBC} -LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC -DISTFILES+= ${PORTNAME}odbc${PORTVERSION}${EXTRACT_SUFX} -MODULES+= tdbcodbc -PLIST_SUB+= ODBC="" -.else -PLIST_SUB+= ODBC="@comment " -.endif +ODBC_VARS= MODULES+=tdbcodbc +ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC +ODBC_DISTFILES= ${PORTNAME}odbc${PORTVERSION}${EXTRACT_SUFX} -# # PostgreSQL -# -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -DISTFILES+= ${PORTNAME}postgres${PORTVERSION}${EXTRACT_SUFX} -MODULES+= tdbcpostgres -PLIST_SUB+= PGSQL="" -.else -PLIST_SUB+= PGSQL="@comment " -.endif +PGSQL_VARS= MODULES+=tdbcpostgres +PGSQL_USES= pgsql +PGSQL_DISTFILES= ${PORTNAME}postgres${PORTVERSION}${EXTRACT_SUFX} -# # SQLite -# -.if ${PORT_OPTIONS:MSQLITE} -DISTFILES+= ${PORTNAME}sqlite3-${PORTVERSION}${EXTRACT_SUFX} -MODULES+= tdbcsqlite3 -PLIST_SUB+= SQLITE="" \ - TCL_LIBDIR="${TCL_LIBDIR:S/${LOCALBASE}\///}" -.else -PLIST_SUB+= SQLITE="@comment " -.endif +SQLITE_VARS= MODULES+=tdbcsqlite3 +SQLITE_DISTFILES= ${PORTNAME}sqlite3-${PORTVERSION}${EXTRACT_SUFX} +SQLITE_PLIST_SUB= TCL_LIBDIR="${TCL_LIBDIR:S/${LOCALBASE}\///}" +SQLITE_RUN_DEPENDS= ${LOCALBASE}/lib/sqlite3/pkgIndex.tcl:${PORTSDIR}/databases/tcl-sqlite3 + +.include <bsd.port.options.mk> post-extract: if [ -d ${WRKDIR}/tdbcsqlite3-${PORTVERSION} ]; then \ @@ -115,7 +91,7 @@ do-install: cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} .endfor -test: +do-test: .for module in ${MODULES} @echo "=================================" @echo "Testing ${module}" Modified: head/databases/tdbc/distinfo ============================================================================== --- head/databases/tdbc/distinfo Tue Mar 1 16:32:31 2016 (r409882) +++ head/databases/tdbc/distinfo Tue Mar 1 16:37:53 2016 (r409883) @@ -1,10 +1,10 @@ -SHA256 (tdbc1.0.3.tar.gz) = 83284b8fb834c3451ec394b896d4e0cf84a59874857ac25fd7e16a3d90952a63 -SIZE (tdbc1.0.3.tar.gz) = 191627 -SHA256 (tdbcmysql1.0.3.tar.gz) = 420a1e03c04628cefd60183a501d716fd3a1da21d635f7be8112a04b8ed9922f -SIZE (tdbcmysql1.0.3.tar.gz) = 171997 -SHA256 (tdbcodbc1.0.3.tar.gz) = 46284730300f739bde7e70959883af5262d982e006f711d91af75aaa07effbbd -SIZE (tdbcodbc1.0.3.tar.gz) = 187871 -SHA256 (tdbcpostgres1.0.3.tar.gz) = d684e09fb2f8e1d59d28181c2f9e6d34384b8cacd89d3762dc5a1ad617c4853c -SIZE (tdbcpostgres1.0.3.tar.gz) = 166766 -SHA256 (tdbcsqlite3-1.0.3.tar.gz) = 71dd0bbd127b80f7d1cb35a1f95470287cd7001a0df77004c003d328e4d5f6e3 -SIZE (tdbcsqlite3-1.0.3.tar.gz) = 111518 +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 Modified: head/databases/tdbc/pkg-plist ============================================================================== --- head/databases/tdbc/pkg-plist Tue Mar 1 16:32:31 2016 (r409882) +++ head/databases/tdbc/pkg-plist Tue Mar 1 16:37:53 2016 (r409883) @@ -1,6 +1,6 @@ -include/tdbc.h -include/tdbcDecls.h -include/tdbcInt.h +include/tdbc/tdbc.h +include/tdbc/tdbcDecls.h +include/tdbc/tdbcInt.h lib/tdbc%%VERSION%%/libtdbc%%VERSION%%.so lib/tdbc%%VERSION%%/libtdbcstub%%VERSION%%.a lib/tdbc%%VERSION%%/pkgIndex.tcl @@ -14,22 +14,22 @@ man/mann/tdbc_resultset.n.gz man/mann/tdbc_statement.n.gz man/mann/tdbc_tokenize.n.gz @comment MySQL -%%MYSQL%%include/fakemysql.h -%%MYSQL%%include/mysqlStubs.h +%%MYSQL%%include/tdbc/fakemysql.h +%%MYSQL%%include/tdbc/mysqlStubs.h %%MYSQL%%lib/tdbcmysql%%VERSION%%/libtdbcmysql%%VERSION%%.so %%MYSQL%%lib/tdbcmysql%%VERSION%%/tdbcmysql.tcl %%MYSQL%%lib/tdbcmysql%%VERSION%%/pkgIndex.tcl %%MYSQL%%man/mann/tdbc_mysql.n.gz @comment ODBC -%%ODBC%%include/fakesql.h -%%ODBC%%include/odbcStubs.h +%%ODBC%%include/tdbc/fakesql.h +%%ODBC%%include/tdbc/odbcStubs.h %%ODBC%%lib/tdbcodbc%%VERSION%%/libtdbcodbc%%VERSION%%.so %%ODBC%%lib/tdbcodbc%%VERSION%%/tdbcodbc.tcl %%ODBC%%lib/tdbcodbc%%VERSION%%/pkgIndex.tcl %%ODBC%%man/mann/tdbc_odbc.n.gz @comment PGSQL -%%PGSQL%%include/fakepq.h -%%PGSQL%%include/pqStubs.h +%%PGSQL%%include/tdbc/fakepq.h +%%PGSQL%%include/tdbc/pqStubs.h %%PGSQL%%lib/tdbcpostgres%%VERSION%%/libtdbcpostgres%%VERSION%%.so %%PGSQL%%lib/tdbcpostgres%%VERSION%%/tdbcpostgres.tcl %%PGSQL%%lib/tdbcpostgres%%VERSION%%/pkgIndex.tcl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603011637.u21GbruT042020>