aboutsummaryrefslogtreecommitdiff
path: root/net/haproxy
diff options
context:
space:
mode:
authorDmitry Sivachenko <demon@FreeBSD.org>2019-03-26 10:49:06 +0000
committerDmitry Sivachenko <demon@FreeBSD.org>2019-03-26 10:49:06 +0000
commit6a2c3953d1985a28836a827451ec766b02a585b7 (patch)
treeb74032f43fd8999c035f437f12ab1455399e8d15 /net/haproxy
parentb134d1a4ac09a98483fb2d086954aa7f0180e0df (diff)
downloadports-6a2c3953d1985a28836a827451ec766b02a585b7.tar.gz
ports-6a2c3953d1985a28836a827451ec766b02a585b7.zip
Switch to 1.9 branch.
Notes
Notes: svn path=/head/; revision=496887
Diffstat (limited to 'net/haproxy')
-rw-r--r--net/haproxy/Makefile10
-rw-r--r--net/haproxy/distinfo6
-rw-r--r--net/haproxy/pkg-plist7
3 files changed, 11 insertions, 12 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 7914404bbf34..3163f1f3288f 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= haproxy
-DISTVERSION= 1.8.19
+DISTVERSION= 1.9.5
CATEGORIES= net www
-MASTER_SITES= http://www.haproxy.org/download/1.8/src/
+MASTER_SITES= http://www.haproxy.org/download/1.9/src/
MAINTAINER= demon@FreeBSD.org
COMMENT= Reliable, high performance TCP/HTTP load balancer
@@ -12,9 +12,9 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]*
+CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]*
-USES= cpe gmake
+USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
@@ -43,7 +43,7 @@ LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NA
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-MAKE_ARGS+= USE_REGPARM=1
+MAKE_ARGS+= USE_REGPARM=1
.endif
post-build:
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 9b3d43b3afb6..e0af9d1230fd 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549891502
-SHA256 (haproxy-1.8.19.tar.gz) = 64f5fbfd4e09ffeaf26cb6667398ba780704a14e96e60000caa8bf69962ba734
-SIZE (haproxy-1.8.19.tar.gz) = 2080757
+TIMESTAMP = 1553597298
+SHA256 (haproxy-1.9.5.tar.gz) = 407260ce65d7a16d93a037976712a8742985ce29360b6d5c187a849b6c0fbf8c
+SIZE (haproxy-1.9.5.tar.gz) = 2361844
diff --git a/net/haproxy/pkg-plist b/net/haproxy/pkg-plist
index 5c74a9ea5422..e60a375e5304 100644
--- a/net/haproxy/pkg-plist
+++ b/net/haproxy/pkg-plist
@@ -15,8 +15,6 @@ sbin/haproxy
%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt
%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt
%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/binding-possibilities.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/buffer-redesign.txt
-%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/buffers.fig
%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/config-language.txt
%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-reuse.txt
%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-sharing.txt
@@ -31,8 +29,7 @@ sbin/haproxy
%%PORTDOCS%%%%DOCSDIR%%/haproxy.1
%%PORTDOCS%%%%DOCSDIR%%/internals/acl.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/body-parsing.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/buffer-operations.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/buffer-ops.fig
+%%PORTDOCS%%%%DOCSDIR%%/internals/buffer-api.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
@@ -52,6 +49,7 @@ sbin/haproxy
%%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.fig
%%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.pdf
%%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/notes-layers.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.dia
%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.pdf
%%PORTDOCS%%%%DOCSDIR%%/internals/polling-states.fig
@@ -75,6 +73,7 @@ sbin/haproxy
%%PORTDOCS%%%%DOCSDIR%%/peers-v2.0.txt
%%PORTDOCS%%%%DOCSDIR%%/proxy-protocol.txt
%%PORTDOCS%%%%DOCSDIR%%/queuing.fig
+%%PORTDOCS%%%%DOCSDIR%%/regression-testing.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check