Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Jun 2019 10:45:21 +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: r504408 - in head/net: . haproxy haproxy-devel haproxy17 haproxy18 haproxy19
Message-ID:  <201906171045.x5HAjLQA079924@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Mon Jun 17 10:45:21 2019
New Revision: 504408
URL: https://svnweb.freebsd.org/changeset/ports/504408

Log:
  Update haproxy port to the latest release 2.0.0.
  Keep 1.9 branch in a separate port for a while.

Added:
  head/net/haproxy19/
     - copied from r504401, head/net/haproxy/
Modified:
  head/net/Makefile
  head/net/haproxy-devel/Makefile
  head/net/haproxy/Makefile
  head/net/haproxy/distinfo
  head/net/haproxy/pkg-plist
  head/net/haproxy17/Makefile
  head/net/haproxy18/Makefile
  head/net/haproxy19/Makefile

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Mon Jun 17 10:28:56 2019	(r504407)
+++ head/net/Makefile	Mon Jun 17 10:45:21 2019	(r504408)
@@ -230,6 +230,7 @@
     SUBDIR += haproxy-devel
     SUBDIR += haproxy17
     SUBDIR += haproxy18
+    SUBDIR += haproxy19
     SUBDIR += hexinject
     SUBDIR += hidentd
     SUBDIR += hinfo

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Mon Jun 17 10:28:56 2019	(r504407)
+++ head/net/haproxy-devel/Makefile	Mon Jun 17 10:45:21 2019	(r504408)
@@ -14,7 +14,7 @@ COMMENT=	Reliable, high performance TCP/HTTP load bala
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]*
 
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Mon Jun 17 10:28:56 2019	(r504407)
+++ head/net/haproxy/Makefile	Mon Jun 17 10:45:21 2019	(r504408)
@@ -1,10 +1,10 @@
-# Created by: Clement Laforet
+# Created by: Hugo Saro <hugo@barafranca.com>
 # $FreeBSD$
 
 PORTNAME=	haproxy
-DISTVERSION=	1.9.8
+DISTVERSION=	2.0.0
 CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/1.9/src/
+MASTER_SITES=	http://www.haproxy.org/download/2.0/src/
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Reliable, high performance TCP/HTTP load balancer
@@ -12,7 +12,7 @@ COMMENT=	Reliable, high performance TCP/HTTP load bala
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]*
+CONFLICTS_INSTALL=	haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]*
 
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy/distinfo
==============================================================================
--- head/net/haproxy/distinfo	Mon Jun 17 10:28:56 2019	(r504407)
+++ head/net/haproxy/distinfo	Mon Jun 17 10:45:21 2019	(r504408)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557759735
-SHA256 (haproxy-1.9.8.tar.gz) = 2d9a3300dbd871bc35b743a83caaf50fecfbf06290610231ca2d334fd04c2aee
-SIZE (haproxy-1.9.8.tar.gz) = 2376526
+TIMESTAMP = 1560768121
+SHA256 (haproxy-2.0.0.tar.gz) = fe0a0d69e1091066a91b8d39199c19af8748e0e872961c6fc43c91ec7a28ff20
+SIZE (haproxy-2.0.0.tar.gz) = 2527523

Modified: head/net/haproxy/pkg-plist
==============================================================================
--- head/net/haproxy/pkg-plist	Mon Jun 17 10:28:56 2019	(r504407)
+++ head/net/haproxy/pkg-plist	Mon Jun 17 10:45:21 2019	(r504408)
@@ -3,6 +3,7 @@ sbin/halog
 sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/51Degrees-device-detection.txt
 %%PORTDOCS%%%%DOCSDIR%%/DeviceAtlas-device-detection.txt
+%%PORTDOCS%%%%DOCSDIR%%/SOCKS4.protocol.txt
 %%PORTDOCS%%%%DOCSDIR%%/SPOE.txt
 %%PORTDOCS%%%%DOCSDIR%%/WURFL-device-detection.txt
 %%PORTDOCS%%%%DOCSDIR%%/acl.fig
@@ -74,14 +75,9 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/proxy-protocol.txt
 %%PORTDOCS%%%%DOCSDIR%%/queuing.fig
 %%PORTDOCS%%%%DOCSDIR%%/regression-testing.txt
+%%PORTDOCS%%%%DOCSDIR%%/seamless_reload.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/content-sw-sample.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2ansi
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debugfind
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/400.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/403.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/408.http
@@ -91,12 +87,7 @@ sbin/haproxy
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/504.http
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.init
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.spec
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.vim
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.haproxy
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/option-http_proxy.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/seamless_reload.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats_haproxy.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks4.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wurfl-example.cfg

Modified: head/net/haproxy17/Makefile
==============================================================================
--- head/net/haproxy17/Makefile	Mon Jun 17 10:28:56 2019	(r504407)
+++ head/net/haproxy17/Makefile	Mon Jun 17 10:45:21 2019	(r504408)
@@ -16,7 +16,7 @@ LICENSE_COMB=	multi
 BROKEN_mips=		fails to build: undefined reference to '__sync_sub_and_fetch_4'
 BROKEN_mips64=		fails to build: undefined reference to '__sync_sub_and_fetch_4'
 
-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]*
 
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy18/Makefile
==============================================================================
--- head/net/haproxy18/Makefile	Mon Jun 17 10:28:56 2019	(r504407)
+++ head/net/haproxy18/Makefile	Mon Jun 17 10:45:21 2019	(r504408)
@@ -13,7 +13,7 @@ COMMENT=	Reliable, high performance TCP/HTTP load bala
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy19-[0-9]*
 
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy19/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Mon Jun 17 08:36:27 2019	(r504401)
+++ head/net/haproxy19/Makefile	Mon Jun 17 10:45:21 2019	(r504408)
@@ -4,6 +4,7 @@
 PORTNAME=	haproxy
 DISTVERSION=	1.9.8
 CATEGORIES=	net www
+PKGNAMESUFFIX=	19
 MASTER_SITES=	http://www.haproxy.org/download/1.9/src/
 
 MAINTAINER=	demon@FreeBSD.org
@@ -12,7 +13,7 @@ COMMENT=	Reliable, high performance TCP/HTTP load bala
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]*
 
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy



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