Index: head/databases/tdbc/Makefile =================================================================== --- head/databases/tdbc/Makefile (revision 366326) +++ head/databases/tdbc/Makefile (revision 366327) @@ -1,123 +1,125 @@ # Created by: Pietro Cerutti # $FreeBSD$ PORTNAME= tdbc -DISTVERSION= 1.0.0 +DISTVERSION= 1.0.1 CATEGORIES= databases -MASTER_SITES= SF/tcl/Tcl/8.6.1 +MASTER_SITES= SF/tcl/Tcl/8.6.2 DISTFILES= ${PORTNAME}${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= tcltk@FreeBSD.org COMMENT= Common database access interface for Tcl LICENSE= TclTk LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKDIR}/${PORTNAME}${PORTVERSION}/license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept OPTIONS_DEFINE= MYSQL PGSQL SQLITE ODBC 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 \ --mandir=${PREFIX}/man PLIST_SUB+= VERSION=${DISTVERSION} \ TCL_MAJ=${TCL_VER:R} \ TCL_VER=${TCL_VER} MODULES= tdbc .include # # 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 # # 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 # # PostgreSQL # .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= client +USES+= pgsql DISTFILES+= ${PORTNAME}postgres${PORTVERSION}${EXTRACT_SUFX} MODULES+= tdbcpostgres PLIST_SUB+= PGSQL="" .else PLIST_SUB+= PGSQL="@comment " .endif # # 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 post-extract: if [ -d ${WRKDIR}/tdbcsqlite3-${PORTVERSION} ]; then \ ${MV} ${WRKDIR}/tdbcsqlite3-${PORTVERSION} ${WRKDIR}/tdbcsqlite3${PORTVERSION}; \ fi post-patch: - ${FIND} ${WRKDIR} -name Makefile.in | ${XARGS} \ - ${REINPLACE_CMD} -e '/^DESTDIR/s|=|?=|' + ${FIND} ${WRKDIR} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ + -e '/^DESTDIR/s|=|?=|' \ + -e '/^INSTALL_PROGRAM/s|$$| -s|' \ + -e '/^INSTALL_LIBRARY/s|$$| -s|' do-configure: .for module in ${MODULES} @echo "=================================" @echo "Configuring ${module}" cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS} .endfor post-configure: ${FIND} ${WRKDIR} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|tdbcstub100|tdbcstub|g' do-build: .for module in ${MODULES} @echo "=================================" @echo "Building ${module}" 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} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} .endfor test: .for module in ${MODULES} @echo "=================================" @echo "Testing ${module}" cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${MAKE_ENV} ${MAKE} test .endfor .include Index: head/databases/tdbc/distinfo =================================================================== --- head/databases/tdbc/distinfo (revision 366326) +++ head/databases/tdbc/distinfo (revision 366327) @@ -1,10 +1,10 @@ -SHA256 (tdbc1.0.0.tar.gz) = bb337e9e6bfd31a839573d7e73bcde420637b694233e4b522e0a8bbae3b949a8 -SIZE (tdbc1.0.0.tar.gz) = 188973 -SHA256 (tdbcmysql1.0.0.tar.gz) = 5601b5e39730e48d2906f56d110a985a521892db01c4f66e81b8443ef7dcb47a -SIZE (tdbcmysql1.0.0.tar.gz) = 172054 -SHA256 (tdbcodbc1.0.0.tar.gz) = e4db224cc7d49fe70b611d880cb5df7fdeed9884c44bf715f3d641c38ed3bd76 -SIZE (tdbcodbc1.0.0.tar.gz) = 188530 -SHA256 (tdbcpostgres1.0.0.tar.gz) = 55233cdc8eb3fc82edf09c8dcef3953e522159205fb5dd0b1baaa892a4c9a4f3 -SIZE (tdbcpostgres1.0.0.tar.gz) = 163129 -SHA256 (tdbcsqlite3-1.0.0.tar.gz) = a5b4ff6f868c5759e439a76b261dbaae9d048a942ad1b4b1513861f84d53b247 -SIZE (tdbcsqlite3-1.0.0.tar.gz) = 111460 +SHA256 (tdbc1.0.1.tar.gz) = 8f8363eed5d0519b631cd7203c6d673b5f45adbb82982a7261808ce50104d019 +SIZE (tdbc1.0.1.tar.gz) = 189738 +SHA256 (tdbcmysql1.0.1.tar.gz) = 7863aacea15febb83e51b9a6f2b75830726fbd9823e238660cd7e2a9884ae5e6 +SIZE (tdbcmysql1.0.1.tar.gz) = 172305 +SHA256 (tdbcodbc1.0.1.tar.gz) = b75e3189c6bc178a7637974cf9a7a865f810afad33ddaef0d1b32997b78a4e0e +SIZE (tdbcodbc1.0.1.tar.gz) = 188819 +SHA256 (tdbcpostgres1.0.1.tar.gz) = c29b276c2f6b4f9e6b68c96129ad9649e5d5a9c93eedb7f3f1577d4d5a30c2b6 +SIZE (tdbcpostgres1.0.1.tar.gz) = 163353 +SHA256 (tdbcsqlite3-1.0.1.tar.gz) = 0b13fa28d237b9f7e1cd812700759809cde612473d0b720a0506d30d1b775a26 +SIZE (tdbcsqlite3-1.0.1.tar.gz) = 111602 Index: head/databases/tdbc/pkg-plist =================================================================== --- head/databases/tdbc/pkg-plist (revision 366326) +++ head/databases/tdbc/pkg-plist (revision 366327) @@ -1,50 +1,50 @@ include/tdbc.h include/tdbcDecls.h include/tdbcInt.h -lib/tdbc%%VERSION%%/libtdbc.so.1 -lib/tdbc%%VERSION%%/libtdbcstub.a +lib/tdbc%%VERSION%%/libtdbc1.0.1.so +lib/tdbc%%VERSION%%/libtdbcstub1.0.1.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 %%MYSQL%%include/fakemysql.h %%MYSQL%%include/mysqlStubs.h -%%MYSQL%%lib/tdbcmysql%%VERSION%%/libtdbcmysql.so.1 +%%MYSQL%%lib/tdbcmysql%%VERSION%%/libtdbcmysql1.0.1.so %%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 %%ODBC%%include/odbcStubs.h -%%ODBC%%lib/tdbcodbc%%VERSION%%/libtdbcodbc.so.1 +%%ODBC%%lib/tdbcodbc%%VERSION%%/libtdbcodbc1.0.1.so %%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 %%PGSQL%%include/pqStubs.h -%%PGSQL%%lib/tdbcpostgres%%VERSION%%/libtdbcpostgres.so.1 +%%PGSQL%%lib/tdbcpostgres%%VERSION%%/libtdbcpostgres1.0.1.so %%PGSQL%%lib/tdbcpostgres%%VERSION%%/tdbcpostgres.tcl %%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%%