Sun Feb 14 10:19:22 2016 UTC ()
Don't redefine mutex_exit().  Switch subst stage to pre-configure.


(jperkin)
diff -r1.36 -r1.37 pkgsrc/databases/unixodbc/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/databases/unixodbc/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/unixodbc/Makefile 2015/10/25 08:18:00 1.36
+++ pkgsrc/databases/unixodbc/Makefile 2016/02/14 10:19:22 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2015/10/25 08:18:00 adam Exp $ 1# $NetBSD: Makefile,v 1.37 2016/02/14 10:19:22 jperkin Exp $
2 2
3DISTNAME= unixODBC-2.3.4 3DISTNAME= unixODBC-2.3.4
4PKGNAME= ${DISTNAME:S/ODBC/odbc/} 4PKGNAME= ${DISTNAME:S/ODBC/odbc/}
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= ftp://ftp.unixodbc.org/pub/unixODBC/ 6MASTER_SITES= ftp://ftp.unixodbc.org/pub/unixODBC/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.unixodbc.org/ 9HOMEPAGE= http://www.unixodbc.org/
10COMMENT= ODBC 2.x/3.x driver manager 10COMMENT= ODBC 2.x/3.x driver manager
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13CONFLICTS+= iodbc<3.52.7nb2 13CONFLICTS+= iodbc<3.52.7nb2
14 14
@@ -39,30 +39,36 @@ MAKE_FLAGS+= LEXLIB="" @@ -39,30 +39,36 @@ MAKE_FLAGS+= LEXLIB=""
39MAKE_ENV+= AM_MAKEFLAGS=${MAKE_FLAGS:Q} 39MAKE_ENV+= AM_MAKEFLAGS=${MAKE_FLAGS:Q}
40 40
41UNIXODBC_DRIVERS_DIR= lib/unixodbc 41UNIXODBC_DRIVERS_DIR= lib/unixodbc
42 42
43PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR} 43PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR}
44FILES_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR} 44FILES_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR}
45 45
46EGDIR= ${PREFIX}/share/examples/${PKGBASE} 46EGDIR= ${PREFIX}/share/examples/${PKGBASE}
47 47
48CONF_FILES= ${EGDIR}/odbc.ini ${PKG_SYSCONFDIR}/odbc.ini 48CONF_FILES= ${EGDIR}/odbc.ini ${PKG_SYSCONFDIR}/odbc.ini
49OWN_DIRS= ${PKG_SYSCONFDIR}/ODBCDataSources 49OWN_DIRS= ${PKG_SYSCONFDIR}/ODBCDataSources
50 50
51SUBST_CLASSES+= paths 51SUBST_CLASSES+= paths
 52SUBST_STAGE.paths= pre-configure
52SUBST_FILES.paths= ${WRKDIR}/odbc.ini 53SUBST_FILES.paths= ${WRKDIR}/odbc.ini
53SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 54SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
54SUBST_SED.paths+= -e 's,@UNIXODBC_DRIVERS_DIR@,${UNIXODBC_DRIVERS_DIR},g' 55SUBST_SED.paths+= -e 's,@UNIXODBC_DRIVERS_DIR@,${UNIXODBC_DRIVERS_DIR},g'
55SUBST_STAGE.paths= post-patch 56
 57SUBST_CLASSES+= mutex
 58SUBST_STAGE.mutex= pre-configure
 59SUBST_FILES.mutex= DriverManager/__handles.c odbcinst/_logging.c
 60SUBST_FILES.mutex+= odbcinst/SQLGetPrivateProfileString.c
 61SUBST_SED.mutex= -e 's,mutex_exit,odbc_mutex_exit,g'
56 62
57INSTALLATION_DIRS= ${EGDIR} 63INSTALLATION_DIRS= ${EGDIR}
58 64
59post-extract: 65post-extract:
60 ${CP} ${FILESDIR}/odbcinst.ini.in ${WRKDIR}/odbc.ini 66 ${CP} ${FILESDIR}/odbcinst.ini.in ${WRKDIR}/odbc.ini
61 67
62post-patch: 68post-patch:
63 set -e; cd ${WRKSRC}; \ 69 set -e; cd ${WRKSRC}; \
64 files=`${FIND} DRVConfig Drivers -name Makefile.in -print`;\ 70 files=`${FIND} DRVConfig Drivers -name Makefile.in -print`;\
65 for file in $${files}; do \ 71 for file in $${files}; do \
66 sed -e "s|^\(libdir =\).*|\1 ${PREFIX}/${UNIXODBC_DRIVERS_DIR}|g" \ 72 sed -e "s|^\(libdir =\).*|\1 ${PREFIX}/${UNIXODBC_DRIVERS_DIR}|g" \
67 $${file} >> $${file}.fixed; \ 73 $${file} >> $${file}.fixed; \
68 mv -f $${file}.fixed $${file}; \ 74 mv -f $${file}.fixed $${file}; \