Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Mar 2019 10:49:06 +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: r496887 - head/net/haproxy
Message-ID:  <201903261049.x2QAn6h2040456@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Tue Mar 26 10:49:06 2019
New Revision: 496887
URL: https://svnweb.freebsd.org/changeset/ports/496887

Log:
  Switch to 1.9 branch.

Modified:
  head/net/haproxy/Makefile
  head/net/haproxy/distinfo
  head/net/haproxy/pkg-plist

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Tue Mar 26 10:47:20 2019	(r496886)
+++ head/net/haproxy/Makefile	Tue Mar 26 10:49:06 2019	(r496887)
@@ -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 bala
 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_LI
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
-MAKE_ARGS+=     USE_REGPARM=1
+MAKE_ARGS+=	USE_REGPARM=1
 .endif
 
 post-build:

Modified: head/net/haproxy/distinfo
==============================================================================
--- head/net/haproxy/distinfo	Tue Mar 26 10:47:20 2019	(r496886)
+++ head/net/haproxy/distinfo	Tue Mar 26 10:49:06 2019	(r496887)
@@ -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

Modified: head/net/haproxy/pkg-plist
==============================================================================
--- head/net/haproxy/pkg-plist	Tue Mar 26 10:47:20 2019	(r496886)
+++ head/net/haproxy/pkg-plist	Tue Mar 26 10:49:06 2019	(r496887)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903261049.x2QAn6h2040456>