From owner-svn-ports-all@freebsd.org Tue Feb 2 11:16:21 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C59FA99958; Tue, 2 Feb 2016 11:16:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E15A01152; Tue, 2 Feb 2016 11:16:20 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12BGJuW077901; Tue, 2 Feb 2016 11:16:19 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12BGJUD077899; Tue, 2 Feb 2016 11:16:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602021116.u12BGJUD077899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 2 Feb 2016 11:16:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407809 - head/net/haproxy-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Feb 2016 11:16:21 -0000 Author: amdmi3 Date: Tue Feb 2 11:16:19 2016 New Revision: 407809 URL: https://svnweb.freebsd.org/changeset/ports/407809 Log: - Add missing documentation file - Sort plist - Switch to CONFLICTS_INSTALL Approved by: portmgr blanket MFH: 2016Q1 (blanket) Modified: head/net/haproxy-devel/Makefile head/net/haproxy-devel/pkg-plist Modified: head/net/haproxy-devel/Makefile ============================================================================== --- head/net/haproxy-devel/Makefile Tue Feb 2 11:14:57 2016 (r407808) +++ head/net/haproxy-devel/Makefile Tue Feb 2 11:16:19 2016 (r407809) @@ -3,6 +3,7 @@ PORTNAME= haproxy DISTVERSION= 1.7-dev1 +PORTREVISION= 1 CATEGORIES= net www MASTER_SITES= http://haproxy.1wt.eu/download/1.7/src/devel/ PKGNAMESUFFIX= -devel @@ -14,7 +15,7 @@ COMMENT= Reliable, high performance TCP/ LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS= haproxy-[1234567890]\* +CONFLICTS_INSTALL= haproxy-[1234567890]\* USES= cpe gmake USE_RC_SUBR= haproxy Modified: head/net/haproxy-devel/pkg-plist ============================================================================== --- head/net/haproxy-devel/pkg-plist Tue Feb 2 11:14:57 2016 (r407808) +++ head/net/haproxy-devel/pkg-plist Tue Feb 2 11:16:19 2016 (r407809) @@ -7,11 +7,6 @@ sbin/haproxy %%PORTDOCS%%%%DOCSDIR%%/coding-style.txt %%PORTDOCS%%%%DOCSDIR%%/configuration.txt %%PORTDOCS%%%%DOCSDIR%%/cookie-options.txt -%%PORTDOCS%%%%DOCSDIR%%/gpl.txt -%%PORTDOCS%%%%DOCSDIR%%/haproxy.1 -%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt -%%PORTDOCS%%%%DOCSDIR%%/proxy-protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/queuing.fig %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends-v0.txt %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt @@ -24,10 +19,12 @@ sbin/haproxy %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/dynamic-buffers.txt %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/entities-v2.txt %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http2.txt +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/rate-shaping.txt %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt +%%PORTDOCS%%%%DOCSDIR%%/gpl.txt +%%PORTDOCS%%%%DOCSDIR%%/haproxy.1 %%PORTDOCS%%%%DOCSDIR%%/internals/acl.txt %%PORTDOCS%%%%DOCSDIR%%/internals/body-parsing.txt %%PORTDOCS%%%%DOCSDIR%%/internals/buffer-operations.txt @@ -35,11 +32,11 @@ sbin/haproxy %%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt %%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt %%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/entities-v2.txt %%PORTDOCS%%%%DOCSDIR%%/internals/entities.fig %%PORTDOCS%%%%DOCSDIR%%/internals/entities.pdf %%PORTDOCS%%%%DOCSDIR%%/internals/entities.svg %%PORTDOCS%%%%DOCSDIR%%/internals/entities.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/entities-v2.txt %%PORTDOCS%%%%DOCSDIR%%/internals/hashing.txt %%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt %%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt @@ -58,14 +55,18 @@ sbin/haproxy %%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt %%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig %%PORTDOCS%%%%DOCSDIR%%/intro.txt +%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt %%PORTDOCS%%%%DOCSDIR%%/linux-syn-cookies.txt %%PORTDOCS%%%%DOCSDIR%%/lua-api/Makefile %%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.fig %%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.png %%PORTDOCS%%%%DOCSDIR%%/lua-api/conf.py %%PORTDOCS%%%%DOCSDIR%%/lua-api/index.rst +%%PORTDOCS%%%%DOCSDIR%%/lua.txt %%PORTDOCS%%%%DOCSDIR%%/management.txt %%PORTDOCS%%%%DOCSDIR%%/network-namespaces.txt +%%PORTDOCS%%%%DOCSDIR%%/proxy-protocol.txt +%%PORTDOCS%%%%DOCSDIR%%/queuing.fig %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/check @@ -74,6 +75,14 @@ sbin/haproxy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2ansi %%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/debugfind +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/400.http +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/403.http +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/408.http +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/500.http +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/502.http +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/503.http +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/504.http +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.init %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.spec %%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.vim @@ -83,11 +92,3 @@ sbin/haproxy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats_haproxy.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/400.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/403.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/408.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/500.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/502.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/503.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/504.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README