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>

3 files changed, 38 insertions, 30 deletions

diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 5c74bb50f37d..b826da8934fa 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -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>
diff --git a/databases/unixODBC/distinfo b/databases/unixODBC/distinfo
index 8db077cc6a3f..74fc05455607 100644
--- a/databases/unixODBC/distinfo
+++ b/databases/unixODBC/distinfo
@@ -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 --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist
index ad71ce298ca7..db34d1fa3248 100644
--- a/databases/unixODBC/pkg-plist
+++ b/databases/unixODBC/pkg-plist
@@ -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