Date: Sat, 27 Sep 2014 08:31:58 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369379 - in head: . databases databases/freetds databases/freetds-msdblib databases/py-mssql lang/php5 lang/php53 lang/php55 lang/php56 Message-ID: <201409270831.s8R8Vwgv016945@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Sep 27 08:31:58 2014 New Revision: 369379 URL: http://svnweb.freebsd.org/changeset/ports/369379 QAT: https://qat.redports.org/buildarchive/r369379/ Log: Modernise databases/freetds port - Retire databases/freetds-msdblib port (no longer needed, recently updated upstream version has necessary compat option which is now enabled in the freetds port) - Fix LIB_DEPENDS in dependent ports - Bump PORTREVISION in freetds and dependent ports PR: 193850 Submitted by: 5u623l20@gmail.com (maintainer) Deleted: head/databases/freetds-msdblib/ Modified: head/MOVED head/databases/Makefile head/databases/freetds/Makefile head/databases/freetds/pkg-plist head/databases/py-mssql/Makefile head/lang/php5/Makefile head/lang/php5/Makefile.ext head/lang/php53/Makefile head/lang/php53/Makefile.ext head/lang/php55/Makefile head/lang/php55/Makefile.ext head/lang/php56/Makefile head/lang/php56/Makefile.ext Modified: head/MOVED ============================================================================== --- head/MOVED Sat Sep 27 08:20:01 2014 (r369378) +++ head/MOVED Sat Sep 27 08:31:58 2014 (r369379) @@ -7131,3 +7131,4 @@ sysutils/rubygem-chef-server||2014-09-25 sysutils/rubygem-chef-solr||2014-09-25|Has expired: Depends on broken rubygem-dep_selector www/rubygem-chef-server-webui||2014-09-25|Has expired: Depends on broken rubygem-dep_selector www/rubygem-chef-server-api||2014-09-25|Has expired: Depends on broken rubygem-dep_selector +databases/freetds-msdblib||2014-09-27|No longer required, now covered by databases/freetds Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Sat Sep 27 08:20:01 2014 (r369378) +++ head/databases/Makefile Sat Sep 27 08:31:58 2014 (r369379) @@ -70,7 +70,6 @@ SUBDIR += fpc-sqlite SUBDIR += freetds SUBDIR += freetds-devel - SUBDIR += freetds-msdblib SUBDIR += frontbase-jdbc SUBDIR += gadfly SUBDIR += galera Modified: head/databases/freetds/Makefile ============================================================================== --- head/databases/freetds/Makefile Sat Sep 27 08:20:01 2014 (r369378) +++ head/databases/freetds/Makefile Sat Sep 27 08:31:58 2014 (r369379) @@ -3,6 +3,7 @@ PORTNAME= freetds PORTVERSION= 0.91.103 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/ @@ -22,16 +23,16 @@ USE_AUTOTOOLS= autoconf:env CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib LIBS+= -lgcrypt -CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} +CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \ + --enable-sybase-compat --enable-msdblib USE_LDCONFIG= yes INSTALL_TARGET= install-strip PORTDOCS= * -OPTIONS_DEFINE= OPENSSL GNUTLS MSDBLIB DOCS +OPTIONS_DEFINE= OPENSSL GNUTLS DOCS OPTIONS_RADIO= ODBC OPTIONS_RADIO_ODBC= IODBC UNIXODBC -MSDBLIB_DESC= MS SQL Server support (breaks databases/sybtcl) OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls @@ -41,9 +42,6 @@ IODBC_CONFIGURE_ON= --with-iodbc=${LOCAL IODBC_CPPFLAGS= -I${LOCALBASE}/include/libiodbc UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC UNIXODBC_CONFIGURE_ON= --with-unixodbc=${LOCALBASE} -# We cannot use msdblib-style by default, because port databases/sybtcl -# relies on sybase-style dblib -MSDBLIB_CONFIGURE_ON= --enable-msdblib .include <bsd.port.options.mk> Modified: head/databases/freetds/pkg-plist ============================================================================== --- head/databases/freetds/pkg-plist Sat Sep 27 08:20:01 2014 (r369378) +++ head/databases/freetds/pkg-plist Sat Sep 27 08:31:58 2014 (r369379) @@ -46,4 +46,3 @@ man/man5/freetds.conf.5.gz %%ODBC%%lib/libtdsodbc.so.0.0.0 %%ODBC%%lib/libtdsodbc.la %%ODBC%%lib/libtdsodbc.a -@dirrm %%ETCDIR%% Modified: head/databases/py-mssql/Makefile ============================================================================== --- head/databases/py-mssql/Makefile Sat Sep 27 08:20:01 2014 (r369378) +++ head/databases/py-mssql/Makefile Sat Sep 27 08:31:58 2014 (r369379) @@ -3,7 +3,7 @@ PORTNAME= mssql PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ COMMENT= Python database interface for s LICENSE= LGPL21 -LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds USES= dos2unix python:2 USE_PYTHON= autoplist distutils Modified: head/lang/php5/Makefile ============================================================================== --- head/lang/php5/Makefile Sat Sep 27 08:20:01 2014 (r369378) +++ head/lang/php5/Makefile Sat Sep 27 08:31:58 2014 (r369379) @@ -3,7 +3,7 @@ PORTNAME= php5 PORTVERSION= 5.4.33 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions Modified: head/lang/php5/Makefile.ext ============================================================================== --- head/lang/php5/Makefile.ext Sat Sep 27 08:20:01 2014 (r369378) +++ head/lang/php5/Makefile.ext Sat Sep 27 08:31:58 2014 (r369379) @@ -185,7 +185,7 @@ CONFIGURE_ARGS+=--with-mcrypt=${LOCALBAS .endif .if ${PHP_MODNAME} == "mssql" -LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} .endif @@ -557,7 +557,7 @@ post-extract: .if ${PHP_MODNAME} == "pdo_dblib" . if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds . else LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds . endif Modified: head/lang/php53/Makefile ============================================================================== --- head/lang/php53/Makefile Sat Sep 27 08:20:01 2014 (r369378) +++ head/lang/php53/Makefile Sat Sep 27 08:31:58 2014 (r369379) @@ -3,7 +3,7 @@ PORTNAME= php53 PORTVERSION= 5.3.29 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions Modified: head/lang/php53/Makefile.ext ============================================================================== --- head/lang/php53/Makefile.ext Sat Sep 27 08:20:01 2014 (r369378) +++ head/lang/php53/Makefile.ext Sat Sep 27 08:31:58 2014 (r369379) @@ -181,7 +181,7 @@ CONFIGURE_ARGS+=--with-mcrypt=${LOCALBAS .endif .if ${PHP_MODNAME} == "mssql" -LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} .endif @@ -563,7 +563,7 @@ CONFIGURE_ARGS+=--with-unixODBC=${LOCALB .if ${PHP_MODNAME} == "pdo_dblib" .if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds .else LIB_DEPENDS+= libct.so.4:${PORTSDIR}/databases/freetds .endif Modified: head/lang/php55/Makefile ============================================================================== --- head/lang/php55/Makefile Sat Sep 27 08:20:01 2014 (r369378) +++ head/lang/php55/Makefile Sat Sep 27 08:31:58 2014 (r369379) @@ -3,7 +3,7 @@ PORTNAME= php55 PORTVERSION= 5.5.17 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions Modified: head/lang/php55/Makefile.ext ============================================================================== --- head/lang/php55/Makefile.ext Sat Sep 27 08:20:01 2014 (r369378) +++ head/lang/php55/Makefile.ext Sat Sep 27 08:31:58 2014 (r369379) @@ -185,7 +185,7 @@ CONFIGURE_ARGS+=--with-mcrypt=${LOCALBAS .endif .if ${PHP_MODNAME} == "mssql" -LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} .endif @@ -561,7 +561,7 @@ post-extract: .if ${PHP_MODNAME} == "pdo_dblib" . if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds . else LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds . endif Modified: head/lang/php56/Makefile ============================================================================== --- head/lang/php56/Makefile Sat Sep 27 08:20:01 2014 (r369378) +++ head/lang/php56/Makefile Sat Sep 27 08:31:58 2014 (r369379) @@ -3,7 +3,7 @@ PORTNAME= php56 PORTVERSION= 5.6.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions Modified: head/lang/php56/Makefile.ext ============================================================================== --- head/lang/php56/Makefile.ext Sat Sep 27 08:20:01 2014 (r369378) +++ head/lang/php56/Makefile.ext Sat Sep 27 08:31:58 2014 (r369379) @@ -185,7 +185,7 @@ CONFIGURE_ARGS+=--with-mcrypt=${LOCALBAS .endif .if ${PHP_MODNAME} == "mssql" -LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} .endif @@ -564,7 +564,7 @@ post-extract: .if ${PHP_MODNAME} == "pdo_dblib" . if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds . else LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds . endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409270831.s8R8Vwgv016945>