Bug 144331 - [Patch][Maintainer Update] net/haproxy: v1.2.18 -> v1.4.0
Summary: [Patch][Maintainer Update] net/haproxy: v1.2.18 -> v1.4.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Wen Heping
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-02-26 21:40 UTC by Ross West
Modified: 2010-03-16 01:41 UTC (History)
0 users

See Also:


Attachments
file.diff (14.30 KB, patch)
2010-02-26 21:40 UTC, Ross West
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ross West 2010-02-26 21:40:02 UTC
Large update for net/haproxy port!

- Patch to update net/haproxy software from legacy v1.2.18 stable branch to new stable branch v1.4.0.   This leapfrogs port net/haproxy-devel, which is currently tracking v1.3.x branch (maintained by different person).

- Updates Maintainer from generic ports@freebsd.org to myself (freebsd@linepoint.com)

- Changed rc.d file provided (also haproxy.sh -> haproxy)

Fix: See attached patchfile

Patch attached with submission follows:
Comment 1 Joris Dedieu 2010-02-27 09:37:55 UTC
Hi,
I think this port should be moved into net/haproxy14  and
net/haproxy-devel  moved into net/haproxy13
Has it we have possibility to maintain serveral versions in port tree
(next one may be net/haproxy15-devel)
like things are done for tomcat, postgresql ...

Joris
Comment 2 wenheping 2010-02-28 00:34:18 UTC
My suggestions is :

1 repocopy net/haproxy --> net/haproxy12
2 repocopy net/haproxy-devel --> net/haproxy13
3 repocopy net/haproxy-devel --> net/haproxy14

Do you agree ?


wen
Comment 3 Wen Heping freebsd_committer freebsd_triage 2010-02-28 00:41:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wen

I'll take it.
Comment 4 Joris Dedieu 2010-02-28 10:22:45 UTC
>My suggestions is :
>
>1 repocopy net/haproxy --> net/haproxy12
>2 repocopy net/haproxy-devel --> net/haproxy13
>3 repocopy net/haproxy-devel --> net/haproxy14

>Do you agree ?

Yes it's clear and if MOVED is ok portupgrade will
work fine

Joris
Comment 5 Ross West 2010-02-28 19:24:00 UTC
Do we want to maintain 3 different versions of haproxy, when really
only one will have active development and the others only bug fixes?

v1.2.x hasn't been updated since May 2008 (status: critical bug fixes
only), v1.3.x will be in the same state shortly (as per the website) now
that v1.4.x is the new stable/active version.

If anything, only 2 versions should be tracked at the most - v1.3.x
and v1.4.x.  (which would correspond to the net/haproxy-devel and
net/haproxy ports respectively)

But, if the consensus is to do the repocopies as suggested, I'll
regenerate the patches for each port once it's completed.

--=20

 =20
Comment 6 wenheping 2010-02-28 22:41:52 UTC
Then , how about this way ?

1 no REPOCOPY
2 update net/haproxy to 1.4
3 set net/haproxy-devel to IGNORE and update it to 1.5 when ready.


Regards,
wen
Comment 7 Ross West 2010-03-01 17:18:28 UTC
> 1 no REPOCOPY
> 2 update net/haproxy to 1.4
> 3 set net/haproxy-devel to IGNORE and update it to 1.5 when ready.

Sounds good to me.

R.

--=20

 =20
Comment 8 Ross West 2010-03-05 18:19:37 UTC
Below is a newly generated diff file that will update haproxy from
v1.2.18 to v1.4.1.  This fixes the compile issue seen with Freebsd v7.0
and below, and also includes an updated rc.d file (fixes a bug).

-=3D start
diff -ruN --exclude=3DCVS /usr/ports/net/haproxy.1.2.18/Makefile /usr/por=
ts/net/haproxy/Makefile
--- /usr/ports/net/haproxy.1.2.18/Makefile      2010-02-26 16:08:04.00000=
0000 -0500
+++ /usr/ports/net/haproxy/Makefile     2010-03-05 13:04:15.000000000 -05=
00
@@ -6,57 +6,47 @@
 #

 PORTNAME=3D      haproxy
-PORTVERSION=3D   1.2.18
+PORTVERSION=3D   1.4.1
 CATEGORIES=3D    net www
-MASTER_SITES=3D  http://haproxy.1wt.eu/download/1.2/src/
+MASTER_SITES=3D  http://haproxy.1wt.eu/download/1.4/src/

