Date: Tue, 15 Nov 2016 19:34:41 +0000 (UTC) From: Dmitry Sivachenko <demon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426177 - head/net/haproxy-devel Message-ID: <201611151934.uAFJYfIp021108@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: demon Date: Tue Nov 15 19:34:41 2016 New Revision: 426177 URL: https://svnweb.freebsd.org/changeset/ports/426177 Log: Stricter check for FreeBSD version when openssl was updated to 1.0 (thanks danfe) Fix plist; Mark BROKEN if libressl is detected (thanks jhale) Modified: head/net/haproxy-devel/Makefile head/net/haproxy-devel/pkg-plist Modified: head/net/haproxy-devel/Makefile ============================================================================== --- head/net/haproxy-devel/Makefile Tue Nov 15 15:59:02 2016 (r426176) +++ head/net/haproxy-devel/Makefile Tue Nov 15 19:34:41 2016 (r426177) @@ -62,9 +62,12 @@ IGNORE?= enable PCRE support to use Devi .if ${PORT_OPTIONS:MOPENSSL} USES+= ssl MAKE_ARGS+= USE_OPENSSL=1 -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 WITH_OPENSSL_PORT= yes .endif +.if ${SSL_DEFAULT:Mlibressl*} +BROKEN= does not build with libressl +.endif .endif .if ${PORT_OPTIONS:MLUA} Modified: head/net/haproxy-devel/pkg-plist ============================================================================== --- head/net/haproxy-devel/pkg-plist Tue Nov 15 15:59:02 2016 (r426176) +++ head/net/haproxy-devel/pkg-plist Tue Nov 15 19:34:41 2016 (r426177) @@ -1,6 +1,10 @@ man/man1/haproxy.1.gz sbin/halog sbin/haproxy +%%PORTDOCS%%%%DOCSDIR%%/51Degrees-device-detection.txt +%%PORTDOCS%%%%DOCSDIR%%/DeviceAtlas-device-detection.txt +%%PORTDOCS%%%%DOCSDIR%%/SPOE.txt +%%PORTDOCS%%%%DOCSDIR%%/WURFL-device-detection.txt %%PORTDOCS%%%%DOCSDIR%%/acl.fig %%PORTDOCS%%%%DOCSDIR%%/architecture.txt %%PORTDOCS%%%%DOCSDIR%%/close-options.txt @@ -94,3 +98,4 @@ sbin/haproxy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats_haproxy.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wurfl-example.cfg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611151934.uAFJYfIp021108>