OK?
On 17/04, Jérémie Courrèges-Anglas wrote:
; j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
;
; > "Gonzalo L. Rodriguez" <gonz...@x61.com.ar> writes:
; >
; >> Update for haproxy to 1.5.11 with some tweaks from Daniel Jakots
; >>
; >> Ok? Comments?
; >
; > Both Daniel's changes and the update look sane. Basic setups work fine
; > here (including TLS). ok jca@
; >
; > It would be nicer if this port respected CFLAGS and LDFLAGS, even if the
; > current defaults appear reasonable. Something like
; >
; > MAKE_FLAGS += CFLAGS="${CFLAGS} -fno-strict-aliasing" LDFLAGS="${LDFLAGS}"
;
; Oh and, HOMEPAGE/MASTER_SITES could be updated too (-> www.haproxy.org)
; to avoid redirects.
;
; --
; jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
;
--
Sending from my toaster.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/haproxy/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 31 Oct 2014 13:43:59 -0000 1.16
+++ Makefile 17 Apr 2015 15:07:44 -0000
@@ -2,14 +2,14 @@
COMMENT = reliable, high performance TCP/HTTP load balancer
-DISTNAME = haproxy-1.5.6
+DISTNAME = haproxy-1.5.11
CATEGORIES = net www
-HOMEPAGE = http://haproxy.1wt.eu/
+HOMEPAGE = http://www.haproxy.org/
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c pcre pcreposix
+WANTLIB = c crypto pcre pcreposix ssl
MASTER_SITES = ${HOMEPAGE}/download/1.5/src/
@@ -21,7 +21,9 @@ SUBST_VARS = HAPROXYCONF HAPROXYSTATE \
HAPROXYUID HAPROXYGID
USE_GMAKE = Yes
-MAKE_FLAGS += CC="${CC}" LD="${CC}"
+MAKE_FLAGS += CFLAGS="${CFLAGS} -fno-strict-aliasing" LDFLAGS="${LDFLAGS}"
+MAKE_FLAGS += CC="${CC}" LD="${CC}" TARGET="openbsd"
+MAKE_FLAGS += USE_OPENSSL=1 USE_PCRE=1
NO_TEST = Yes
LIB_DEPENDS = devel/pcre
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/haproxy/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 31 Oct 2014 13:43:59 -0000 1.9
+++ distinfo 17 Apr 2015 15:07:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.5.6.tar.gz) = IUq4na1+CkPMDxxGNnymgDzYaeFxek+muZRRcT+R9xc=
-SIZE (haproxy-1.5.6.tar.gz) = 1337511
+SHA256 (haproxy-1.5.11.tar.gz) = i1qkYpiEBfCcimFpKUsgLX9SSlRQoC3ZLnwhZoD3k78=
+SIZE (haproxy-1.5.11.tar.gz) = 1340429
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 11 Sep 2014 14:47:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2014/09/11 14:47:20 gonzalo Exp $
---- Makefile.orig Thu Sep 4 12:15:59 2014
-+++ Makefile Thu Sep 4 12:16:16 2014
-@@ -90,7 +90,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
- # following list (use the default "generic" if uncertain) :
- # generic, linux22, linux24, linux24e, linux26, solaris,
- # freebsd, openbsd, cygwin, custom, aix51, aix52
--TARGET =
-+TARGET = openbsd
-
- #### TARGET CPU
- # Use CPU=<cpu_name> to optimize for a particular CPU, among the following