-MAINTAINER=3D    ports@FreeBSD.org
-COMMENT=3D       High-performance and highly-robust TCP/HTTP load balanc=
er
+MAINTAINER=3D    freebsd@linepoint.com
+COMMENT=3D       The Reliable, High Performance TCP/HTTP Load Balancer

-USE_RC_SUBR=3D   haproxy.sh
+USE_RC_SUBR=3D   haproxy
+USE_GMAKE=3D     YES
+SUB_FILES=3D     pkg-message
+MAN1=3D          haproxy.1

-STATS_INTERVAL?=3D       0
-CFLAGS+=3D       -DSTATTIME=3D${STATS_INTERVAL}
+OPTIONS=3D       PCRE            "Use PCRE regex library"        On\
+               STATIC_PCRE     "Use static PCRE regex library" Off

-.if defined(WITH_TPROXY)
-CFLAGS+=3D       -DTPROXY
-.endif
+.include <bsd.port.options.mk>
+
+MAKE_ARGS=3D     "TARGET=3Dfreebsd"

 .if defined(WITH_PCRE)
-PKGNAMESUFFIX=3D -pcre
 LIB_DEPENDS+=3D  pcre.0:${PORTSDIR}/devel/pcre
-MAKE_ENV+=3D     "REGEX=3Dpcre"
-CFLAGS+=3D       -DUSE_PCRE -I${LOCALBASE}/include
-LDFLAGS+=3D      -L${LOCALBASE}/lib -lpcreposix -lpcre
+MAKE_ARGS+=3D    "USE_PCRE=3D1"
 .endif

-.if defined(WITH_SMALLOPTS)
-CFLAGS+=3D       -DBUFSIZE=3D8030 -DMAXREWRITE=3D1030 -DSYSTEM_MAXCONN=3D=
1024
+.if defined(WITH_STATIC_PCRE)
+LIB_DEPENDS+=3D  pcre.0:${PORTSDIR}/devel/pcre
+MAKE_ARGS+=3D    "USE_STATIC_PCRE=3D1"
 .endif

-MAKEFILE=3D      Makefile.bsd
-
-pre-everything::
-       @${ECHO_MSG} ""
-       @${ECHO_MSG} "Available options:"
-       @${ECHO_MSG} "WITH_PCRE:            Use pcre regex engine"
-       @${ECHO_MSG} "WITH_TPROXY:         Enable Transparent proxy suppo=
rt"
-       @${ECHO_MSG} "WITH_SMALLOPTS:         Enable low memory footprint=
 support"
-       @${ECHO_MSG} "STATS_INTERVAL=3D###:   Statistics interval in mill=
iseconds,"
-       @${ECHO_MSG} "                         (default to 0, disabled)"
-       @${ECHO_MSG} ""
-
 do-install:
-       @${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
+       @${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin/
+       @${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${MAN1PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
        @${MKDIR} ${DOCSDIR}
+       (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
        @${MKDIR} ${EXAMPLESDIR}
-       @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-       @${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
-                       ${EXAMPLESDIR}/haproxy.cfg
+       (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif

 post-install:
        @${CAT} ${PKGMESSAGE}

+
 .include <bsd.port.mk>
diff -ruN --exclude=3DCVS /usr/ports/net/haproxy.1.2.18/distinfo /usr/por=
ts/net/haproxy/distinfo
--- /usr/ports/net/haproxy.1.2.18/distinfo      2008-08-31 16:09:58.00000=
0000 -0400
+++ /usr/ports/net/haproxy/distinfo     2010-03-05 13:05:31.000000000 -05=
00
@@ -1,3 +1,3 @@
-MD5 (haproxy-1.2.18.tar.gz) =3D aa1884cbbb22fab2e8ff0beb37db1f8b
-SHA256 (haproxy-1.2.18.tar.gz) =3D e0ef06180fae5e3a96712b86486788a0f9614=
59640fd94d99389548df50aa9c0
-SIZE (haproxy-1.2.18.tar.gz) =3D 206287
+MD5 (haproxy-1.4.1.tar.gz) =3D 7f27c2dec3d67fce1b113be5fe878c33
+SHA256 (haproxy-1.4.1.tar.gz) =3D 7f13346d9790c07e64133d3c6eccf72817c627=
da29aaba67814b6defea6cf1b3
+SIZE (haproxy-1.4.1.tar.gz) =3D 757025
diff -ruN --exclude=3DCVS /usr/ports/net/haproxy.1.2.18/files/haproxy.in =
/usr/ports/net/haproxy/files/haproxy.in
--- /usr/ports/net/haproxy.1.2.18/files/haproxy.in      1969-12-31 19:00:=
00.000000000 -0500
+++ /usr/ports/net/haproxy/files/haproxy.in     2010-03-05 13:01:31.00000=
0000 -0500
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# PROVIDE: haproxy
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+#######
+#
+# Add the following lines to /etc/rc.conf to enable haproxy:
+#
+# haproxy_enable (bool):       default: "NO"
+#                              Set to "YES" to enable haproxy
+# haproxy_pidfile (str):       default: /var/run/${name}.pid
+#                              Set to the full path of the pid file
+# haproxy_config (str):                default: /usr/local/etc/${name}.c=
onf
+#                              Set to the full path of the config file
+# haproxy_flags (str):         default: Autogenerated using pidfile and =
config options
+#                              Set to override with your own options
+#
+#######
+#
+# rc.d Script Runtime Options:
+#
+# start                - starts application normally
+# stop         - (softstop) stops all proxies and exits once all session=
s are closed
+# forcestop    - (immediate) stops all proxies and kills active sessions
+# reload       - hot-reconfig using "-sf" option (active sessions kept)
+# forcereload  - hot-reconfig using "-st" option (active sessions killed=
)
+# restart      - equiv to "stop" then "start"
+# checkconfig  - checks configuration file defined in haproxy_config
+#
+#######
+
+. %%RC_SUBR%%
+
+name=3D"haproxy"
+rcvar=3D`set_rcvar`
+command=3D"%%PREFIX%%/sbin/haproxy"
+
+# Load Configs/Set Defaults
+load_rc_config $name
+: ${haproxy_enable:=3D"NO"}
+: ${haproxy_config:=3D"%%PREFIX%%/etc/${name}.conf"}
+: ${haproxy_pidfile:=3D"/var/run/${name}.pid"}
+: ${haproxy_flags=3D"-q -f ${haproxy_config} -p ${haproxy_pidfile}"}
+
+# Update the globals
+pidfile=3D${haproxy_pidfile}
+required_files=3D${haproxy_config}
+
+# Commands: start, stop, restart, reload, checkconfig
+extra_commands=3D"reload checkconfig"
+
+checkconfig_cmd=3D"haproxy_checkconfig"
+reload_cmd=3D"haproxy_reload"
+
+haproxy_reload()
+{
+       # Check configuration file quietly first
+       ${command} -q -c -f ${haproxy_config}
+       if [ $? -ne 0 ]; then
+               echo "Error found in ${haproxy_config} - not reloading cu=
rrent process!"
+               return
+       fi
+       rc_pid=3D$(check_pidfile ${haproxy_pidfile} ${command})
+       if [ $rc_pid ]; then
+               if [ $rc_force ]; then
+                       ${command} ${haproxy_flags} -st ${rc_pid}
+               else
+                       ${command} ${haproxy_flags} -sf ${rc_pid}
+               fi
+       else
+               echo "No process found.  Maybe $command isn't running?"
+       fi
+}
+
+haproxy_checkconfig()
+{
+       ${command} -c -f ${haproxy_config}
+}
+
+haproxy_prestart()
+{
+       ${command} -q -c -f ${haproxy_config}
+       rc_flags=3D${haproxy_flags}
+}
+
+haproxy_prestop()
+{
+       # SIGUSR1 =3D softstop, SIGTERM =3D faststop
+       if [ $rc_force ]; then
+               sig_stop=3D"SIGTERM"
+       else
+               sig_stop=3D"SIGUSR1"
+       fi
+}
+
+
+run_rc_command "$1"
diff -ruN --exclude=3DCVS /usr/ports/net/haproxy.1.2.18/files/haproxy.sh.=
in /usr/ports/net/haproxy/files/haproxy.sh.in
--- /usr/ports/net/haproxy.1.2.18/files/haproxy.sh.in   2006-11-01 09:42:=
14.000000000 -0500
+++ /usr/ports/net/haproxy/files/haproxy.sh.in  1969-12-31 19:00:00.00000=
0000 -0500
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/haproxy/files/haproxy.sh.in,v 1.1 2006/11/01 14:42=
:14 clement Exp $
-#
-
-# PROVIDE: haproxy
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable haproxy:
-# haproxy_enable (bool):      Set to "NO" by default.
-#                             Set it to "YES" to enable haproxy
-# haproxylimits_enable (bool):Set to "NO" by default.
-#                             Set it to yes to run `limits $limits_args`
-#                             just before haproxy starts.
-# haproxy_flags (str):        Set to "" by default.
-#                             Extra flags passed to start command
-# haproxylimits_args (str):   Default to "-e -C daemon"
-#                             Arguments of pre-start limits run.
-#
-. %%RC_SUBR%%
-
-name=3D"haproxy"
-rcvar=3D`set_rcvar`
-
-command=3D"%%PREFIX%%/sbin/haproxy"
-pidfile=3D"/var/run/haproxy.pid"
-required_files=3D%%PREFIX%%/etc/haproxy.conf
-
-[ -z "$haproxy_enable" ]       && haproxy_enable=3D"NO"
-[ -z "$haproxy_flags" ]        && haproxy_flags=3D"-p ${pidfile} -f /usr=
/local/etc/haproxy.conf"
-[ -z "$haproxylimits_enable" ] && haproxylimits_enable=3D"NO"
-[ -z "$haproxylimits_args" ]   && haproxylimits_args=3D"-e -C daemon"
-
-load_rc_config $name
-
-checkyesno haproxylimits_enable && \
-                       start_precmd=3D"eval `/usr/bin/limits ${haproxyli=
mits_args}` 2>/dev/null"
-
-sig_gracefulstop=3DSIGUSR1
-
-haproxy_gracefulstop() {
-       echo "Gracefully shutdown haproxy ($rc_pid)"
-       kill -${sig_gracefulstop} ${rc_pid}
-       }
-
-extra_commands=3D"gracefulstop"
-run_rc_command "$1"
diff -ruN --exclude=3DCVS /usr/ports/net/haproxy.1.2.18/files/patch-Makef=
ile.bsd /usr/ports/net/haproxy/files/patch-Makefile.bsd
--- /usr/ports/net/haproxy.1.2.18/files/patch-Makefile.bsd      2007-08-1=
2 11:45:08.000000000 -0400
+++ /usr/ports/net/haproxy/files/patch-Makefile.bsd     1969-12-31 19:00:=
00.000000000 -0500
@@ -1,85 +0,0 @@
---- ./Makefile.bsd.orig        2007-03-18 05:04:39.000000000 +0800
-+++ ./Makefile.bsd     2007-07-24 20:38:01.803049803 +0800
-@@ -5,22 +5,22 @@
- TARGET =3D openbsd
-
- # pass CPU=3D<cpu_name> to make to optimize for a particular CPU
--CPU =3D generic
-+#CPU =3D generic
- #CPU =3D i586
- #CPU =3D i686
- #CPU =3D ultrasparc
-
- # By default, we use libc's regex. WARNING! On Solaris 8/Sparc, group
- # references seem broken using libc ! Use pcre instead.
--REGEX=3Dlibc
-+REGEX?=3Dlibc
- #REGEX=3Dpcre
- #REGEX=3Dstatic-pcre
-
- # tools options
--CC =3D gcc
--LD =3D gcc
-+CC?=3D gcc
-+LD?=3D gcc
-
--PCREDIR=3D/usr/local
-+PCREDIR=3D${LOCALBASE}
-
- # This is for OpenBSD 3.0
- COPTS.openbsd =3D -DENABLE_POLL
-@@ -46,7 +46,7 @@
-
- # you can enable debug arguments with "DEBUG=3D-g" or disable them with=
 "DEBUG=3D"
- #DEBUG =3D -g -DDEBUG_MEMORY -DDEBUG_FULL
--DEBUG =3D -g
-+#DEBUG =3D -g
-
- # if small memory footprint is required, you can reduce the buffer size=
. There
- # are 2 buffers per concurrent session, so 16 kB buffers will eat 32 MB=
 memory
-@@ -54,7 +54,7 @@
- # will avoid the additionnal paramters to overflow a page. 8030 bytes i=
s
- # exactly 5.5 TCP segments of 1460 bytes.
- #SMALL_OPTS =3D
--SMALL_OPTS =3D -DBUFSIZE=3D8030 -DMAXREWRITE=3D1030 -DSYSTEM_MAXCONN=3D=
1024
-+#SMALL_OPTS =3D -DBUFSIZE=3D8030 -DMAXREWRITE=3D1030 -DSYSTEM_MAXCONN=3D=
1024
-
- # redefine this if you want to add some special PATH to include/libs
- ADDINC =3D
-@@ -65,7 +65,7 @@
- # - use -DSTATTIME=3D0 to disable statistics, else specify an interval =
in
- #   milliseconds.
- # - use -DTPROXY to compile with transparent proxy support.
--DEFINE =3D -DSTATTIME=3D0 -DTPROXY
-+#DEFINE =3D -DSTATTIME=3D0 -DTPROXY
-
- # global options
- TARGET_OPTS=3D$(COPTS.$(TARGET))
-@@ -75,14 +75,14 @@
- COPTS=3D-I. $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) $(SMALL_=
OPTS) $(DEFINE)
- LIBS=3D$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
-
--CFLAGS =3D -Wall $(COPTS) $(DEBUG)
--LDFLAGS =3D -g
-+CFLAGS+=3D -Wall $(COPTS)
-+LDFLAGS+=3D #-g /lib/crt0.o  -lc
-
- all: haproxy
-
- haproxy: src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o \
-        src/uri_auth.o src/rbtree.o
--      $(LD) $(LDFLAGS) -o $@ $> $(LIBS)
-+      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS)
-
- src/base64.o: src/base64.c
-       $(CC) $(CFLAGS) -c -o $@ $<
-@@ -99,6 +99,9 @@
- src/hashpjw.o:        src/hashpjw.c
-       $(CC) $(CFLAGS) -c -o $@ $<
-
-+src/rbtree.o: src/rbtree.c
-+      $(CC) $(CFLAGS) -c -o $@ $<
-+
- haproxy.o:    haproxy.c
-       $(CC) $(CFLAGS) -c -o $@ $<
-
diff -ruN --exclude=3DCVS /usr/ports/net/haproxy.1.2.18/files/pkg-message=
.in /usr/ports/net/haproxy/files/pkg-message.in
--- /usr/ports/net/haproxy.1.2.18/files/pkg-message.in  1969-12-31 19:00:=
00.000000000 -0500
+++ /usr/ports/net/haproxy/files/pkg-message.in 2010-03-05 12:38:08.00000=
0000 -0500
@@ -0,0 +1,12 @@
+
+*************************************************
+*  Congratulations!  Haproxy is now installed.  *
+*************************************************
+
+Check the following directories for further info:
+  documentation:  '%%DOCSDIR%%/haproxy'
+  examples:       '%%EXAMPLESDIR%%/haproxy'
+
+rc.conf variables listing can be found in:
+  '%%PREFIX%%/etc/rc.d/haproxy'
+
diff -ruN --exclude=3DCVS /usr/ports/net/haproxy.1.2.18/pkg-descr /usr/po=
rts/net/haproxy/pkg-descr
--- /usr/ports/net/haproxy.1.2.18/pkg-descr     2006-09-24 06:56:30.00000=
0000 -0400
+++ /usr/ports/net/haproxy/pkg-descr    2010-03-05 09:53:55.000000000 -05=
00
@@ -1,8 +1,6 @@
-HAproxy is a high-performance and highly-robust TCP/HTTP load balancer w=
hich
-provides cookie-based persistence, automatic failover, header insertion,
-deletion, modification on the fly, advanced logging contents to help tro=
uble-
-shooting buggy applications and/or networks, and a few other features. I=
t uses
-its own state machine to achieve up to ten thousands hits per second on =
modern
-hardware, even with thousands simultaneous connections.
+HAProxy is a free, very fast and reliable solution offering high
+availability, load balancing, and proxying for TCP and HTTP-based
+applications. It is particularly suited for web sites crawling under
+very high loads while needing persistence or Layer7 processing.

 WWW: http://haproxy.1wt.eu/
diff -ruN --exclude=3DCVS /usr/ports/net/haproxy.1.2.18/pkg-message /usr/=
ports/net/haproxy/pkg-message
--- /usr/ports/net/haproxy.1.2.18/pkg-message   2004-06-08 06:31:00.00000=
0000 -0400
+++ /usr/ports/net/haproxy/pkg-message  1969-12-31 19:00:00.000000000 -05=
00
@@ -1,3 +0,0 @@
-=3D=3D=3D>  BE CAREFULL HOW TO BOOT on 1.1.28 or after:
-       To run haproxy from startup, add haproxy_enable=3D"YES" in your
-       /etc/rc.conf.
diff -ruN --exclude=3DCVS /usr/ports/net/haproxy.1.2.18/pkg-plist /usr/po=
rts/net/haproxy/pkg-plist
--- /usr/ports/net/haproxy.1.2.18/pkg-plist     2006-11-03 03:27:13.00000=
0000 -0500
+++ /usr/ports/net/haproxy/pkg-plist    2010-03-05 13:02:15.000000000 -05=
00
@@ -1,7 +1,70 @@
 sbin/haproxy
+%%PORTDOCS%%%%DOCSDIR%%/acl.fig
 %%PORTDOCS%%%%DOCSDIR%%/architecture.txt
+%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends-v0.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/buffers.fig
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/config-language.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/cttproxy-changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt
+%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
 %%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt
 %%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.cfg
+%%PORTDOCS%%%%DOCSDIR%%/haproxy.1
+%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig
+%%PORTDOCS%%%%DOCSDIR%%/internals/todo.cttproxy
+%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt
+%%PORTDOCS%%%%DOCSDIR%%/queuing.fig
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/acl-content-sw.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/auth.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/build.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/check
+%%PORTDOCS%%%%EXAMPLESDIR%%/check.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/config.rc.haproxy
+%%PORTDOCS%%%%EXAMPLESDIR%%/content-sw-sample.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/cttproxy-src.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/debug2ansi
+%%PORTDOCS%%%%EXAMPLESDIR%%/debug2html
+%%PORTDOCS%%%%EXAMPLESDIR%%/debugfind
+%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/400.http
+%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/403.http
+%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/408.http
+%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/500.http
+%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/502.http
+%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/503.http
+%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/504.http
+%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy-1.1.21-flx.1.pkg
+%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.init
+%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.spec
+%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.vim
+%%PORTDOCS%%%%EXAMPLESDIR%%/init.haproxy
+%%PORTDOCS%%%%EXAMPLESDIR%%/init.haproxy.flx0
+%%PORTDOCS%%%%EXAMPLESDIR%%/linux-2.4.21-40.EL-custom.diff
+%%PORTDOCS%%%%EXAMPLESDIR%%/option-http_proxy.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/rc.highsock
+%%PORTDOCS%%%%EXAMPLESDIR%%/stats_haproxy.sh
+%%PORTDOCS%%%%EXAMPLESDIR%%/tarpit.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/test-section-kw.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/url-switching.cfg
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/errorfiles
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%

-=3D end


--=20

 =20
Comment 9 dfilter service freebsd_committer freebsd_triage 2010-03-16 01:39:54 UTC
wen         2010-03-16 01:39:45 UTC

  FreeBSD ports repository

  Modified files:
    net/haproxy          Makefile distinfo pkg-descr pkg-plist 
  Added files:
    net/haproxy/files    haproxy.in pkg-message.in 
  Removed files:
    net/haproxy          pkg-message 
    net/haproxy/files    haproxy.sh.in patch-Makefile.bsd 
  Log:
  - Update to 1.4.1
  - Pass maintainer to submitter
  
  PR:             ports/144331
  Submitted by:   Ross West <freebsd@linepoint.com> (new maintainer)
  
  Revision  Changes    Path
  1.22      +21 -32    ports/net/haproxy/Makefile
  1.19      +3 -3      ports/net/haproxy/distinfo
  1.1       +99 -0     ports/net/haproxy/files/haproxy.in (new)
  1.2       +0 -50     ports/net/haproxy/files/haproxy.sh.in (dead)
  1.3       +0 -85     ports/net/haproxy/files/patch-Makefile.bsd (dead)
  1.1       +12 -0     ports/net/haproxy/files/pkg-message.in (new)
  1.3       +4 -6      ports/net/haproxy/pkg-descr
  1.2       +0 -3      ports/net/haproxy/pkg-message (dead)
  1.7       +64 -1     ports/net/haproxy/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 10 Wen Heping freebsd_committer freebsd_triage 2010-03-16 01:41:11 UTC
State Changed
From-To: open->closed

Committed. Thanks!