Import of pkgsrc-2016Q3

databases/unixodbc/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2015/04/26 11:37:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.37 2016/02/14 10:19:22 jperkin Exp $
 
-DISTNAME=	unixODBC-2.3.2
+DISTNAME=	unixODBC-2.3.4
 PKGNAME=	${DISTNAME:S/ODBC/odbc/}
 CATEGORIES=	databases
-MASTER_SITES=	http://www.unixodbc.org/
+MASTER_SITES=	ftp://ftp.unixodbc.org/pub/unixODBC/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.unixodbc.org/
@@ -12,14 +12,22 @@ LICENSE=	gnu-lgpl-v2.1
 
 CONFLICTS+=		iodbc<3.52.7nb2
 
-USE_LIBTOOL=		YES
-GNU_CONFIGURE=		YES
+USE_LIBTOOL=		yes
+USE_TOOLS+=		flex yacc # to get libodbctxt.la
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--disable-gui
 CONFIGURE_ARGS+=	--enable-driverc
 CONFIGURE_ARGS+=	--enable-drivers
 CONFIGURE_ARGS+=	--enable-threads
 PTHREAD_OPTS+=		require
 
+.include "../../mk/pthread.buildlink3.mk"
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
+CONFIGURE_ARGS+=	--enable-gnuthreads
+CONFIGURE_ARGS+=	--with-pth=${PTHREADBASE:Q}
+.endif
+
 LIBS.SunOS+=		-lsocket -lnsl
 
 # Override the local definitions that point to the self-contained libtool
@@ -27,42 +35,11 @@ LIBS.SunOS+=		-lsocket -lnsl
 # the variable pointing to the (static) libfl.a, which won't link with a
 # shared library.  The sources define all the relevant symbols (yywrap), so
 # libfl.a isn't needed.
-#
 MAKE_FLAGS+=		LEXLIB=""
 MAKE_ENV+=		AM_MAKEFLAGS=${MAKE_FLAGS:Q}
 
 UNIXODBC_DRIVERS_DIR=	lib/unixodbc
 
-post-patch: fix-ltdl-and-lexlib
-
-fix-driver-installation:
-	cd ${WRKSRC};						\
-	files=`${FIND} DRVConfig Drivers -name Makefile.in -print`;\
-	for file in $${files}; do				\
-		sed -e "s|^\(libdir =\).*|\1 ${PREFIX}/${UNIXODBC_DRIVERS_DIR}|g" \
-			$${file} >> $${file}.fixed;		\
-		mv -f $${file}.fixed $${file};			\
-	done
-
-fix-ltdl-and-lexlib:
-	cd ${WRKSRC};						\
-	files=`${FIND} . -name Makefile.in -print`;		\
-	for file in $${files}; do				\
-		sed	-e "/DEPENDENCIES/s|\$$(LIBLTDL)||g"	\
-			-e "/LIBADD/s|@LEXLIB@|\$$(LEXLIB)|g"	\
-			$${file} >> $${file}.fixed;		\
-		mv -f $${file}.fixed $${file};			\
-	done
-
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
-CONFIGURE_ARGS+=	--enable-gnuthreads
-CONFIGURE_ARGS+=	--with-pth=${PTHREADBASE:Q}
-.endif
-USE_TOOLS+=		flex yacc # to get libodbctxt.la
-CONFIGURE_ARGS+=	--disable-gui
-
 PLIST_SUBST+=		UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR}
 FILES_SUBST+=		UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR}
 
@@ -72,18 +49,39 @@ CONF_FILES=		${EGDIR}/odbc.ini ${PKG_SYSCONFDIR}/odbc.ini
 OWN_DIRS=		${PKG_SYSCONFDIR}/ODBCDataSources
 
 SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	${WRKDIR}/odbc.ini
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@UNIXODBC_DRIVERS_DIR@,${UNIXODBC_DRIVERS_DIR},g'
-SUBST_STAGE.paths=	post-patch
+
+SUBST_CLASSES+=		mutex
+SUBST_STAGE.mutex=	pre-configure
+SUBST_FILES.mutex=	DriverManager/__handles.c odbcinst/_logging.c
+SUBST_FILES.mutex+=	odbcinst/SQLGetPrivateProfileString.c
+SUBST_SED.mutex=	-e 's,mutex_exit,odbc_mutex_exit,g'
 
 INSTALLATION_DIRS=	${EGDIR}
 
