From d4f861a3c455d3baed14d5347816cf45ac4c7a0b Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Thu, 4 Oct 2012 12:06:43 +0000 Subject: - Sync with upstream - Bump PORTREVISION (PORTVERSION has not changed) - Convert to OptionsNG - Remove libiodbc option for ODBC driver (does not work) --- databases/tdbc/Makefile | 53 ++++++++-------------- databases/tdbc/distinfo | 4 +- .../tdbc/files/patch-tdbcodbc-generic_tdbcodbc.c | 17 ------- databases/tdbc/files/patch-tdbcsqlite3_Makefile.in | 12 ----- databases/tdbc/files/pkgIndex.tcl.in | 1 - databases/tdbc/pkg-plist | 5 +- 6 files changed, 23 insertions(+), 69 deletions(-) delete mode 100644 databases/tdbc/files/patch-tdbcodbc-generic_tdbcodbc.c delete mode 100644 databases/tdbc/files/patch-tdbcsqlite3_Makefile.in delete mode 100644 databases/tdbc/files/pkgIndex.tcl.in (limited to 'databases/tdbc') diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile index 23eaf150beb6..dab0ea6b91ae 100644 --- a/databases/tdbc/Makefile +++ b/databases/tdbc/Makefile @@ -1,13 +1,9 @@ -# New ports collection Makefile for: tdbc -# Date created: 16 March 2012 -# Whom: Pietro Cerutti -# +# Created by: Pietro Cerutti # $FreeBSD$ -# PORTNAME= tdbc DISTVERSION= 1.0b17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://tdbc.tcl.tk/index.cgi/tarball/ DISTFILES= ${PORTNAME:U}-${FOSSIL_HASH}.${EXTRACT_SUFX}?uuid=${FOSSIL_HASH} @@ -15,13 +11,9 @@ DISTFILES= ${PORTNAME:U}-${FOSSIL_HASH}.${EXTRACT_SUFX}?uuid=${FOSSIL_HASH} MAINTAINER= gahr@FreeBSD.org COMMENT= The common database access interface for Tcl -OPTIONS= MYSQL "Build MySQL driver" off \ - UODBC "Build ODBC driver (unixODBC)" off \ - IODBC "Build ODBC driver (iODBC)" off \ - PGSQL "Build PostgreSQL driver" off \ - SQLITE "Build SQLite driver" off +OPTIONS_DEFINE= MYSQL PGSQL SQLITE ODBC -FOSSIL_HASH= 9972d7cf7d10b55157773ba027e54713d53e4cee +FOSSIL_HASH= dc470dee3956a286ccdda1b7d9153950c282a2fe USE_TCL= 86 USE_LDCONFIG= yes @@ -29,9 +21,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME:U}-${FOSSIL_HASH}. CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} --with-tcloo=${TCL_LIBDIR} \ --prefix=${PREFIX} --exec-prefix=${PREFIX} \ --with-tdbc=${WRKSRC}/tdbc --enable-threads -PLIST_SUB+= VERSION=${DISTVERSION} -SUB_FILES+= pkgIndex.tcl -SUB_LIST+= DISTVERSION=${DISTVERSION} +PLIST_SUB+= VERSION=${DISTVERSION} \ + TCL_MAJ=${TCL_VER:R} \ + TCL_VER=${TCL_VER} MODULES= tdbc @@ -48,7 +40,7 @@ MANN= tdbc.n \ # # MySQL # -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} MODULES+= tdbcmysql PLIST_SUB+= MYSQL="" MANN+= tdbc_mysql.n @@ -60,19 +52,8 @@ PLIST_SUB+= MYSQL="@comment " # # ODBC # -.if defined(WITH_UODBC) && defined(WITH_IODBC) -IGNORE= please select either UODBC or IODBC, but not both -.endif - -.if defined(WITH_UODBC) && !defined(WITH_IODBC) +.if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC -.endif - -.if defined(WITH_IODBC) && !defined(WITH_UODBC) -LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc -.endif - -.if defined(WITH_UODBC) || defined(WITH_IODBC) MODULES+= tdbcodbc PLIST_SUB+= ODBC="" MANN+= tdbc_odbc.n @@ -83,11 +64,10 @@ PLIST_SUB+= ODBC="@comment " # # PostgreSQL # -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= client MODULES+= tdbcpostgres PLIST_SUB+= PGSQL="" -MANN+= tdbc_postgres.n .else PLIST_SUB+= PGSQL="@comment " .endif @@ -95,7 +75,7 @@ PLIST_SUB+= PGSQL="@comment " # # SQLite # -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} MODULES+= tdbcsqlite3 PLIST_SUB+= SQLITE="" \ TCL_LIBDIR="${TCL_LIBDIR:S/${LOCALBASE}\///}" @@ -106,6 +86,8 @@ PLIST_SUB+= SQLITE="@comment " do-configure: .for module in ${MODULES} + @echo "=================================" + @echo "Configuring ${module}" cd ${WRKSRC}/${module} && ${SH} configure ${CONFIGURE_ARGS} .endfor @@ -114,19 +96,22 @@ post-configure: do-build: .for module in ${MODULES} + @echo "=================================" + @echo "Building ${module}" cd ${WRKSRC}/${module} && ${MAKE} ${ALL_TARGET} .endfor do-install: .for module in ${MODULES} + @echo "=================================" + @echo "Installing ${module}" cd ${WRKSRC}/${module} && ${MAKE} ${INSTALL_TARGET} .endfor -.if defined(WITH_SQLITE) - ${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${TCL_LIBDIR:S/${LOCALBASE}/${PREFIX}/}/tdbc -.endif test: .for module in ${MODULES} + @echo "=================================" + @echo "Testing ${module}" cd ${WRKSRC}/${module} && ${MAKE} test .endfor diff --git a/databases/tdbc/distinfo b/databases/tdbc/distinfo index 9356f1429709..610a5744dbd6 100644 --- a/databases/tdbc/distinfo +++ b/databases/tdbc/distinfo @@ -1,2 +1,2 @@ -SHA256 (TDBC-9972d7cf7d10b55157773ba027e54713d53e4cee..tar.gz?uuid=9972d7cf7d10b55157773ba027e54713d53e4cee) = 54b1a7fc544cf7e0268fc7e7a4761a0fc552d64bbe98254cef280edd5022903b -SIZE (TDBC-9972d7cf7d10b55157773ba027e54713d53e4cee..tar.gz?uuid=9972d7cf7d10b55157773ba027e54713d53e4cee) = 921886 +SHA256 (TDBC-dc470dee3956a286ccdda1b7d9153950c282a2fe..tar.gz?uuid=dc470dee3956a286ccdda1b7d9153950c282a2fe) = 84247c45cfc0ff77e69bc5cdda3749cfc633ab7fe9b75d068f5ecac0a69ed28f +SIZE (TDBC-dc470dee3956a286ccdda1b7d9153950c282a2fe..tar.gz?uuid=dc470dee3956a286ccdda1b7d9153950c282a2fe) = 971116 diff --git a/databases/tdbc/files/patch-tdbcodbc-generic_tdbcodbc.c b/databases/tdbc/files/patch-tdbcodbc-generic_tdbcodbc.c deleted file mode 100644 index 8a9a05e6addf..000000000000 --- a/databases/tdbc/files/patch-tdbcodbc-generic_tdbcodbc.c +++ /dev/null @@ -1,17 +0,0 @@ ---- tdbcodbc/generic/tdbcodbc.c,orig 2011-08-01 16:50:38.000000000 +0200 -+++ tdbcodbc/generic/tdbcodbc.c 2012-05-09 10:52:56.000000000 +0200 -@@ -4092,10 +4092,10 @@ - SQLLEN colAllocLen = BUFSIZE * sizeof(SQLWCHAR); - /* Current allocated size of the buffer, - * in bytes */ -- SQLLEN colLen; /* Actual size of the return value, in bytes */ -- SQLINTEGER colLong; /* Integer value of the column */ -- SQLBIGINT colWide; /* Wide-integer value of the column */ -- SQLDOUBLE colDouble; /* Double value of the column */ -+ SQLLEN colLen = 0; /* Actual size of the return value, in bytes */ -+ SQLINTEGER colLong = 0L; /* Integer value of the column */ -+ SQLBIGINT colWide = 0; /* Wide-integer value of the column */ -+ SQLDOUBLE colDouble = 0.0; /* Double value of the column */ - Tcl_DString colDS; /* Column expressed as a Tcl_DString */ - Tcl_Obj* colObj; /* Column expressed as a Tcl_Obj */ - SQLRETURN rc; /* ODBC result code */ diff --git a/databases/tdbc/files/patch-tdbcsqlite3_Makefile.in b/databases/tdbc/files/patch-tdbcsqlite3_Makefile.in deleted file mode 100644 index c005a0890f0a..000000000000 --- a/databases/tdbc/files/patch-tdbcsqlite3_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- tdbcsqlite3/Makefile.in.orig 2011-08-01 16:50:38.000000000 +0200 -+++ tdbcsqlite3/Makefile.in 2012-03-16 16:49:20.000000000 +0100 -@@ -72,6 +72,6 @@ - pkgdatadir = $(datadir)/$(PKG_DIR) - pkglibdir = $(libdir)/$(PKG_DIR) - pkgincludedir = $(includedir)/$(PKG_DIR) --tmdir = $(libdir)/tcl$(TCL_MAJOR_VERSION)/$(TCL_VERSION) -+tmdir = $(libdir)/tcl$(TCL_VERSION) - pkgslash = `echo $(PACKAGE_NAME) | sed s=tdbc=tdbc/=` - - top_builddir = . - diff --git a/databases/tdbc/files/pkgIndex.tcl.in b/databases/tdbc/files/pkgIndex.tcl.in deleted file mode 100644 index ea62d963480f..000000000000 --- a/databases/tdbc/files/pkgIndex.tcl.in +++ /dev/null @@ -1 +0,0 @@ -package ifneeded tdbc::sqlite3 %%DISTVERSION%% [list source [file join $dir sqlite3-%%DISTVERSION%%.tm]] diff --git a/databases/tdbc/pkg-plist b/databases/tdbc/pkg-plist index 07c856117b66..52054bc6054f 100644 --- a/databases/tdbc/pkg-plist +++ b/databases/tdbc/pkg-plist @@ -33,6 +33,5 @@ lib/tdbc%%VERSION%%/tdbcConfig.sh %%PGSQL%%@dirrm lib/tdbcpostgres%%VERSION%% @comment SQLITE -%%SQLITE%%%%TCL_LIBDIR%%/tdbc/sqlite3-%%VERSION%%.tm -%%SQLITE%%%%TCL_LIBDIR%%/tdbc/pkgIndex.tcl -%%SQLITE%%@dirrm %%TCL_LIBDIR%%/tdbc +%%SQLITE%%lib/tcl%%TCL_MAJ%%/%%TCL_VER%%/tdbc/sqlite3-%%VERSION%%.tm +%%SQLITE%%@dirrm lib/tcl%%TCL_MAJ%%/%%TCL_VER%%/tdbc -- cgit v1.2.3