aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/haproxy/Makefile10
-rw-r--r--net/haproxy/distinfo4
2 files changed, 7 insertions, 7 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 005a1622794..78f4a3b147c 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= haproxy
-PORTVERSION= 1.4.15
+PORTVERSION= 1.4.16
CATEGORIES= net www
MASTER_SITES= http://haproxy.1wt.eu/download/1.4/src/
MAINTAINER= freebsd@linepoint.com
COMMENT= The Reliable, High Performance TCP/HTTP Load Balancer
-CONFLICTS= haproxy-devel*
-
-LICENSE_COMB= multi
LICENSE= GPLv2 LGPL21
+LICENSE_COMB= multi
+
+CONFLICTS= haproxy-devel-[0-9]*
USE_RC_SUBR= haproxy
USE_GMAKE= YES
@@ -28,7 +28,7 @@ OPTIONS= PCRE "Use PCRE regex library" On\
.include <bsd.port.options.mk>
-MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS
+MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS CC=${CC}
.if defined(WITH_PCRE)
LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 7b8f6641896..ecb3141278a 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.4.15.tar.gz) = 4baebfe0a5a9220f77d9175b2e711dc8985bbb696d11c38033cc0e94e3cca93a
-SIZE (haproxy-1.4.15.tar.gz) = 812293
+SHA256 (haproxy-1.4.16.tar.gz) = ab789ced19db1462a815ffdd436edd7a2eeaf7cc2908b9253b3b01f659a9e2db
+SIZE (haproxy-1.4.16.tar.gz) = 813322