diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-05-05 16:24:00 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-05-05 16:24:00 +0000 |
| commit | f4f46a920e21b409b3f3b16873c6cef1eb4af378 (patch) | |
| tree | 111c3e996440f35b3a05e66700954340c9919761 | |
| parent | 4007e179a6cb2c28428cd709099b5c1ff6b65402 (diff) | |
| download | ports-f4f46a920e21b409b3f3b16873c6cef1eb4af378.tar.gz ports-f4f46a920e21b409b3f3b16873c6cef1eb4af378.zip | |
Fix unixODBC vs libiodbc conflicts
Always rely on unixODBC each time a port is looking for libodbc.so
Remove odbc compat from libiodbc
This allows to install both kde and gnome at the same time
While here:
- Convert libiodbc to USES=libtool
- Convert a bunch of libiodbc dependencies to USES=libtool
- Chase libiodbc.so shlib change
- Stagify some ports
- Convert some ports to USES=pgsql
Discussed with: rakuco (kde)
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=353029
45 files changed, 184 insertions, 487 deletions
@@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140505: + AFFECTS: users of databases/libiodbc + AUTHOR: bapt@FreeBSD.org + + libiodbc no longer provide the odbc compatibility + + Rebuild all ports that are linked to libiodbc + # portmaster -r libiodbc + or + # portupgrade -r databases/libiodbc + 20140503: AFFECTS: users of science/hdf5* and science/netcdf* AUTHOR: sunpoet@FreeBSD.org diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index 6ea1733561c7..99b4f6458ae3 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= freetds PORTVERSION= 0.92.79 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/ @@ -15,32 +16,32 @@ LICENSE= LGPL20 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} TDS_VER?= 5.0 -USES= gmake iconv pkgconfig +USES= gmake iconv libtool:keepla pkgconfig GNU_GONFIGURE= yes -USE_AUTOTOOLS= autoconf:env libtool +USE_AUTOTOOLS= autoconf:env CPPFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tdsver=${TDS_VER} USE_LDCONFIG= yes SUB_FILES= pkg-message +INSTALL_TARGET= install-strip PORTDOCS= * # OPTIONS_DEFINE= OPENSSL GNUTLS IODBC UNIXODBC MSDBLIB -OPTIONS_DEFINE= MSDBLIB ODBCWIDE +OPTIONS_DEFINE= MSDBLIB ODBCWIDE ODBC -OPTIONS_SINGLE= ODBC SSL -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC +OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS -OPTIONS_DEFAULT= OPENSSL IODBC +OPTIONS_DEFAULT= OPENSSL OPENSSL_DESC= Use OpenSSL GNUTLS_DESC= Use GnuTLS -IODBC_DESC= Depend on iodbc -UNIXODBC_DESC= Depend on unixodbc MSDBLIB_DESC= MS SQL Server compatibility (breaks databases/sybtcl) ODBCWIDE_DESC= Enable Wide ODBC Support +ODBC_DESC= ODBC driver CONFLICTS= freetds-0.64.[0-9] @@ -60,21 +61,8 @@ LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --with-gnutls .endif -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-unixodbc=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC} -PLIST_SUB+= ODBC="" -.else -PLIST_SUB+= ODBC="@comment " -.endif # We cannot use msdblib-style by default, because port databases/sybtcl # relies on sybase-style dblib diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist index 08004773a1e1..79df01c14cac 100644 --- a/databases/freetds-devel/pkg-plist +++ b/databases/freetds-devel/pkg-plist @@ -34,10 +34,13 @@ lib/libct.a lib/libct.la lib/libct.so lib/libct.so.4 +lib/libct.so.4.0.0 lib/libsybdb.a lib/libsybdb.la lib/libsybdb.so lib/libsybdb.so.5 +lib/libsybdb.so.5.0.0 +%%ODBC%%lib/libtdsodbc.so.0.0.0 %%ODBC%%lib/libtdsodbc.so.0 %%ODBC%%lib/libtdsodbc.so %%ODBC%%lib/libtdsodbc.la diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile index d5b38b870965..c7de434d5b94 100644 --- a/databases/libiodbc/Makefile +++ b/databases/libiodbc/Makefile @@ -3,7 +3,7 @@ PORTNAME= libiodbc PORTVERSION= 3.52.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= SF/iodbc/iodbc/${PORTVERSION} @@ -15,11 +15,12 @@ LICENSE_COMB= dual LICENSE_FILE_BSD= ${WRKSRC}/LICENSE.BSD LICENSE_FILE_LGPL20= ${WRKSRC}/LICENSE.LGPL -CONFLICTS= unixODBC-[0-9]* - -USES= libtool:oldver pathfix pkgconfig +USES= libtool pathfix pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-iodbc-inidir=${ETCDIR} +CONFIGURE_ARGS= --with-iodbc-inidir=${ETCDIR} \ + --includedir=${LOCALBASE}/include/libiodbc \ + --disable-libodbc +INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= GTK2 DOCS EXAMPLES diff --git a/databases/libiodbc/pkg-plist b/databases/libiodbc/pkg-plist index f42a202364dc..9701e7bfdf1a 100644 --- a/databases/libiodbc/pkg-plist +++ b/databases/libiodbc/pkg-plist @@ -2,35 +2,33 @@ bin/iodbc-config %%GTK2%%bin/iodbcadm-gtk %%ETCDIR%%/odbc.ini.sample %%ETCDIR%%/odbcinst.ini.sample -include/iodbcext.h -include/iodbcinst.h -include/iodbcunix.h -include/isql.h -include/isqlext.h -include/isqltypes.h -include/odbcinst.h -include/sql.h -include/sqlext.h -include/sqltypes.h -include/sqlucode.h +include/libiodbc/iodbcext.h +include/libiodbc/iodbcinst.h +include/libiodbc/iodbcunix.h +include/libiodbc/isql.h +include/libiodbc/isqlext.h +include/libiodbc/isqltypes.h +include/libiodbc/odbcinst.h +include/libiodbc/sql.h +include/libiodbc/sqlext.h +include/libiodbc/sqltypes.h +include/libiodbc/sqlucode.h %%GTK2%%lib/libdrvproxy.a -%%GTK2%%lib/libdrvproxy.la %%GTK2%%lib/libdrvproxy.so -%%GTK2%%lib/libdrvproxy.so.3 +%%GTK2%%lib/libdrvproxy.so.2 +%%GTK2%%lib/libdrvproxy.so.2.1.20 lib/libiodbc.a -lib/libiodbc.la lib/libiodbc.so -lib/libiodbc.so.3 +lib/libiodbc.so.2 +lib/libiodbc.so.2.1.20 %%GTK2%%lib/libiodbcadm.a -%%GTK2%%lib/libiodbcadm.la %%GTK2%%lib/libiodbcadm.so -%%GTK2%%lib/libiodbcadm.so.3 +%%GTK2%%lib/libiodbcadm.so.2 +%%GTK2%%lib/libiodbcadm.so.2.1.20 lib/libiodbcinst.a -lib/libiodbcinst.la lib/libiodbcinst.so -lib/libiodbcinst.so.3 -lib/libodbc.a -lib/libodbc.so +lib/libiodbcinst.so.2 +lib/libiodbcinst.so.2.1.20 libdata/pkgconfig/libiodbc.pc man/man1/iodbc-config.1.gz %%GTK2%%man/man1/iodbcadm-gtk.1.gz @@ -44,4 +42,5 @@ man/man1/iodbctestw.1.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iodbctest.c %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +@dirrm include/libiodbc @dirrmtry %%ETCDIR%% diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile index b52b25bfb130..3b1c04912ee7 100644 --- a/databases/libodbc++/Makefile +++ b/databases/libodbc++/Makefile @@ -2,7 +2,7 @@ PORTNAME= libodbc++ PORTVERSION= 0.2.5 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases devel MASTER_SITES= SF/libodbcxx/libodbc%2B%2B/${PORTVERSION} @@ -13,41 +13,24 @@ LICENSE= GPLv2 BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen -USE_BZIP2= yes -USES= gmake pkgconfig -USE_AUTOTOOLS= libtool +OPTIONS_DEFINE= DOCS + +USES= gmake libtool pkgconfig tar:bzip2 USE_LDCONFIG= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-isqlxx CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" CXXFLAGS+= ${PTHREAD_CFLAGS} CPPFLAGS+= -I${LOCALBASE}/include +INSTALL_TARGET= install-strip -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_DEFAULT= ODBC IODBC - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-odbc=${LOCALBASE} -.endif DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PORTDOCS= progref -.if defined(NOPORTDOCS) -post-patch: - ${REINPLACE_CMD} '/^SUBDIRS/s/=.*/=/' ${WRKSRC}/doc/Makefile.in -.else post-extract: ${RM} -f ${WRKSRC}/doc/progref/progref-stamp -.endif .include <bsd.port.mk> diff --git a/databases/libodbc++/pkg-plist b/databases/libodbc++/pkg-plist index 007f29227228..2b992538fad8 100644 --- a/databases/libodbc++/pkg-plist +++ b/databases/libodbc++/pkg-plist @@ -12,9 +12,8 @@ include/odbc++/setup.h include/odbc++/statement.h include/odbc++/threads.h include/odbc++/types.h -lib/libodbc++.a -lib/libodbc++.la lib/libodbc++.so lib/libodbc++.so.4 +lib/libodbc++.so.4.0.0 libdata/pkgconfig/libodbc++.pc @dirrm include/odbc++ diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile index d10a388b07b0..ec45ee54becd 100644 --- a/databases/mdbtools/Makefile +++ b/databases/mdbtools/Makefile @@ -3,6 +3,7 @@ PORTNAME= mdbtools PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= https://github.com/brianb/mdbtools/archive/ DISTNAME= ${PORTVERSION} diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile index a376913f8e6c..7b67490dfaae 100644 --- a/databases/mysql-connector-odbc/Makefile +++ b/databases/mysql-connector-odbc/Makefile @@ -21,26 +21,9 @@ PLIST_SUB= VER=${PORTVERSION} PORTDOCS= ChangeLog INSTALL \ README README.debug COPYING Licenses_for_Third-Party_Components.txt -# MyODBC needs an ODBC driver manager to be installed, and it supports both -# iODBC and unixODBC. - -.if defined(WITH_IODBC) && defined(WITH_UNIXODBC) -IGNORE= selected mutually exclusive options: WITH_IODBC and WITH_UNIXODBC -.endif - -.if !defined(WITH_IODBC) && !defined(WITH_UNIXODBC) -WITH_UNIXODBC?= yes -.endif - -.if defined(WITH_UNIXODBC) LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC BUILD_DEPENDS= unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC CMAKE_ARGS += -DWITH_UNIXODBC=1 DRIVER_MANAGER= unixodbc -.elif defined(WITH_IODBC) -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -DRIVER_MANAGER= iodbc -CFLAGS+= -I${LOCALBASE}/include -.endif .include <bsd.port.mk> diff --git a/databases/mysql-workbench52/Makefile b/databases/mysql-workbench52/Makefile index 5997903fa998..83ae4b415748 100644 --- a/databases/mysql-workbench52/Makefile +++ b/databases/mysql-workbench52/Makefile @@ -3,7 +3,7 @@ PORTNAME= mysql-workbench-gpl PORTVERSION= 5.2.47 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONSUFFIX= -src CATEGORIES= databases MASTER_SITES= MYSQL/MySQLGUITools @@ -82,12 +82,8 @@ PLIST_SUB+= PYTHON_UTILS="" PLIST_SUB+= PYTHON_UTILS="@comment " .endif -.if ${PORT_OPTIONS:MUNIXODBC} -LIB_DEPENDS+= libodbccr.so:${PORTSDIR}/databases/unixODBC +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+=--with-unixodbc -.else -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -.endif post-patch: @${REINPLACE_CMD} -e \ diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile index 83df38582099..3ca7ede3a789 100644 --- a/databases/mysql2odbc/Makefile +++ b/databases/mysql2odbc/Makefile @@ -3,34 +3,23 @@ PORTNAME= mysql2odbc PORTVERSION= 0.99.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases MASTER_SITES= http://www.iodbc.org/downloads/mysql2odbc/ MAINTAINER= fjoe@FreeBSD.org COMMENT= Openlink MySQL-ODBC Gateway -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= UNIXODBC IODBC -OPTIONS_DEFAULT= UNIXODBC - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS= --with-unixodbc=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS= --with-iodbc -.endif +USES= libtool +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} +INSTALL_TARGET= install-strip -USE_AUTOTOOLS= libtool USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/databases/mysql2odbc/pkg-plist b/databases/mysql2odbc/pkg-plist index 26f890559ffa..61930e7cbad1 100644 --- a/databases/mysql2odbc/pkg-plist +++ b/databases/mysql2odbc/pkg-plist @@ -1,5 +1,5 @@ mysql2odbc/libmysqlclient.a -mysql2odbc/libmysqlclient.la mysql2odbc/libmysqlclient.so mysql2odbc/libmysqlclient.so.10 +mysql2odbc/libmysqlclient.so.10.0.0 @dirrm mysql2odbc diff --git a/databases/p5-DBD-ODBC/Makefile b/databases/p5-DBD-ODBC/Makefile index 4ce61b4a8253..6270a9eb7944 100644 --- a/databases/p5-DBD-ODBC/Makefile +++ b/databases/p5-DBD-ODBC/Makefile @@ -3,6 +3,7 @@ PORTNAME= DBD-ODBC PORTVERSION= 1.45 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MJEVANS @@ -18,9 +19,6 @@ BUILD_DEPENDS= p5-DBI>=1.609:${PORTSDIR}/databases/p5-DBI RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= DOCS -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_DEFAULT= ODBC IODBC USES= perl5 USE_PERL5= configure @@ -28,38 +26,18 @@ CONFIGURE_ARGS= -o ${LOCALBASE} PORTDOCS= Changes README README.adabas README.informix -IODBC_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc -UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC - -.include <bsd.port.options.mk> - -.if !${PORT_OPTIONS:MODBC} -IGNORE= an ODBC driver (iODBC or unixODBC) is required -.endif - -.if ${PORT_OPTIONS:MIODBC} -MYODBC= iodbc -.endif - -.if ${PORT_OPTIONS:MUNIXODBC} MYODBC= unixodbc -.endif post-patch: @${REINPLACE_CMD} -e '/my $$myodbc/ s|q{}|"${MYODBC}"|' ${WRKSRC}/Makefile.PL -.if ${PORT_OPTIONS:MUNIXODBC} post-configure: @${PERL} -pi -e 's/-lodbc/-lodbc ${PTHREAD_LIBS}/g;' \ -e 's/$$/ ${PTHREAD_CFLAGS}/ if (/^CCFLAGS/);' \ ${WRKSRC}/Makefile -.endif -.if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif .include <bsd.port.mk> diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile index 16976f513ac3..2b3c16fdf4c9 100644 --- a/databases/postgresql-odbc/Makefile +++ b/databases/postgresql-odbc/Makefile @@ -2,6 +2,7 @@ PORTNAME= postgresql PORTVERSION= 09.01.0200 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= odbc/versions/src @@ -14,44 +15,28 @@ COMMENT= PostgreSQL ODBC driver LICENSE= LGPL20 +USES= libtool pgsql USE_OPENSSL= yes -USE_PGSQL= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes PORTDOCS= odbc/ -PLIST_FILES= lib/psqlodbcw.la lib/psqlodbcw.so +PORTEXAMPELS= odbc/ +PLIST_FILES= lib/psqlodbcw.so -.if !defined(WITH_IODBC) || defined(WITH_UNIXODBC) -# I.e. even if WITH_IODBC is defined LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC BUILD_DEPENDS+= unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-unixodbc=${LOCALBASE} -.else -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE} -# Modify a suffix in this case -PKGNAMESUFFIX= -iodbc -.endif +OPTIONS_DEFINE= DOCS EXAMPLES -NO_STAGE= yes - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> - -DATADIR_1= ${DATADIR}/odbc +DATADIR_1= ${EXAMPLESDIR}/odbc DOCSDIR_1= ${DOCSDIR}/odbc post-install: -.if ${PORT_OPTIONS:MDATA} - @${MKDIR} ${DATADIR_1} - ${INSTALL_DATA} ${WRKSRC}/*.sql ${DATADIR_1} -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR_1} - ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR_1} -.endif + @${MKDIR} ${STAGEDIR}${DATADIR_1} + ${INSTALL_DATA} ${WRKSRC}/*.sql ${STAGEDIR}${DATADIR_1} + @${MKDIR} ${STAGEDIR}${DOCSDIR_1} + ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR_1} .include <bsd.port.mk> diff --git a/databases/proftpd-mod_sql_odbc/Makefile b/databases/proftpd-mod_sql_odbc/Makefile index b23c0f49970b..b1cc70fa743b 100644 --- a/databases/proftpd-mod_sql_odbc/Makefile +++ b/databases/proftpd-mod_sql_odbc/Makefile @@ -15,7 +15,7 @@ DESCR= ${.CURDIR}/pkg-descr LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd -LIB_DEPENDS= libiodbc.so.3:${PORTSDIR}/databases/libiodbc +LIB_DEPENDS= libiodbc.so.2:${PORTSDIR}/databases/libiodbc CONFIGURE_ARGS= LIBS=-liodbc \ LD_LIBRARY_PATH="${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile index eff4a239f2eb..5e165e5172b4 100644 --- a/databases/py-odbc/Makefile +++ b/databases/py-odbc/Makefile @@ -18,16 +18,7 @@ USE_PYDISTUTILS= easy_install PYDISTUTILS_AUTOPLIST= yes PYEASYINSTALL_ARCHDEP= yes -OPTIONS_DEFINE= UNIXODBC -OPTIONS_DEFAULT=UNIXODBC - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC BUILD_DEPENDS+= unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC -.else -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -.endif .include <bsd.port.mk> diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile index 7d2cfbbf4c41..d50582113484 100644 --- a/databases/qt4-odbc-plugin/Makefile +++ b/databases/qt4-odbc-plugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= qt4-${DB}-plugin DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= kde@FreeBSD.org diff --git a/databases/qt5-sqldrivers-odbc/Makefile b/databases/qt5-sqldrivers-odbc/Makefile index 45d0bef64b7c..98fc250576e4 100644 --- a/databases/qt5-sqldrivers-odbc/Makefile +++ b/databases/qt5-sqldrivers-odbc/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ COMMENT= Qt ${DB_DESC} plugin +PORTREVISION= 1 DB= ODBC DB_DESC= Open Database Connectivity diff --git a/databases/soci/Makefile b/databases/soci/Makefile index b1a66c94336b..e5949b3994e4 100644 --- a/databases/soci/Makefile +++ b/databases/soci/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= soci -PORTVERSION= 3.1.0 -PORTREVISION= 1 +PORTVERSION= 3.2.2 CATEGORIES= databases MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -21,70 +20,34 @@ USE_LDCONFIG= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS_DEFINE= MYSQL PGSQL SQLITE ODBC BOOST +OPTIONS_DEFINE= MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD BOOST_DESC= Enable support for additional types using Boost -OPTIONS_SINGLE= ODBCDRV -ODBCDRV_DESC= ODBC driver to use -OPTIONS_SINGLE_ODBCDRV= IODBC UODBC -IODBC_DESC= use iODBC driver -UODBC_DESC= use unixODBC driver -OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC IODBC BOOST +OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD +OPTIONS_SUB= yes -NO_STAGE= yes -.include <bsd.port.options.mk> +MYSQL_USE= MYSQL=yes +MYSQL_CMAKE_ON= -DWITH_MYSQL:BOOL=ON +MYSQL_CMAKE_OFF= -DWITH_MYSQL:BOOL=OFF -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -PLIST_SUB+= MYSQL="" -CMAKE_ARGS+= -DWITH_MYSQL:BOOL=ON -.else -PLIST_SUB+= MYSQL="@comment " -CMAKE_ARGS+= -DWITH_MYSQL:BOOL=OFF -.endif +PGSQL_USES= pgsql +PGSQL_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=ON +PGSQL_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=OFF -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -PLIST_SUB+= PGSQL="" -CMAKE_ARGS+= -DWITH_POSTGRESQL:BOOL=ON -.else -PLIST_SUB+= PGSQL="@comment " -CMAKE_ARGS+= -DWITH_POSTGRESQL:BOOL=OFF -.endif +SQLITE_USE= SQLITE=yes +SQLITE_CMAKE_ON= -DWITH_SQLITE3:BOOL=ON +SQLITE_CMAKE_OFF= -DWITH_SQLITE3:BOOL=OFF -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes -PLIST_SUB+= SQLITE="" -CMAKE_ARGS+= -DWITH_SQLITE3:BOOL=ON -.else -PLIST_SUB+= SQLITE="@comment " -CMAKE_ARGS+= -DWITH_SQLITE3:BOOL=OFF -.endif +ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC +ODBC_CMAKE_ON= -DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so \ + -DWITH_ODBC:BOOL=ON +ODBC_CMAKE_OFF= -DWITH_ODBC:BOOL=OFF -.if ${PORT_OPTIONS:MODBC} -PLIST_SUB+= ODBC="" -CMAKE_ARGS+= -DWITH_ODBC:BOOL=ON -.if ${PORT_OPTIONS:MUODBC} -LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC -CMAKE_ARGS+= -DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so -.elif ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -CMAKE_ARGS+= -DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libiodbc.so -.endif -.else -PLIST_SUB+= ODBC="@comment " -CMAKE_ARGS+= -DWITH_ODBC:BOOL=OFF -.endif +BOOST_LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs +BOOST_CMAKE_ON= -DWITH_BOOST:BOOL=ON +BOOST_CMAKE_OFF= -DWITH_BOOST:BOOL=OFF -. if ${PORT_OPTIONS:MBOOST} -LIB_DEPENDS+= libboost_date_time.so:${PORTSDIR}/devel/boost-libs -PLIST_SUB+= BOOST="" -CMAKE_ARGS+= -DWITH_BOOST:BOOL=ON -.else -PLIST_SUB+= BOOST="@comment " -CMAKE_ARGS+= -DWITH_BOOST:BOOL=OFF -.endif - -post-install: - @${CAT} ${PKGMESSAGE} +FIREBIRD_USE= FIREBIRD=yes +FIREBIRD_CMAKE_ARGS_ON= -DWITH_FIREBIRD:BOOL=ON +FIREBIRD_CMAKE_ARGS_OFF= -DWITH_FIREBIRD:BOOL=OFF .include <bsd.port.mk> diff --git a/databases/soci/distinfo b/databases/soci/distinfo index 263d6251f7aa..26fe89fd325f 100644 --- a/databases/soci/distinfo +++ b/databases/soci/distinfo @@ -1,2 +1,2 @@ -SHA256 (soci-3.1.0.zip) = f7004cb2ac040b1fa6ce3cf7ea36e9fe5cdff92c6444ffd764ab2279d5f72449 -SIZE (soci-3.1.0.zip) = 418596 +SHA256 (soci-3.2.2.zip) = e3ad3ea0ef37eab0ae9e6459d2cdd099b1fa1165b663c349e1200356cf4e9c91 +SIZE (soci-3.2.2.zip) = 518502 diff --git a/databases/soci/files/patch-backends_postgresql_statement.cpp b/databases/soci/files/patch-backends_postgresql_statement.cpp index e01a123475db..521a501c11eb 100644 --- a/databases/soci/files/patch-backends_postgresql_statement.cpp +++ b/databases/soci/files/patch-backends_postgresql_statement.cpp @@ -1,14 +1,11 @@ ---- backends/postgresql/statement.cpp.orig 2012-06-19 19:22:42.029810018 +0300 -+++ backends/postgresql/statement.cpp 2012-06-19 19:23:24.256806727 +0300 -@@ -445,7 +445,11 @@ long long postgresql_statement_backend:: - { - const char * resultStr = PQcmdTuples(result_); +--- ./backends/postgresql/statement.cpp.orig 2014-05-05 16:49:26.985995826 +0200 ++++ ./backends/postgresql/statement.cpp 2014-05-05 16:46:18.049008548 +0200 +@@ -453,7 +453,7 @@ + // pointer to it, so we can't rely on implicit conversion here. + const char * const resultStr = PQcmdTuples(result_.get_result()); char * end; -+#ifdef __FreeBSD__ +- long long result = std::strtoll(resultStr, &end, 0); + long long result = strtoq(resultStr, &end, 0); -+#else - long long result = strtoll(resultStr, &end, 0); -+#endif if (end != resultStr) { return result; diff --git a/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp b/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp index 90d96596d731..869737b950e5 100644 --- a/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp +++ b/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp @@ -1,26 +1,20 @@ ---- backends/sqlite3/standard-into-type.cpp.orig 2012-06-19 19:12:10.168809305 +0300 -+++ backends/sqlite3/standard-into-type.cpp 2012-06-19 19:22:12.580359214 +0300 -@@ -113,7 +113,11 @@ void sqlite3_standard_into_type_backend: +--- ./backends/sqlite3/standard-into-type.cpp.orig 2013-08-22 00:40:11.000000000 +0200 ++++ ./backends/sqlite3/standard-into-type.cpp 2014-05-05 16:45:06.981013401 +0200 +@@ -107,7 +107,7 @@ case x_long_long: { long long* dest = static_cast<long long*>(data_); -+#ifdef __FreeBSD__ +- *dest = std::strtoll(buf, NULL, 10); + *dest = strtoq(buf, NULL, 10); -+#else - *dest = strtoll(buf, NULL, 10); -+#endif } break; case x_unsigned_long_long: -@@ -142,7 +146,11 @@ void sqlite3_standard_into_type_backend: +@@ -136,7 +136,7 @@ rowid *rid = static_cast<rowid *>(data_); sqlite3_rowid_backend *rbe = static_cast<sqlite3_rowid_backend *>(rid->get_backend()); -+#ifdef __FreeBSD__ +- long long val = std::strtoll(buf, NULL, 10); + long long val = strtoq(buf, NULL, 10); -+#else - long long val = strtoll(buf, NULL, 10); -+#endif rbe->value_ = static_cast<unsigned long>(val); } break; diff --git a/databases/soci/pkg-descr b/databases/soci/pkg-descr index cec8e6386058..aa190b8f4075 100644 --- a/databases/soci/pkg-descr +++ b/databases/soci/pkg-descr @@ -4,4 +4,4 @@ The idea is to provide C++ programmers a way to access SQL databases in the most natural and intuitive way. If you find existing libraries too difficult for your needs or just distracting, SOCI can be a good alternative. -WWW: http://soci.sourceforge.net/ +WWW: http://soci.sourceforge.net/ diff --git a/databases/soci/pkg-plist b/databases/soci/pkg-plist index 8ef7a390d031..c17695105706 100644 --- a/databases/soci/pkg-plist +++ b/databases/soci/pkg-plist @@ -5,10 +5,13 @@ include/soci/blob.h %%BOOST%%include/soci/boost-gregorian-date.h %%BOOST%%include/soci/boost-optional.h %%BOOST%%include/soci/boost-tuple.h +include/soci/connection-parameters.h include/soci/connection-pool.h include/soci/empty/soci-empty.h include/soci/error.h include/soci/exchange-traits.h +%%FIREBIRD%%include/soci/firebird/common.h +%%FIREBIRD%%include/soci/firebird/soci-firebird.h include/soci/into-type.h include/soci/into.h %%MYSQL%%include/soci/mysql/common.h @@ -18,6 +21,7 @@ include/soci/into.h include/soci/once-temp-type.h %%PGSQL%%include/soci/postgresql/common.h %%PGSQL%%include/soci/postgresql/soci-postgresql.h +include/soci/query_transformation.h include/soci/prepare-temp-type.h include/soci/procedure.h include/soci/ref-counted-prepare-info.h @@ -49,29 +53,34 @@ include/soci/values.h include/soci/version.h lib/libsoci_core.a lib/libsoci_core.so -lib/libsoci_core.so.3.1 -lib/libsoci_core.so.3.1.0 +lib/libsoci_core.so.3.2 +lib/libsoci_core.so.3.2.2 lib/libsoci_empty.a lib/libsoci_empty.so -lib/libsoci_empty.so.3.1 -lib/libsoci_empty.so.3.1.0 +lib/libsoci_empty.so.3.2 +lib/libsoci_empty.so.3.2.2 %%MYSQL%%lib/libsoci_mysql.a %%MYSQL%%lib/libsoci_mysql.so -%%MYSQL%%lib/libsoci_mysql.so.3.1 -%%MYSQL%%lib/libsoci_mysql.so.3.1.0 +%%MYSQL%%lib/libsoci_mysql.so.3.2 +%%MYSQL%%lib/libsoci_mysql.so.3.2.2 %%ODBC%%lib/libsoci_odbc.a %%ODBC%%lib/libsoci_odbc.so -%%ODBC%%lib/libsoci_odbc.so.3.1 -%%ODBC%%lib/libsoci_odbc.so.3.1.0 +%%ODBC%%lib/libsoci_odbc.so.3.2 +%%ODBC%%lib/libsoci_odbc.so.3.2.2 %%PGSQL%%lib/libsoci_postgresql.a %%PGSQL%%lib/libsoci_postgresql.so -%%PGSQL%%lib/libsoci_postgresql.so.3.1 -%%PGSQL%%lib/libsoci_postgresql.so.3.1.0 +%%PGSQL%%lib/libsoci_postgresql.so.3.2 +%%PGSQL%%lib/libsoci_postgresql.so.3.2.2 %%SQLITE%%lib/libsoci_sqlite3.a %%SQLITE%%lib/libsoci_sqlite3.so -%%SQLITE%%lib/libsoci_sqlite3.so.3.1 -%%SQLITE%%lib/libsoci_sqlite3.so.3.1.0 +%%SQLITE%%lib/libsoci_sqlite3.so.3.2 +%%SQLITE%%lib/libsoci_sqlite3.so.3.2.2 +%%FIREBIRD%%lib/libsoci_firebird.a +%%FIREBIRD%%lib/libsoci_firebird.so +%%FIREBIRD%%lib/libsoci_firebird.so.3.2 +%%FIREBIRD%%lib/libsoci_firebird.so.3.2.2 @dirrm include/soci/sqlite3 +@dirrm include/soci/firebird @dirrm include/soci/postgresql @dirrm include/soci/odbc @dirrm include/soci/mysql diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile index b826da8934fa..7ab3a5f22fa9 100644 --- a/databases/unixODBC/Makefile +++ b/databases/unixODBC/Makefile @@ -14,8 +14,6 @@ LICENSE_COMB= multi OPTIONS_DEFINE= DOCS -CONFLICTS= libiodbc-[0-9]* - USES= iconv GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_msql_h=no diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile index 14e55dcc51d6..04e2baec10ab 100644 --- a/devel/poco-ssl/Makefile +++ b/devel/poco-ssl/Makefile @@ -3,7 +3,7 @@ PORTNAME= poco PORTVERSION= 1.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel net MASTER_SITES= SF/${PORTNAME}/sources/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= -ssl @@ -16,19 +16,15 @@ BROKEN= Fails to build CONFLICTS= poco-[0-9]* -OPTIONS_DEFINE= TEST SAMPLES MYSQL SQLITE +OPTIONS_DEFINE= TEST SAMPLES MYSQL SQLITE ODBC SAMPLES_DESC= Build sample programs -UODBC_DESC= Build with ODBC driver -IODBC_DESC= Build with iODBC driver -OPTIONS_RADIO= ODBC -OPTIONS_RADIO_ODBC= UODBC IODBC -ODBC_DESC= ODBC Driver - -OPTIONS_DEFAULT= MYSQL IODBC SQLITE +OPTIONS_DEFAULT= MYSQL SQLITE CONFIGURE_ARGS= --config=FreeBSD +USES= gmake tar:bzip2 + NO_STAGE= yes .include <bsd.port.options.mk> @@ -44,17 +40,8 @@ CONFIGURE_ARGS+= --no-samples # ODBC # -.if ! ${PORT_OPTIONS:MUODBC} && ! ${PORT_OPTIONS:MIODBC} -CONFIGURE_ARGS+= --omit=Data/ODBC -.endif - -.if ${PORT_OPTIONS:MUODBC} && ! ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC -.endif - -.if ${PORT_OPTIONS:MIODBC} && ! ${PORT_OPTIONS:MUODBC} -LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc -.endif +ODBC_CONFIGURE_OFF= --omit=Data/ODBC +ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/libiodbc .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes @@ -69,8 +56,6 @@ CONFIGURE_ARGS+= --omit=Data/SQLite .endif GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_BZIP2= yes USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 4620f47010a0..2d487e626d13 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -5,7 +5,7 @@ PORTNAME?= proftpd .if !defined(DISTVERSION) PORTVERSION?= ${PROFTPD_VERSION} .endif -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \ diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile index 4174cfba95f7..f0dbdca65c24 100644 --- a/lang/erlang-runtime15/Makefile +++ b/lang/erlang-runtime15/Makefile @@ -31,8 +31,6 @@ PLIST_SUB= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC GCC_DESC= Use current GCC HIPE_DESC= Build native HiPE compiler @@ -119,11 +117,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG} .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+=--with-odbc -.if ${PORT_OPTIONS:MUNIXODBC} -LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC -.elif ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc -.endif +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .else CONFIGURE_ARGS+=--without-odbc .endif diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile index af3d7eb91650..2b578f7defba 100644 --- a/lang/erlang-runtime16/Makefile +++ b/lang/erlang-runtime16/Makefile @@ -30,8 +30,6 @@ PLIST_SUB= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC GCC_DESC= Use current GCC HIPE_DESC= Build native HiPE compiler @@ -118,11 +116,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG} .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+=--with-odbc -.if ${PORT_OPTIONS:MUNIXODBC} -LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC -.elif ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc -.endif +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .else CONFIGURE_ARGS+=--without-odbc .endif diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile index 82f45fb0d6b8..061a1fe30617 100644 --- a/lang/erlang-runtime17/Makefile +++ b/lang/erlang-runtime17/Makefile @@ -30,8 +30,6 @@ PLIST_SUB= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC GCC_DESC= Use current GCC HIPE_DESC= Build native HiPE compiler @@ -119,11 +117,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG} .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+=--with-odbc -.if ${PORT_OPTIONS:MUNIXODBC} -LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC -.elif ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc -.endif +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .else CONFIGURE_ARGS+=--without-odbc .endif diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 7d0220794d33..0833ee8c1e8a 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -34,8 +34,6 @@ PLIST_SUB= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC GCC_DESC= Use current GCC HIPE_DESC= Build native HiPE compiler @@ -133,11 +131,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG} .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+=--with-odbc -.if ${PORT_OPTIONS:MUNIXODBC} -LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC -.elif ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc -.endif +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .else CONFIGURE_ARGS+=--without-odbc .endif diff --git a/lang/modula3/Makefile b/lang/modula3/Makefile index 088be2fea8ca..d53891869648 100644 --- a/lang/modula3/Makefile +++ b/lang/modula3/Makefile @@ -3,7 +3,7 @@ PORTNAME= modula3 PORTVERSION= 5.8.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= https://modula3.elegosoft.com/cm3/releng/ \ http://downloads.dragonlace.net/m3/ \ @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COM_LICENSE LICENSE_NAME= CM3 License defined by DEC and Critical Mass copyrights LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/libiodbc +LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC NEWBOOTDIR= ${WRKDIR}/new-bootstrap/bootstrap SRCDISTFILE= cm3-src-all-${PORTVERSION}-REL.tgz @@ -28,8 +28,7 @@ DST2= m3-bootstrap.x86_64.DRAGONFLY.36.tar.bz2:boot ONLY_FOR_ARCHS= amd64 CONFLICTS_INSTALL= cvsup-* -USES= gmake -USE_PGSQL= yes +USES= gmake pgsql USE_XORG= xaw xmu xext xt sm ice x11 USE_GL= gl glu USE_GCC= any diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 4ab3083093bd..b03a457377c7 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -207,10 +207,6 @@ MYSQLND_DESC= Use MySQL Native Driver .if ${PHP_MODNAME} == "odbc" CONFIGURE_ARGS+=--enable-odbc - -OPTIONS_DEFINE= IODBC - -IODBC_DESC= Use the iODBC driver instead of unixODBC .endif .if ${PHP_MODNAME} == "openssl" @@ -259,9 +255,6 @@ USE_PHP_BUILD= yes .endif .if ${PHP_MODNAME} == "pdo_odbc" -OPTIONS_DEFINE= IODBC - -IODBC_DESC= Use the iODBC driver instead of unixODBC USE_PHP= pdo USE_PHP_BUILD= yes @@ -557,15 +550,8 @@ post-extract: .endif .if ${PHP_MODNAME} == "odbc" -. if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc - -CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE} -. else LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC - CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "pdo_dblib" @@ -577,15 +563,8 @@ LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds .endif .if ${PHP_MODNAME} == "pdo_odbc" -. if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc - -CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE} -. else LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC - CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "pdo_mysql" diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index eb39cf96006c..a393f64246ae 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -203,8 +203,6 @@ MYSQLND_DESC= Use MySQL Native Driver .if ${PHP_MODNAME} == "odbc" CONFIGURE_ARGS+=--enable-odbc - -OPTIONS_DEFINE= IODBC .endif .if ${PHP_MODNAME} == "openssl" @@ -253,10 +251,6 @@ USE_PHP_BUILD= yes .endif .if ${PHP_MODNAME} == "pdo_odbc" -OPTIONS_DEFINE= IODBC - -IODBC_DESC= Use the iODBC driver instead of unixODBC - USE_PHP= pdo USE_PHP_BUILD= yes .endif @@ -563,16 +557,9 @@ post-extract: .endif .if ${PHP_MODNAME} == "odbc" -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so.3:${PORTSDIR}/databases/libiodbc - -CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE} -.else LIB_DEPENDS+= libodbc.so.2:${PORTSDIR}/databases/unixODBC - CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} .endif -.endif .if ${PHP_MODNAME} == "pdo_dblib" .if ${PORT_OPTIONS:MMSSQL} @@ -583,16 +570,9 @@ LIB_DEPENDS+= libct.so.4:${PORTSDIR}/databases/freetds .endif .if ${PHP_MODNAME} == "pdo_odbc" -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so.3:${PORTSDIR}/databases/libiodbc - -CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE} -.else LIB_DEPENDS+= libodbc.so.2:${PORTSDIR}/databases/unixODBC - CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} .endif -.endif .if ${PHP_MODNAME} == "pdo_mysql" . if ${PORT_OPTIONS:MMYSQLND} diff --git a/lang/php55/Makefile.ext b/lang/php55/Makefile.ext index b20f53928454..1e48b4247523 100644 --- a/lang/php55/Makefile.ext +++ b/lang/php55/Makefile.ext @@ -207,10 +207,6 @@ MYSQLND_DESC= Use MySQL Native Driver .if ${PHP_MODNAME} == "odbc" CONFIGURE_ARGS+=--enable-odbc - -OPTIONS_DEFINE= IODBC - -IODBC_DESC= Use the iODBC driver instead of unixODBC .endif .if ${PHP_MODNAME} == "openssl" @@ -263,10 +259,6 @@ USE_PHP_BUILD= yes .endif .if ${PHP_MODNAME} == "pdo_odbc" -OPTIONS_DEFINE= IODBC - -IODBC_DESC= Use the iODBC driver instead of unixODBC - USE_PHP= pdo USE_PHP_BUILD= yes .endif @@ -561,15 +553,8 @@ post-extract: .endif .if ${PHP_MODNAME} == "odbc" -. if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc - -CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE} -. else LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC - CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "pdo_dblib" @@ -581,15 +566,8 @@ LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds .endif .if ${PHP_MODNAME} == "pdo_odbc" -. if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc - -CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE} -. else LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC - CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "pdo_mysql" diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile index 7deb2ae9e777..ecf0b37bf1b1 100644 --- a/lang/pike76/Makefile +++ b/lang/pike76/Makefile @@ -26,18 +26,14 @@ CONFLICTS= pike7[28]-[0-9]* CONFLICTS_BUILD=nettle-[2-9]* OPTIONS_DEFINE= TTF FREETYPE OPT_CFLAGS MYSQL FFMPEG PGSQL \ - SANE PDF SVG2 TDS FFTW -OPTIONS_DEFAULT=TTF FREETYPE OPT_CFLAGS MYSQL NOODBC -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= NOODBC UNIXODBC IODBC + SANE PDF SVG2 TDS FFTW ODBC +OPTIONS_DEFAULT=TTF FREETYPE OPT_CFLAGS MYSQL TTF_DESC?= Add FreeType 1 support FREETYPE_DESC?= Add FreeType 2 support OPT_CFLAGS_DESC?= Enable additional compiliation optimizations FFMPEG_DESC?= Add FFmpeg support -NOODBC_DESC?= No ODBC support (default) -UNIXODBC_DESC?= Add UnixODBC support -IODBC_DESC?= Add iODBC support +ODBC_DESC?= Add ODBC support SANE_DESC?= Add SANE support PDF_DESC?= Add PDF support SVG2_DESC?= Add SVG2 support @@ -154,17 +150,10 @@ CONFIGURE_ARGS+= --with-pgsql=${PREFIX} CONFIGURE_ARGS+= --without-pgsql .endif -.if ${PORT_OPTIONS:MUNIXODBC} +.if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-odbc -.endif - -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS+= --with-odbc -.endif - -.if ${PORT_OPTIONS:MNOODBC} +.else CONFIGURE_ARGS+= --without-odbc .endif diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index 971485ce4a77..695403409351 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -13,12 +13,8 @@ COMMENT= Edinburgh-style Prolog compiler LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ libjpeg.so:${PORTSDIR}/graphics/jpeg -# note that the ports unixodbc and libiodbc conflict -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_DEFAULT=UNIXODBC -UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC -IODBC_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc +OPTIONS_DEFINE= ODBC +ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/math/saga/Makefile b/math/saga/Makefile index 88fad49537a2..8f8ffd6b5ac6 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -3,7 +3,7 @@ PORTNAME= saga PORTVERSION= 2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -33,7 +33,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -lopencv_core USE_PYTHON= 2 USE_LDCONFIG= yes USE_WX= 3.0 -USES= compiler:features iconv:wchar_t dos2unix +USES= compiler:features iconv:wchar_t dos2unix libtool WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} WX_UNICODE= yes @@ -109,6 +109,5 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_saga_api-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_gdi-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/saga/*.so - ${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la .include <bsd.port.post.mk> diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist index 06a613345b6d..f9b5654ce1f1 100644 --- a/math/saga/pkg-plist +++ b/math/saga/pkg-plist @@ -1,14 +1,11 @@ bin/saga_cmd bin/saga_gui lib/libsaga_api-%%PORTVERSION%%.so -lib/libsaga_api.la lib/libsaga_api.so lib/libsaga_gdi-%%PORTVERSION%%.so -lib/libsaga_gdi.la lib/libsaga_gdi.so %%PYTHON_SITELIBDIR%%/_saga_api-%%PORTVERSION%%.so %%PYTHON_SITELIBDIR%%/_saga_api.a -%%PYTHON_SITELIBDIR%%/_saga_api.la %%PYTHON_SITELIBDIR%%/_saga_api.so %%PYTHON_SITELIBDIR%%/saga_api.py %%PYTHON_SITELIBDIR%%/saga_api.pyc @@ -82,7 +79,6 @@ lib/saga/libtin_viewer.so %%VIGRA%%lib/saga/libvigra.so man/man1/saga_cmd.1.gz man/man1/saga_gui.1.gz -share/applications/saga_gui.desktop %%DATADIR%%/saga.png %%DATADIR%%/saga_tip.txt @dirrmtry %%DATADIR%% diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile index 2a9d792f62c2..f21636d566fe 100644 --- a/net-mgmt/zabbix2-server/Makefile +++ b/net-mgmt/zabbix2-server/Makefile @@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --with-net-snmp OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW MYSQL +OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW MYSQL OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL CURL_DESC= Support for web monitoring @@ -79,12 +79,9 @@ NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks ODBC_DESC= Support for database checks via ODBC JAVAGW_DESC= Support for Java gateway -IODBC_DESC= Use iODBC for ODBC support -UNIXODBC_DESC= Use UnixODBC for ODBC support -OPTIONS_SINGLE= DB ODBC -OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC +OPTIONS_SINGLE= DB +OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE ODBC .include <bsd.port.options.mk> @@ -140,12 +137,7 @@ LIB_DEPENDS+= libssh2.so:${PORTSDIR}/security/libssh2 CONFIGURE_ARGS+= --with-ssh2 .endif -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS+= --with-iodbc -.endif - -.if ${PORT_OPTIONS:MUNIXODBC} +.if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-unixodbc .endif diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile index 222947b45d3e..b3ee00ed8856 100644 --- a/net-mgmt/zabbix22-server/Makefile +++ b/net-mgmt/zabbix22-server/Makefile @@ -69,7 +69,7 @@ CONFIGURE_ARGS+= --with-net-snmp OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW LIBXML2 +OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW LIBXML2 OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL CURL_DESC= Support for web monitoring @@ -81,13 +81,10 @@ NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks ODBC_DESC= Support for database checks via ODBC JAVAGW_DESC= Support for Java gateway -IODBC_DESC= Use iODBC for ODBC support -UNIXODBC_DESC= Use UnixODBC for ODBC support LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) -OPTIONS_SINGLE= DB ODBC -OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC +OPTIONS_SINGLE= DB +OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE ODBC .include <bsd.port.options.mk> @@ -143,12 +140,7 @@ LIB_DEPENDS+= libssh2.so:${PORTSDIR}/security/libssh2 CONFIGURE_ARGS+= --with-ssh2 .endif -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS+= --with-iodbc -.endif - -.if ${PORT_OPTIONS:MUNIXODBC} +.if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-unixodbc .endif diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 94387649c60b..638ceabb9d5d 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -47,12 +47,9 @@ CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-10* OPTIONS_DEFINE= VORBIS PGSQL MYSQL RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 -OPTIONS_DEFAULT= VORBIS UNIXODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \ +OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \ SQLITE CURL -OPTIONS_RADIO= ODBC -OPTIONS_RADIO_ODBC= IODBC UNIXODBC - OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI @@ -114,25 +111,14 @@ CONFIGURE_ARGS+= --without-dahdi --without-openr2 # # WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV # similarly -.if empty(PORT_OPTIONS:MUNIXODBC) +.if empty(PORT_OPTIONS:MODBC) CONFIGURE_ARGS+= --without-unixodbc -.endif -.if empty(PORT_OPTIONS:MIODBC) -CONFIGURE_ARGS+= --without-iodbc -.endif -.if empty(PORT_OPTIONS:MUNIXODBC) && empty(PORT_OPTIONS:MIODBC) PLIST_SUB+= WITH_ODBC="@comment " -.endif -.if ${PORT_OPTIONS:MUNIXODBC} || ${PORT_OPTIONS:MIODBC} +.else PLIST_SUB+= WITH_ODBC="" USE_AUTOTOOLS= libltdl -.if ${PORT_OPTIONS:MUNIXODBC} CONFIGURE_ARGS+= --with-unixodbc --with-ltdl -LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC -.elif ${PORT_OPTIONS:MIODBC} -CONFIGURE_ARGS+= --with-iodbc --with-ltdl -LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc -.endif +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .endif .if ${PORT_OPTIONS:MFREETDS} diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile index 8b4db5b9556b..3172a638bf46 100644 --- a/net/asterisk11/Makefile +++ b/net/asterisk11/Makefile @@ -46,12 +46,9 @@ CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* OPTIONS_DEFINE= VORBIS PGSQL MYSQL RADIUS SNMP FREETDS XMPP SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 -OPTIONS_DEFAULT= VORBIS UNIXODBC PGSQL RADIUS SNMP FREETDS \ +OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ XMPP GSM SQLITE CURL -OPTIONS_RADIO= ODBC -OPTIONS_RADIO_ODBC= IODBC UNIXODBC - OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI @@ -110,25 +107,14 @@ CONFIGURE_ARGS+= --without-dahdi --without-openr2 # # WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV # similarly -.if empty(PORT_OPTIONS:MUNIXODBC) +.if empty(PORT_OPTIONS:MODBC) CONFIGURE_ARGS+= --without-unixodbc -.endif -.if empty(PORT_OPTIONS:MIODBC) -CONFIGURE_ARGS+= --without-iodbc -.endif -.if empty(PORT_OPTIONS:MUNIXODBC) && empty(PORT_OPTIONS:MIODBC) PLIST_SUB+= WITH_ODBC="@comment " -.endif -.if ${PORT_OPTIONS:MUNIXODBC} || ${PORT_OPTIONS:MIODBC} +.else PLIST_SUB+= WITH_ODBC="" USE_AUTOTOOLS= libltdl -.if ${PORT_OPTIONS:MUNIXODBC} CONFIGURE_ARGS+= --with-unixodbc --with-ltdl -LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC -.elif ${PORT_OPTIONS:MIODBC} -CONFIGURE_ARGS+= --with-iodbc --with-ltdl -LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc -.endif +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .endif .if ${PORT_OPTIONS:MFREETDS} diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 15f4ad051253..77eaf33779c4 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -3,6 +3,7 @@ PORTNAME= openldap DISTVERSION= 2.4.39 +PORTREVISION= 1 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ @@ -428,14 +429,7 @@ CONFIGURE_ARGS+= --enable-spasswd .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+= --enable-sql=${BACKEND_ENABLE} PLIST_SUB+= BACK_SQL=${BACKEND_PLIST} -WITH_ODBC_TYPE?= iODBC -.if ${WITH_ODBC_TYPE:tl} == iodbc -LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc -.elif ${WITH_ODBC_TYPE:tl} == unixodbc -LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC -.else -BROKEN= choose either iODBC or unixODBC for WITH_ODBC_TYPE -.endif +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .else PLIST_SUB+= BACK_SQL="@comment " .endif diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile index f0aa13eda371..d9314d6d96b7 100644 --- a/textproc/soprano/Makefile +++ b/textproc/soprano/Makefile @@ -3,20 +3,20 @@ PORTNAME= soprano PORTVERSION= 2.9.4 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/Soprano/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Qt/C++ RDF framework -LIB_DEPENDS= raptor2:${PORTSDIR}/textproc/raptor2 \ - rdf:${PORTSDIR}/textproc/redland \ - iodbc:${PORTSDIR}/databases/libiodbc +LIB_DEPENDS= libraptor2.so:${PORTSDIR}/textproc/raptor2 \ + librdf.so:${PORTSDIR}/textproc/redland \ + libiodbc.so:${PORTSDIR}/databases/libiodbc USE_QT4= corelib dbus network qtestlib_build xml \ qmake_build moc_build uic_build rcc_build -USE_BZIP2= yes -USES= cmake pkgconfig +USES= cmake pkgconfig tar:bzip2 CMAKE_ARGS+= -DSOPRANO_DISABLE_CLUCENE_INDEX=yes \ -DSOPRANO_DISABLE_SESAME2_BACKEND=yes USE_LDCONFIG= yes |