From owner-svn-ports-all@FreeBSD.ORG Thu Oct 4 12:06:44 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 06366106564A; Thu, 4 Oct 2012 12:06:44 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA1EA8FC17; Thu, 4 Oct 2012 12:06:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q94C6hiO050331; Thu, 4 Oct 2012 12:06:43 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q94C6hD6050327; Thu, 4 Oct 2012 12:06:43 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201210041206.q94C6hD6050327@svn.freebsd.org> From: Pietro Cerutti Date: Thu, 4 Oct 2012 12:06:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305254 - in head/databases/tdbc: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2012 12:06:44 -0000 Author: gahr Date: Thu Oct 4 12:06:43 2012 New Revision: 305254 URL: http://svn.freebsd.org/changeset/ports/305254 Log: - Sync with upstream - Bump PORTREVISION (PORTVERSION has not changed) - Convert to OptionsNG - Remove libiodbc option for ODBC driver (does not work) Deleted: head/databases/tdbc/files/ Modified: head/databases/tdbc/Makefile (contents, props changed) head/databases/tdbc/distinfo (contents, props changed) head/databases/tdbc/pkg-plist (contents, props changed) Modified: head/databases/tdbc/Makefile ============================================================================== --- head/databases/tdbc/Makefile Thu Oct 4 11:31:58 2012 (r305253) +++ head/databases/tdbc/Makefile Thu Oct 4 12:06:43 2012 (r305254) @@ -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}. 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}-${FOSSI 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 Modified: head/databases/tdbc/distinfo ============================================================================== --- head/databases/tdbc/distinfo Thu Oct 4 11:31:58 2012 (r305253) +++ head/databases/tdbc/distinfo Thu Oct 4 12:06:43 2012 (r305254) @@ -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 Modified: head/databases/tdbc/pkg-plist ============================================================================== --- head/databases/tdbc/pkg-plist Thu Oct 4 11:31:58 2012 (r305253) +++ head/databases/tdbc/pkg-plist Thu Oct 4 12:06:43 2012 (r305254) @@ -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