From tkato432@yahoo.com  Fri Nov  1 18:30:14 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 44D7FEFB
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  1 Nov 2013 18:30:14 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from omta01.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17])
	by mx1.freebsd.org (Postfix) with ESMTP id DF0BD2F3F
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  1 Nov 2013 18:30:13 +0000 (UTC)
Received: from coppermine.my.domain (ZT034086.ppp.dion.ne.jp [59.128.34.86])
	by omta01.auone-net.jp (au one net mail) with ESMTP id 1E87598001D
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  2 Nov 2013 03:30:09 +0900 (JST)
Message-Id: <20131102032014.80a63d04119b3f3cef5d5e95@yahoo.com>
Date: Sat, 2 Nov 2013 03:20:14 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: databases/unixODBC: Update to version 2.3.2

>Number:         183568
>Category:       ports
>Synopsis:       databases/unixODBC: Update to version 2.3.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 01 18:40:05 UTC 2013
>Closed-Date:    Sat Nov 02 15:10:39 UTC 2013
>Last-Modified:  Sat Nov 02 15:10:39 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 2.3.2

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile
--- /usr/ports/databases/unixODBC/Makefile	2013-09-22 00:29:22.000000000 +0900
+++ databases/unixODBC/Makefile	2013-11-02 00:00:00.000000000 +0900
@@ -2,40 +2,45 @@
 # $FreeBSD: head/databases/unixODBC/Makefile 327717 2013-09-20 16:13:47Z bapt $
 
 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 <bsd.port.options.mk>
+
 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}
+	@${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . \
+		| ${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
+	@${FIND} ${STAGEDIR}${DOCSDIR} -type d -print0 \
+		| ${XARGS} -0 ${CHMOD} a+rx
+	@${FIND} ${STAGEDIR}${DOCSDIR} -type f -print0 \
+		| ${XARGS} -0 ${CHMOD} ${SHAREMODE}
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/databases/unixODBC/distinfo databases/unixODBC/distinfo
--- /usr/ports/databases/unixODBC/distinfo	2013-06-21 03:52:02.000000000 +0900
+++ databases/unixODBC/distinfo	2013-11-02 00:00:00.000000000 +0900
@@ -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
diff -urN /usr/ports/databases/unixODBC/pkg-plist databases/unixODBC/pkg-plist
--- /usr/ports/databases/unixODBC/pkg-plist	2013-06-21 03:52:02.000000000 +0900
+++ databases/unixODBC/pkg-plist	2013-11-02 00:00:00.000000000 +0900
@@ -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/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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Sat Nov 2 12:20:15 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183568 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183568: commit references a PR
Date: Sat,  2 Nov 2013 15:05:38 +0000 (UTC)

 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 <tkato432 yahoo.com>
 
 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 <bsd.port.options.mk>
 +
  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 <bsd.port.mk>
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Sat Nov 2 15:10:39 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183568 
>Unformatted:
