svn commit: r407811 - branches/2016Q1/net/haproxy-devel
Dmitry Marakasov
amdmi3 at FreeBSD.org
Tue Feb 2 11:18:10 UTC 2016
Author: amdmi3
Date: Tue Feb 2 11:18:08 2016
New Revision: 407811
URL: https://svnweb.freebsd.org/changeset/ports/407811
Log:
MFH: r407809
- Add missing documentation file
- Sort plist
- Switch to CONFLICTS_INSTALL
Approved by: portmgr blanket
Approved by: ports-secteam blanket
Modified:
branches/2016Q1/net/haproxy-devel/Makefile
branches/2016Q1/net/haproxy-devel/pkg-plist
Directory Properties:
branches/2016Q1/ (props changed)
Modified: branches/2016Q1/net/haproxy-devel/Makefile
==============================================================================
--- branches/2016Q1/net/haproxy-devel/Makefile Tue Feb 2 11:17:17 2016 (r407810)
+++ branches/2016Q1/net/haproxy-devel/Makefile Tue Feb 2 11:18:08 2016 (r407811)
@@ -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: branches/2016Q1/net/haproxy-devel/pkg-plist
==============================================================================
--- branches/2016Q1/net/haproxy-devel/pkg-plist Tue Feb 2 11:17:17 2016 (r407810)
+++ branches/2016Q1/net/haproxy-devel/pkg-plist Tue Feb 2 11:18:08 2016 (r407811)
@@ -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
More information about the svn-ports-branches
mailing list