Date: Tue, 11 Dec 2012 21:55:09 +0100 From: Kurt Jaeger <pi@opsec.eu> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/174377: [patch update] fix makefile options databases/freetds-devel Message-ID: <20121211205509.GK99761@home.opsec.eu> In-Reply-To: <201212112050.qBBKo1WX007821@freefall.freebsd.org> References: <E1TiWgp-0003i2-Jm@zfs.opsec.eu> <201212112050.qBBKo1WX007821@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi! > http://www.freebsd.org/cgi/query-pr.cgi?pr=174377 Sorry, here's the updated patch: diff -r -u databases/freetds-devel/Makefile /usr/home/pi/myp/databases/freetds-devel/Makefile --- databases/freetds-devel/Makefile 2012-11-30 23:24:39.304139424 +0100 +++ /usr/home/pi/myp/databases/freetds-devel/Makefile 2012-12-11 21:47:21.340991629 +0100 @@ -29,27 +29,24 @@ defncopy.1 fisql.1 osql.1 MAN5= freetds.conf.5 -.include <bsd.port.options.mk> - -# OPTIONS_DEFINE= OPENSSL GNUTLS IODBC UNIXODBC MSDBLIB -OPTIONS_DEFINE= MSDBLIB +#OPTIONS_DEFINE= OPENSSL GNUTLS IODBC UNIXODBC MSDBLIB +OPTIONS_DEFINE= MSDBLIB +OPTIONS_SET= IODBC OPENSSL MSDBLIB -OPTIONS_SINGLE= ODBC SSL +OPTIONS_SINGLE= ODBC SSL OPTIONS_SINGLE_ODBC= IODBC UNIXODBC OPTIONS_SINGLE_SSL= OPENSSL GNUTLS -OPTIONS_DEFAULT= OPENSSL IODBC - 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) -CONFLICTS= freetds-0.64.[0-9] - .include <bsd.port.options.mk> +CONFLICTS= freetds-0.64.[0-9] + .if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} @@ -83,6 +80,8 @@ TDS_VER= 7.2 .endif +.include <bsd.port.pre.mk> + post-extract: @cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist @@ -109,4 +108,4 @@ @${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc" @${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names" -.include <bsd.port.mk> +.include <bsd.port.post.mk> -- pi@opsec.eu +49 171 3101372 8 years to go !
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121211205509.GK99761>