From owner-svn-ports-all@FreeBSD.ORG Sat Nov 2 15:05:31 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1466355C; Sat, 2 Nov 2013 15:05:31 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0254A2935; Sat, 2 Nov 2013 15:05:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA2F5Uhw021028; Sat, 2 Nov 2013 15:05:30 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA2F5U9a021025; Sat, 2 Nov 2013 15:05:30 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311021505.rA2F5U9a021025@svn.freebsd.org> From: William Grzybowski Date: Sat, 2 Nov 2013 15:05:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332494 - head/databases/unixODBC X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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: Sat, 02 Nov 2013 15:05:31 -0000 Author: wg Date: Sat Nov 2 15:05:30 2013 New Revision: 332494 URL: http://svnweb.freebsd.org/changeset/ports/332494 Log: databases/unixODBC: update to 2.3.2 - Update to 2.3.2 - Add LICENSE - Add DOCS option - Allow staging PR: ports/183568 Submitted by: KATO Tsuguru Modified: head/databases/unixODBC/Makefile head/databases/unixODBC/distinfo head/databases/unixODBC/pkg-plist Modified: head/databases/unixODBC/Makefile ============================================================================== --- head/databases/unixODBC/Makefile Sat Nov 2 14:48:58 2013 (r332493) +++ head/databases/unixODBC/Makefile Sat Nov 2 15:05:30 2013 (r332494) @@ -2,40 +2,40 @@ # $FreeBSD$ PORTNAME= unixODBC -PORTVERSION= 2.3.1 +PORTVERSION= 2.3.2 CATEGORIES= databases MASTER_SITES= http://www.unixodbc.org/ MAINTAINER= ports@FreeBSD.org COMMENT= ODBC library suite for Unix +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi + +OPTIONS_DEFINE= DOCS + CONFLICTS= libiodbc-[0-9]* USES= iconv GNU_CONFIGURE= yes +CONFIGURE_ENV= ac_cv_header_msql_h=no CONFIGURE_ARGS= --enable-static --enable-shared \ ${ICONV_CONFIGURE_ARG} USE_LDCONFIG= yes PORTDOCS= * -NO_STAGE= yes +.include + post-patch: - @${REINPLACE_CMD} 's,$$LIBS $$THREADLIB,$$LIBS,;s,$$CFLAGS -pthread,$$CFLAGS,' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,@MSQL_TRUE@lib_LTLIBRARIES,#&,' \ - ${WRKSRC}/Drivers/MiniSQL/Makefile.in + @${REINPLACE_CMD} -e \ + '/\.ini/s|^|#|' ${WRKSRC}/Makefile.in post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . \ - | ${TAR} -C ${DOCSDIR} --unlink -xf - -.if !defined(INSTALL_AS_USER) - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} - ${FIND} ${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 - ${FIND} ${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 -.endif +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + @${FIND} ${STAGEDIR}${DOCSDIR} -type f -name "*Makefile*" -delete .endif .include Modified: head/databases/unixODBC/distinfo ============================================================================== --- head/databases/unixODBC/distinfo Sat Nov 2 14:48:58 2013 (r332493) +++ head/databases/unixODBC/distinfo Sat Nov 2 15:05:30 2013 (r332494) @@ -1,2 +1,2 @@ -SHA256 (unixODBC-2.3.1.tar.gz) = 1f5be3edecff9e31072ef738ea1d8019594c4f0c2e3ab427e6eef153491db6a2 -SIZE (unixODBC-2.3.1.tar.gz) = 1813380 +SHA256 (unixODBC-2.3.2.tar.gz) = 9c3459742f25df5aa3c10a61429bde51a6d4f11552c03095f1d33d7eb02b5c9a +SIZE (unixODBC-2.3.2.tar.gz) = 1849173 Modified: head/databases/unixODBC/pkg-plist ============================================================================== --- head/databases/unixODBC/pkg-plist Sat Nov 2 14:48:58 2013 (r332493) +++ head/databases/unixODBC/pkg-plist Sat Nov 2 15:05:30 2013 (r332494) @@ -1,8 +1,9 @@ -bin/isql bin/dltest -bin/odbcinst +bin/isql bin/iusql bin/odbc_config +bin/odbcinst +bin/slencheck include/autotest.h include/odbcinst.h include/odbcinstext.h @@ -10,21 +11,28 @@ include/sql.h include/sqlext.h include/sqltypes.h include/sqlucode.h -include/uodbc_stats.h -include/uodbc_extras.h include/unixodbc_conf.h -lib/libodbcinst.so -lib/libodbcinst.so.2 -lib/libodbcinst.la -lib/libodbcinst.a +include/uodbc_extras.h +include/uodbc_stats.h +lib/libodbc.a +lib/libodbc.la lib/libodbc.so lib/libodbc.so.2 -lib/libodbc.la -lib/libodbc.a +lib/libodbccr.a +lib/libodbccr.la lib/libodbccr.so lib/libodbccr.so.2 -lib/libodbccr.la -lib/libodbccr.a -@unexec test -s %D/etc/odbc.ini || rm -f %D/etc/odbc.ini +lib/libodbcinst.a +lib/libodbcinst.la +lib/libodbcinst.so +lib/libodbcinst.so.2 +man/man1/isql.1.gz +man/man1/odbcinst.1.gz +man/man5/odbc.ini.5.gz +man/man5/odbcinst.ini.5.gz @unexec test -s %D/etc/odbcinst.ini || rm -f %D/etc/odbcinst.ini +@unexec test -s %D/etc/odbc.ini || rm -f %D/etc/odbc.ini @dirrmtry etc/ODBCDataSources +@exec mkdir -p %D/etc/ODBCDataSources +@exec test -e %D/etc/odbc.ini || touch %D/etc/odbc.ini +@exec test -e %D/etc/odbcinst.ini || touch %D/etc/odbcinst.ini