diff options
| -rw-r--r-- | databases/unixodbc/Makefile | 6 | ||||
| -rw-r--r-- | databases/unixodbc/Makefile.common | 31 | ||||
| -rw-r--r-- | databases/unixodbc/PLIST | 5 | ||||
| -rw-r--r-- | databases/unixodbc/distinfo | 10 | ||||
| -rw-r--r-- | databases/unixodbc/patches/patch-aa | 8 |
5 files changed, 29 insertions, 31 deletions
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index 481d74ed6fe..bc58fc0505f 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/11/17 12:04:11 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2008/02/09 07:06:33 adam Exp $ PKGNAME= unixodbc-${ODBC_BASE_VERS} COMMENT= ODBC 2.x/3.x driver manager @@ -10,8 +10,8 @@ CONFLICTS+= iodbc-[0-9]* USE_TOOLS+= flex yacc # to get libodbctxt.la CONFIGURE_ARGS+= --disable-gui -PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR:Q} -FILES_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR:Q} +PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR} +FILES_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR} EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common index 4119af45e9e..ec1590b0857 100644 --- a/databases/unixodbc/Makefile.common +++ b/databases/unixodbc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2006/03/04 21:29:11 jlam Exp $ +# $NetBSD: Makefile.common,v 1.22 2008/02/09 07:06:33 adam Exp $ DISTNAME= unixODBC-${ODBC_DIST_VERS} CATEGORIES= databases @@ -12,13 +12,12 @@ HOMEPAGE?= http://www.unixodbc.org/ # ODBC_DIST_VERS version number on the php distfile # ODBC_BASE_VERS pkgsrc-mangled version number (convert pl -> .) # -ODBC_DIST_VERS= 2.2.11 +ODBC_DIST_VERS= 2.2.12 ODBC_BASE_VERS= ${ODBC_DIST_VERS} USE_LIBTOOL= YES - GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --enable-threads PTHREAD_OPTS+= require @@ -36,22 +35,22 @@ UNIXODBC_DRIVERS_DIR= lib/unixodbc post-patch: fix-ltdl-and-lexlib fix-driver-installation: - cd ${WRKSRC}; \ + cd ${WRKSRC}; \ files=`${FIND} ODBCConfig 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}; \ + 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}; \ + 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 "../../devel/libltdl/buildlink3.mk" diff --git a/databases/unixodbc/PLIST b/databases/unixodbc/PLIST index 614742f889d..35ef153eb05 100644 --- a/databases/unixodbc/PLIST +++ b/databases/unixodbc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/01/23 20:50:47 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/02/09 07:06:33 adam Exp $ bin/dltest bin/isql bin/iusql @@ -11,6 +11,7 @@ include/sql.h include/sqlext.h include/sqltypes.h include/sqlucode.h +include/uodbc_extras.h include/uodbc_stats.h lib/libboundparam.la lib/libgtrtst.la @@ -26,8 +27,6 @@ ${UNIXODBC_DRIVERS_DIR}/libodbcminiS.la ${UNIXODBC_DRIVERS_DIR}/libodbcmyS.la ${UNIXODBC_DRIVERS_DIR}/libodbcnnS.la ${UNIXODBC_DRIVERS_DIR}/libodbcpsql.la -${UNIXODBC_DRIVERS_DIR}/libodbcpsql.so.1 -${UNIXODBC_DRIVERS_DIR}/libodbcpsql.so.1.0.0 ${UNIXODBC_DRIVERS_DIR}/libodbcpsqlS.la ${UNIXODBC_DRIVERS_DIR}/libodbctxt.la ${UNIXODBC_DRIVERS_DIR}/libodbctxtS.la diff --git a/databases/unixodbc/distinfo b/databases/unixodbc/distinfo index 07f1c44e9d3..2e06ce097ae 100644 --- a/databases/unixodbc/distinfo +++ b/databases/unixodbc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2006/01/23 20:50:47 xtraeme Exp $ +$NetBSD: distinfo,v 1.4 2008/02/09 07:06:33 adam Exp $ -SHA1 (unixODBC-2.2.11.tar.gz) = a8869c38d0f1bb18b33e5165a2a79dd8770f98b3 -RMD160 (unixODBC-2.2.11.tar.gz) = 533a2733aa9f49bf9e3fd062b6d0ebfdff4dfcf1 -Size (unixODBC-2.2.11.tar.gz) = 2406740 bytes -SHA1 (patch-aa) = 828007b7aaa2034cf00831d17f601225d4fff05c +SHA1 (unixODBC-2.2.12.tar.gz) = d1cb286fb538c664549153165e2b9183b58a627b +RMD160 (unixODBC-2.2.12.tar.gz) = 13c9ec87c3fff4a1fceb45ff7a552a0fa8666b16 +Size (unixODBC-2.2.12.tar.gz) = 2798077 bytes +SHA1 (patch-aa) = c83d0febf01dc079b9bfcdffb7ec5b022cbb9d90 diff --git a/databases/unixodbc/patches/patch-aa b/databases/unixodbc/patches/patch-aa index 0ebf0030f55..d8595250511 100644 --- a/databases/unixodbc/patches/patch-aa +++ b/databases/unixodbc/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2006/01/23 20:52:26 xtraeme Exp $ +$NetBSD: patch-aa,v 1.3 2008/02/09 07:06:33 adam Exp $ ---- Makefile.in.orig 2006-01-23 20:43:31.000000000 +0100 -+++ Makefile.in 2006-01-23 20:43:39.000000000 +0100 -@@ -657,7 +657,7 @@ +--- Makefile.in.orig 2006-08-31 14:24:44.000000000 +0200 ++++ Makefile.in +@@ -791,7 +791,7 @@ install-data: install-data-recursive uninstall: uninstall-recursive install-am: all-am |