diff options
| author | riggs <riggs@FreeBSD.org> | 2014-09-27 16:31:58 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2014-09-27 16:31:58 +0800 |
| commit | 42744e3c059a69be53f5e8a1c54325632f565c7a (patch) | |
| tree | d805f87c01e88809871cf9b9851ba01afb7daaf3 /databases | |
| parent | 8249d7a3475801269ff15bcd83575b3605ef5713 (diff) | |
| download | freebsd-ports-gnome-42744e3c059a69be53f5e8a1c54325632f565c7a.tar.gz freebsd-ports-gnome-42744e3c059a69be53f5e8a1c54325632f565c7a.tar.zst freebsd-ports-gnome-42744e3c059a69be53f5e8a1c54325632f565c7a.zip | |
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)
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/Makefile | 1 | ||||
| -rw-r--r-- | databases/freetds-msdblib/Makefile | 12 | ||||
| -rw-r--r-- | databases/freetds/Makefile | 10 | ||||
| -rw-r--r-- | databases/freetds/pkg-plist | 1 | ||||
| -rw-r--r-- | databases/py-mssql/Makefile | 4 |
5 files changed, 6 insertions, 22 deletions
diff --git a/databases/Makefile b/databases/Makefile index 5253f335ad55..1af4c0a34c97 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -70,7 +70,6 @@ SUBDIR += fpc-sqlite SUBDIR += freetds SUBDIR += freetds-devel - SUBDIR += freetds-msdblib SUBDIR += frontbase-jdbc SUBDIR += gadfly SUBDIR += galera diff --git a/databases/freetds-msdblib/Makefile b/databases/freetds-msdblib/Makefile deleted file mode 100644 index 6a98c121bf9f..000000000000 --- a/databases/freetds-msdblib/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> -# $FreeBSD$ - -PKGNAMESUFFIX= -msdblib - -MAINTAINER= ports@FreeBSD.org - -WITH_MSDBLIB= yes - -MASTERDIR= ${.CURDIR}/../freetds - -.include "${MASTERDIR}/Makefile" diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 4655a92207e1..457be04f03bf 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -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=${LOCALBASE} 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> diff --git a/databases/freetds/pkg-plist b/databases/freetds/pkg-plist index 2ff9e2eb8cf9..f3f08469d5d2 100644 --- a/databases/freetds/pkg-plist +++ b/databases/freetds/pkg-plist @@ -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%% diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile index 302fd015d80e..10021ccbebc5 100644 --- a/databases/py-mssql/Makefile +++ b/databases/py-mssql/Makefile @@ -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 simple MS-SQL access 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 |