aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authordemon <demon@FreeBSD.org>2016-11-16 03:34:41 +0800
committerdemon <demon@FreeBSD.org>2016-11-16 03:34:41 +0800
commit80b07e107aa4e6d1c3f167174ac7db7e634b964c (patch)
tree00e6d75e88cd839cbc32d32a62877e1f4c145ad6 /net
parent90f8157321407134177f201d5b32d58d6638e313 (diff)
downloadfreebsd-ports-gnome-80b07e107aa4e6d1c3f167174ac7db7e634b964c.tar.gz
freebsd-ports-gnome-80b07e107aa4e6d1c3f167174ac7db7e634b964c.tar.zst
freebsd-ports-gnome-80b07e107aa4e6d1c3f167174ac7db7e634b964c.zip
Stricter check for FreeBSD version when openssl was updated to 1.0 (thanks danfe)
Fix plist; Mark BROKEN if libressl is detected (thanks jhale)
Diffstat (limited to 'net')
-rw-r--r--net/haproxy-devel/Makefile5
-rw-r--r--net/haproxy-devel/pkg-plist5
2 files changed, 9 insertions, 1 deletions
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