svn commit: r353029 - in head: . databases/freetds-devel databases/libiodbc databases/libodbc++ databases/mdbtools databases/mysql-connector-odbc databases/mysql-workbench52 databases/mysql2odbc da...
Baptiste Daroussin
bapt at FreeBSD.org
Mon May 5 16:24:08 UTC 2014
Author: bapt
Date: Mon May 5 16:24:00 2014
New Revision: 353029
URL: http://svnweb.freebsd.org/changeset/ports/353029
QAT: https://qat.redports.org/buildarchive/r353029/
Log:
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
Modified:
head/UPDATING
head/databases/freetds-devel/Makefile
head/databases/freetds-devel/pkg-plist
head/databases/libiodbc/Makefile
head/databases/libiodbc/pkg-plist
head/databases/libodbc++/Makefile
head/databases/libodbc++/pkg-plist
head/databases/mdbtools/Makefile
head/databases/mysql-connector-odbc/Makefile
head/databases/mysql-workbench52/Makefile
head/databases/mysql2odbc/Makefile
head/databases/mysql2odbc/pkg-plist
head/databases/p5-DBD-ODBC/Makefile
head/databases/postgresql-odbc/Makefile
head/databases/proftpd-mod_sql_odbc/Makefile
head/databases/py-odbc/Makefile
head/databases/qt4-odbc-plugin/Makefile
head/databases/qt5-sqldrivers-odbc/Makefile
head/databases/soci/Makefile
head/databases/soci/distinfo
head/databases/soci/files/patch-backends_postgresql_statement.cpp
head/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp
head/databases/soci/pkg-descr
head/databases/soci/pkg-plist
head/databases/unixODBC/Makefile
head/devel/poco-ssl/Makefile
head/ftp/proftpd/Makefile
head/lang/erlang-runtime15/Makefile
head/lang/erlang-runtime16/Makefile
head/lang/erlang-runtime17/Makefile
head/lang/erlang/Makefile
head/lang/modula3/Makefile
head/lang/php5/Makefile.ext
head/lang/php53/Makefile.ext
head/lang/php55/Makefile.ext
head/lang/pike76/Makefile
head/lang/swi-pl/Makefile
head/math/saga/Makefile
head/math/saga/pkg-plist
head/net-mgmt/zabbix2-server/Makefile
head/net-mgmt/zabbix22-server/Makefile
head/net/asterisk/Makefile
head/net/asterisk11/Makefile
head/net/openldap24-server/Makefile
head/textproc/soprano/Makefile
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Mon May 5 15:51:04 2014 (r353028)
+++ head/UPDATING Mon May 5 16:24:00 2014 (r353029)
@@ -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 at 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 at FreeBSD.org
Modified: head/databases/freetds-devel/Makefile
==============================================================================
--- head/databases/freetds-devel/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/freetds-devel/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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}/s
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
Modified: head/databases/freetds-devel/pkg-plist
==============================================================================
--- head/databases/freetds-devel/pkg-plist Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/freetds-devel/pkg-plist Mon May 5 16:24:00 2014 (r353029)
@@ -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
Modified: head/databases/libiodbc/Makefile
==============================================================================
--- head/databases/libiodbc/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/libiodbc/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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
Modified: head/databases/libiodbc/pkg-plist
==============================================================================
--- head/databases/libiodbc/pkg-plist Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/libiodbc/pkg-plist Mon May 5 16:24:00 2014 (r353029)
@@ -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%%
+ at dirrm include/libiodbc
@dirrmtry %%ETCDIR%%
Modified: head/databases/libodbc++/Makefile
==============================================================================
--- head/databases/libodbc++/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/libodbc++/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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>
Modified: head/databases/libodbc++/pkg-plist
==============================================================================
--- head/databases/libodbc++/pkg-plist Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/libodbc++/pkg-plist Mon May 5 16:24:00 2014 (r353029)
@@ -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++
Modified: head/databases/mdbtools/Makefile
==============================================================================
--- head/databases/mdbtools/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/mdbtools/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -3,6 +3,7 @@
PORTNAME= mdbtools
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= https://github.com/brianb/mdbtools/archive/
DISTNAME= ${PORTVERSION}
Modified: head/databases/mysql-connector-odbc/Makefile
==============================================================================
--- head/databases/mysql-connector-odbc/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/mysql-connector-odbc/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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>
Modified: head/databases/mysql-workbench52/Makefile
==============================================================================
--- head/databases/mysql-workbench52/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/mysql-workbench52/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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 \
Modified: head/databases/mysql2odbc/Makefile
==============================================================================
--- head/databases/mysql2odbc/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/mysql2odbc/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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 at 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>
Modified: head/databases/mysql2odbc/pkg-plist
==============================================================================
--- head/databases/mysql2odbc/pkg-plist Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/mysql2odbc/pkg-plist Mon May 5 16:24:00 2014 (r353029)
@@ -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
Modified: head/databases/p5-DBD-ODBC/Makefile
==============================================================================
--- head/databases/p5-DBD-ODBC/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/p5-DBD-ODBC/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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}
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>
Modified: head/databases/postgresql-odbc/Makefile
==============================================================================
--- head/databases/postgresql-odbc/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/postgresql-odbc/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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>
Modified: head/databases/proftpd-mod_sql_odbc/Makefile
==============================================================================
--- head/databases/proftpd-mod_sql_odbc/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/proftpd-mod_sql_odbc/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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"
Modified: head/databases/py-odbc/Makefile
==============================================================================
--- head/databases/py-odbc/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/py-odbc/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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>
Modified: head/databases/qt4-odbc-plugin/Makefile
==============================================================================
--- head/databases/qt4-odbc-plugin/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/qt4-odbc-plugin/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -3,6 +3,7 @@
PORTNAME= qt4-${DB}-plugin
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= kde at FreeBSD.org
Modified: head/databases/qt5-sqldrivers-odbc/Makefile
==============================================================================
--- head/databases/qt5-sqldrivers-odbc/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/qt5-sqldrivers-odbc/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -1,6 +1,7 @@
# $FreeBSD$
COMMENT= Qt ${DB_DESC} plugin
+PORTREVISION= 1
DB= ODBC
DB_DESC= Open Database Connectivity
Modified: head/databases/soci/Makefile
==============================================================================
--- head/databases/soci/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/soci/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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
-
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.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
-
-.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
-
-.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
-
-.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
-
-. 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
+OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
+OPTIONS_SUB= yes
-post-install:
- @${CAT} ${PKGMESSAGE}
+MYSQL_USE= MYSQL=yes
+MYSQL_CMAKE_ON= -DWITH_MYSQL:BOOL=ON
+MYSQL_CMAKE_OFF= -DWITH_MYSQL:BOOL=OFF
+
+PGSQL_USES= pgsql
+PGSQL_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=ON
+PGSQL_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=OFF
+
+SQLITE_USE= SQLITE=yes
+SQLITE_CMAKE_ON= -DWITH_SQLITE3:BOOL=ON
+SQLITE_CMAKE_OFF= -DWITH_SQLITE3:BOOL=OFF
+
+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
+
+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
+
+FIREBIRD_USE= FIREBIRD=yes
+FIREBIRD_CMAKE_ARGS_ON= -DWITH_FIREBIRD:BOOL=ON
+FIREBIRD_CMAKE_ARGS_OFF= -DWITH_FIREBIRD:BOOL=OFF
.include <bsd.port.mk>
Modified: head/databases/soci/distinfo
==============================================================================
--- head/databases/soci/distinfo Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/soci/distinfo Mon May 5 16:24:00 2014 (r353029)
@@ -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
Modified: head/databases/soci/files/patch-backends_postgresql_statement.cpp
==============================================================================
--- head/databases/soci/files/patch-backends_postgresql_statement.cpp Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/soci/files/patch-backends_postgresql_statement.cpp Mon May 5 16:24:00 2014 (r353029)
@@ -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;
Modified: head/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp
==============================================================================
--- head/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp Mon May 5 16:24:00 2014 (r353029)
@@ -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;
Modified: head/databases/soci/pkg-descr
==============================================================================
--- head/databases/soci/pkg-descr Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/soci/pkg-descr Mon May 5 16:24:00 2014 (r353029)
@@ -4,4 +4,4 @@ The idea is to provide C++ programmers a
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/
Modified: head/databases/soci/pkg-plist
==============================================================================
--- head/databases/soci/pkg-plist Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/soci/pkg-plist Mon May 5 16:24:00 2014 (r353029)
@@ -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
+ at dirrm include/soci/firebird
@dirrm include/soci/postgresql
@dirrm include/soci/odbc
@dirrm include/soci/mysql
Modified: head/databases/unixODBC/Makefile
==============================================================================
--- head/databases/unixODBC/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/databases/unixODBC/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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
Modified: head/devel/poco-ssl/Makefile
==============================================================================
--- head/devel/poco-ssl/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/devel/poco-ssl/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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>
Modified: head/ftp/proftpd/Makefile
==============================================================================
--- head/ftp/proftpd/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/ftp/proftpd/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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/ \
Modified: head/lang/erlang-runtime15/Makefile
==============================================================================
--- head/lang/erlang-runtime15/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/lang/erlang-runtime15/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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_CO
.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
Modified: head/lang/erlang-runtime16/Makefile
==============================================================================
--- head/lang/erlang-runtime16/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/lang/erlang-runtime16/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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_CO
.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
Modified: head/lang/erlang-runtime17/Makefile
==============================================================================
--- head/lang/erlang-runtime17/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/lang/erlang-runtime17/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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_CO
.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
Modified: head/lang/erlang/Makefile
==============================================================================
--- head/lang/erlang/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/lang/erlang/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -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_CO
.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
Modified: head/lang/modula3/Makefile
==============================================================================
--- head/lang/modula3/Makefile Mon May 5 15:51:04 2014 (r353028)
+++ head/lang/modula3/Makefile Mon May 5 16:24:00 2014 (r353029)
@@ -3,7 +3,7 @@
PORTNAME= modula3
PORTVERSION= 5.8.6
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list