From 51a8fbbbf379bf7c0fe1c247cac1bbe435d0f042 Mon Sep 17 00:00:00 2001 From: Dmitry Sivachenko Date: Tue, 15 Nov 2016 19:34:41 +0000 Subject: [PATCH] Stricter check for FreeBSD version when openssl was updated to 1.0 (thanks danfe) Fix plist; Mark BROKEN if libressl is detected (thanks jhale) --- net/haproxy-devel/Makefile | 5 ++++- net/haproxy-devel/pkg-plist | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index 17bdedd2f8ad..a250c14ae5b3 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -62,9 +62,12 @@ IGNORE?= enable PCRE support to use DeviceAtlas .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} diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist index 9f493673c7e5..f1af4744412e 100644 --- a/net/haproxy-devel/pkg-plist +++ b/net/haproxy-devel/pkg-plist @@ -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