here's patch. ok, yours port is more elegant in some sense. I'll have a more closer look at it. I taken USE_GROFF from haproxy-1.3, didn't investigate wether it is required or not. HAPROXYCONF also looks more elegant.
diff -u -r haproxy.yours/distinfo haproxy.mine/distinfo --- haproxy.yours/distinfo 2012-08-27 19:03:06.000000000 +0600 +++ haproxy.mine/distinfo 2012-10-14 14:01:32.191913712 +0600 @@ -1,2 +1,5 @@ -SHA256 (haproxy-1.4.21.tar.gz) = bihXXwSS3vMcMx+vnq0IIl3WIVMzSIBoj4p8R3yMMaQ= -SIZE (haproxy-1.4.21.tar.gz) = 827392 +MD5 (haproxy-1.4.22.tar.gz) = oLAHx29qeFJPOz3V5wSXnA== +RMD160 (haproxy-1.4.22.tar.gz) = /J7kyWRoPun0Xq7SYprh6ecNKM4= +SHA1 (haproxy-1.4.22.tar.gz) = 7YkYyVC9tbS5bWLCMHO3lyRD/pQ= +SHA256 (haproxy-1.4.22.tar.gz) = uiIbPqpNcSMyMLFWwwAPXCvU2s6U2SZiNVF/5C+Rf8Y= +SIZE (haproxy-1.4.22.tar.gz) = 831791 diff -u -r haproxy.yours/Makefile haproxy.mine/Makefile --- haproxy.yours/Makefile 2012-08-27 19:03:06.000000000 +0600 +++ haproxy.mine/Makefile 2012-10-14 14:01:32.184913710 +0600 @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2012/08/27 13:03:06 gonzalo Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:33 espie Exp $ COMMENT = reliable, high performance TCP/HTTP load balancer -DISTNAME = haproxy-1.4.21 +DISTNAME = haproxy-1.4.22 CATEGORIES = net www HOMEPAGE = http://haproxy.1wt.eu/ @@ -28,6 +28,7 @@ MAKE_FILE = Makefile.bsd MAKE_FLAGS += CC="${CC}" LD="${CC}" +USE_GROFF = Yes NO_REGRESS = Yes LIB_DEPENDS = devel/pcre diff -u -r haproxy.yours/patches/patch-Makefile_bsd haproxy.mine/patches/patch-Makefile_bsd --- haproxy.yours/patches/patch-Makefile_bsd 2012-08-27 19:03:06.000000000 +0600 +++ haproxy.mine/patches/patch-Makefile_bsd 2012-10-14 14:01:32.207913710 +0600 @@ -1,7 +1,6 @@ -$OpenBSD: patch-Makefile_bsd,v 1.2 2012/08/27 13:03:06 gonzalo Exp $ ---- Makefile.bsd.orig Mon May 21 02:03:24 2012 -+++ Makefile.bsd Fri Aug 10 10:12:34 2012 -@@ -20,13 +20,13 @@ CPU = generic +--- Makefile.bsd.orig Fri Sep 16 17:02:05 2011 ++++ Makefile.bsd Tue Dec 6 22:01:49 2011 +@@ -20,13 +20,13 @@ # By default, we use libc's regex. WARNING! On Solaris 8/Sparc, group # references seem broken using libc ! Use pcre instead. -19,7 +18,7 @@ # This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre PCREDIR!= pcre-config --prefix 2>/dev/null || : -@@ -37,7 +37,7 @@ COPTS.openbsd = -DENABLE_POLL -DENABLE_KQUEUE +@@ -37,7 +37,7 @@ LIBS.openbsd = # CPU dependant optimizations @@ -28,7 +27,7 @@ COPTS.native = -O2 -march=native COPTS.i586 = -O2 -march=i586 COPTS.i686 = -O2 -march=i686 -@@ -53,11 +53,11 @@ LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre +@@ -53,19 +53,19 @@ # options for static libpcre COPTS.static-pcre=-DUSE_PCRE -I$(PCREDIR)/include @@ -42,7 +41,17 @@ # 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 -@@ -101,8 +101,8 @@ EBTREE_DIR := ebtree + # with 1000 concurrent sessions. Putting it slightly lower than a page size + # will avoid the additionnal paramters to overflow a page. 8030 bytes is + # exactly 5.5 TCP segments of 1460 bytes. +-#SMALL_OPTS = +-SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024 ++SMALL_OPTS = ++#SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024 + + # redefine this if you want to add some special PATH to include/libs + ADDINC = +@@ -101,8 +101,8 @@ COPTS = -Iinclude -I$(EBTREE_DIR) $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) \ $(SPEC_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(VER_OPTS) $(DEFINE) LIBS = $(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB) diff -u -r haproxy.yours/pkg/haproxy.rc haproxy.mine/pkg/haproxy.rc --- haproxy.yours/pkg/haproxy.rc 2012-08-27 19:03:06.000000000 +0600 +++ haproxy.mine/pkg/haproxy.rc 2012-10-14 14:01:32.207913710 +0600 @@ -1,10 +1,18 @@ #!/bin/sh # -# $OpenBSD: haproxy.rc,v 1.1 2012/08/27 13:03:06 gonzalo Exp $ daemon="${TRUEPREFIX}/sbin/haproxy" -daemon_flags="-f ${HAPROXYCONF}/haproxy.cfg" 2012/10/14 Gonzalo L. R. <[email protected]> > I commited the 1.4.21 version with rc.d(8) scripts ~6 weeks ago, can you > sent a proper diff with your update? > > On Sat, Oct 13, 2012 at 01:32:16PM +0600, Ð?лÑ?Ñ? ШипиÑ?ин wrote: > ; Hello! > ; > ; we are running net/haproxy in high load applications, so I needed to > tweak > ; port a bit, which I guess should be useful for everyone. > ; > ; please find improved port at: > ; > ; https://github.com/chipitsine/openbsd-ports/tree/master/net/haproxy > ; > ; significant changes are: > ; > ; 1) rc.d - script which allows reload without restart (very important for > ; high load) > ; 2) removed stupid max_files constant (who needs 1024 files when running > ; high load ? and who ever needs haproxy without high load ?) > ; > ; Cheers, > ; Ilya Shipitsin > ; > ; P.S. I tried it already with CVS diff in January 2012, without luck, > please > ; pay attention to github repo ? > ; P.P.S. I seen 1.4 in 5.2 ports, but without my patches > > -- > Sending from my VCR... >