-post-patch: fix-driver-installation
-
 post-extract:
 	${CP} ${FILESDIR}/odbcinst.ini.in ${WRKDIR}/odbc.ini
 
+post-patch:
+	set -e; cd ${WRKSRC};					\
+	files=`${FIND} DRVConfig Drivers -name Makefile.in -print`;\
+	for file in $${files}; do				\
+		sed -e "s|^\(libdir =\).*|\1 ${PREFIX}/${UNIXODBC_DRIVERS_DIR}|g" \
+			$${file} >> $${file}.fixed;		\
+		mv -f $${file}.fixed $${file};			\
+	done
+	set -e; cd ${WRKSRC};					\
+	files=`${FIND} . -name Makefile.in -print`;		\
+	for file in $${files}; do				\
+		sed	-e "/DEPENDENCIES/s|\$$(LIBLTDL)||g"	\
+			-e "/LIBADD/s|@LEXLIB@|\$$(LEXLIB)|g"	\
+			$${file} >> $${file}.fixed;		\
+		mv -f $${file}.fixed $${file};			\
+	done
+
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/odbc.ini ${DESTDIR}${EGDIR}/odbc.ini
 

databases/unixodbc/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2015/04/26 11:37:07 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/10/25 08:18:00 adam Exp $
 bin/dltest
 bin/isql
 bin/iusql
@@ -10,6 +10,7 @@ include/odbcinst.h
 include/odbcinstext.h
 include/sql.h
 include/sqlext.h
+include/sqlspi.h
 include/sqltypes.h
 include/sqlucode.h
 include/unixodbc_conf.h
@@ -34,8 +35,12 @@ ${UNIXODBC_DRIVERS_DIR}/liboraodbcS.la
 ${UNIXODBC_DRIVERS_DIR}/libsapdbS.la
 ${UNIXODBC_DRIVERS_DIR}/libtdsS.la
 ${UNIXODBC_DRIVERS_DIR}/libtemplate.la
+man/man1/dltest.1
 man/man1/isql.1
+man/man1/iusql.1
+man/man1/odbc_config.1
 man/man1/odbcinst.1
 man/man5/odbc.ini.5
 man/man5/odbcinst.ini.5
+man/man7/unixODBC.7
 share/examples/unixodbc/odbc.ini

databases/unixodbc/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2015/04/26 11:37:07 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2015/11/04 17:41:16 agc Exp $
 
-SHA1 (unixODBC-2.3.2.tar.gz) = f84520fd58143625b614fde551435178a558ee2e
-RMD160 (unixODBC-2.3.2.tar.gz) = 023122427bd8bdabdbfddf727d16210bb32c60f3
-Size (unixODBC-2.3.2.tar.gz) = 1849173 bytes
+SHA1 (unixODBC-2.3.4.tar.gz) = df3578b080fb67da544d4c83424a770729ef25fb
+RMD160 (unixODBC-2.3.4.tar.gz) = 4188d9ccfa849c569626af0e2686289ad830fd73
+SHA512 (unixODBC-2.3.4.tar.gz) = 34799777c95539905d4bbe60ad2b83631a31a68483b6be96dba25f80fa2fff4624ba170078097c942f2206873776d179d7d02a340598c4627f8723eb6f083a26
+Size (unixODBC-2.3.4.tar.gz) = 1830660 bytes
 SHA1 (patch-aa) = b0c9295a16207176eb01fa7fbbed8790d9f9dbb8
 SHA1 (patch-ac) = 8925e66b81fa8896badcafda6af5dae9edbda753
 SHA1 (patch-ad) = b2e695d8c8c682c99af80e362369b0295070c1ab