diff options
author | wiz <wiz@pkgsrc.org> | 2008-09-19 09:39:23 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2008-09-19 09:39:23 +0000 |
commit | 2372c76c334afd70a9185f79e6488311c7340221 (patch) | |
tree | 98f0485b0bfe56c69be66fecd3947300427e1771 /databases/unixodbc | |
parent | e2f175c4e150a4f326863abf183986b9a1ecab59 (diff) | |
download | pkgsrc-2372c76c334afd70a9185f79e6488311c7340221.tar.gz |
Integrate non-shared Makefile.common into Makefile.
Some pkglint cleanup.
Diffstat (limited to 'databases/unixodbc')
-rw-r--r-- | databases/unixodbc/Makefile | 61 | ||||
-rw-r--r-- | databases/unixodbc/Makefile.common | 62 | ||||
-rw-r--r-- | databases/unixodbc/PLIST | 4 |
3 files changed, 56 insertions, 71 deletions
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index bc58fc0505f..56b26f1cdb1 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,12 +1,60 @@ -# $NetBSD: Makefile,v 1.20 2008/02/09 07:06:33 adam Exp $ +# $NetBSD: Makefile,v 1.21 2008/09/19 09:39:23 wiz Exp $ -PKGNAME= unixodbc-${ODBC_BASE_VERS} -COMMENT= ODBC 2.x/3.x driver manager +DISTNAME= unixODBC-2.2.12 +PKGNAME= ${DISTNAME:S/ODBC/odbc/} +CATEGORIES= databases +MASTER_SITES= http://www.unixodbc.org/ + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.unixodbc.org/ +COMMENT= ODBC 2.x/3.x driver manager CONFLICTS+= iodbc-[0-9]* -.include "../../databases/unixodbc/Makefile.common" +USE_LIBTOOL= YES +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --enable-threads +PTHREAD_OPTS+= require + +# Override the local definitions that point to the self-contained libtool +# convenience library. We want the one installed by pkgsrc. Also override +# 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} 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}; \ + 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 @@ -18,14 +66,14 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/odbc.ini ${PKG_SYSCONFDIR}/odbc.ini OWN_DIRS= ${PKG_SYSCONFDIR}/ODBCDataSources -post-patch: fix-driver-installation - SUBST_CLASSES+= paths 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 +post-patch: fix-driver-installation + post-extract: ${CP} ${FILESDIR}/odbcinst.ini.in ${WRKDIR}/odbc.ini @@ -33,5 +81,6 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKDIR}/odbc.ini ${EGDIR}/odbc.ini +.include "../../devel/libltdl/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common deleted file mode 100644 index ec1590b0857..00000000000 --- a/databases/unixodbc/Makefile.common +++ /dev/null @@ -1,62 +0,0 @@ -# $NetBSD: Makefile.common,v 1.22 2008/02/09 07:06:33 adam Exp $ - -DISTNAME= unixODBC-${ODBC_DIST_VERS} -CATEGORIES= databases -MASTER_SITES= http://www.unixodbc.org/ - -MAINTAINER?= pkgsrc-users@NetBSD.org -HOMEPAGE?= http://www.unixodbc.org/ - -# Version numbering scheme: -# -# ODBC_DIST_VERS version number on the php distfile -# ODBC_BASE_VERS pkgsrc-mangled version number (convert pl -> .) -# -ODBC_DIST_VERS= 2.2.12 -ODBC_BASE_VERS= ${ODBC_DIST_VERS} - -USE_LIBTOOL= YES -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --enable-threads -PTHREAD_OPTS+= require - -# Override the local definitions that point to the self-contained libtool -# convenience library. We want the one installed by pkgsrc. Also override -# 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} 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}; \ - 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 "../../devel/libltdl/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") -CONFIGURE_ARGS+= --enable-gnuthreads -CONFIGURE_ARGS+= --with-pth=${PTHREADBASE:Q} -.endif diff --git a/databases/unixodbc/PLIST b/databases/unixodbc/PLIST index a52efdd4d9e..f56d6dbbbe2 100644 --- a/databases/unixodbc/PLIST +++ b/databases/unixodbc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2008/03/01 22:50:18 tnn Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/09/19 09:39:23 wiz Exp $ bin/dltest bin/isql bin/iusql @@ -27,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 |