diff options
author | adam <adam> | 2015-10-25 08:18:00 +0000 |
---|---|---|
committer | adam <adam> | 2015-10-25 08:18:00 +0000 |
commit | 53fe9a52a860a9296e190405715d5b43fe38a9e7 (patch) | |
tree | 5a452743e0e2cedc832e0fe72d521f66960fccab /databases/unixodbc/Makefile | |
parent | 1c7a2d3e395a28ddca7e2024cf2548f1a0d60022 (diff) | |
download | pkgsrc-53fe9a52a860a9296e190405715d5b43fe38a9e7.tar.gz |
Changes 2.3.4:
Single bug fix. There was a typo in 2.3.3 that caused a problem loading the cursor lib, so I have pushed a new build out.
Diffstat (limited to 'databases/unixodbc/Makefile')
-rw-r--r-- | databases/unixodbc/Makefile | 68 |
1 files changed, 30 insertions, 38 deletions
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index c5f4e38381a..a813e1ce6f3 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.35 2015/04/26 11:37:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.36 2015/10/25 08:18:00 adam 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} @@ -79,11 +56,26 @@ SUBST_STAGE.paths= post-patch 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 |