Upgrade port: net/haproxy-devel Was not building on amd64 after changes to files/patch-makefile.bsd

PR:		ports/115378
Submitted by:	Hugo Saro <hugo@barafranca.com>

4 files changed, 111 insertions, 6 deletions

diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 9466147c86dd..3451b70e3912 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -7,9 +7,11 @@
 
 PORTNAME=	haproxy
 PORTVERSION=	1.3.12
-CATEGORIES=	net
-MASTER_SITES=	http://haproxy.1wt.eu/download/1.3/src/
-PKGNAMESUFFIX=	-devel
+#PORTREVISION=	0
+CATEGORIES=     net
+MASTER_SITES=   http://haproxy.1wt.eu/download/1.3/src/
+PKGNAMESUFFIX=  -devel
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	hugo@barafranca.com
 COMMENT=	The Reliable, High Performance TCP/HTTP Load Balancer
@@ -17,15 +19,20 @@ COMMENT=	The Reliable, High Performance TCP/HTTP Load Balancer
 CONFLICTS=	haproxy-1.2*
 USE_RC_SUBR=	haproxy
 
-MAKEFILE=	Makefile.bsd
+MAKEFILE=       Makefile.bsd
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/design-thoughts
+	@${MKDIR} ${DOCSDIR}/internals
 	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
-	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} design-thoughts ${DOCSDIR}/)
+#	@${INSTALL_DATA} ${WRKSRC}/doc/design-thoughts/* ${DOCSDIR}/design-thoughts/
+#	@${INSTALL_DATA} ${WRKSRC}/doc/internals/* ${DOCSDIR}/internals/
 	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} internals ${DOCSDIR}/)
+	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} design-thoughts ${DOCSDIR}/)
 	@${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
 				${LOCALBASE}/etc/haproxy.conf-dist
 .endif
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index 2ab25fa550e0..f2e9f985a5fb 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1,3 +1,3 @@
 MD5 (haproxy-1.3.12.tar.gz) = cdff6845362b29f9b2be4c207aa1fbb1
 SHA256 (haproxy-1.3.12.tar.gz) = 6fc6a48ed67ef10ba860f8a16a27d7de1d8499c331aa8037ea129c230caf141b
-SIZE (haproxy-1.3.12.tar.gz) = 355376
+SIZE (haproxy-1.3.12.tar.gz) =  355376
diff --git a/net/haproxy-devel/files/patch-Makefile.bsd b/net/haproxy-devel/files/patch-Makefile.bsd
new file mode 100644
index 000000000000..691188ee7e71
--- /dev/null
+++ b/net/haproxy-devel/files/patch-Makefile.bsd
@@ -0,0 +1,97 @@
+--- Makefile.bsd.orig	Mon Apr 16 00:33:37 2007
++++ Makefile.bsd	Fri May  4 04:05:12 2007
+@@ -1,4 +1,4 @@
+-# This makefile is dedicated to OpenBSD (and possibly other BSDs)
++# This makefile is dedicated to FreeBSD (and possibly other BSDs)
+ # You should use it this way :
+ #   make TARGET=os CPU=cpu
+ 
+@@ -6,31 +6,31 @@
+ 
+ # Select target OS. TARGET must match a system for which COPTS and LIBS are
+ # correctly defined below.
+-TARGET = openbsd
++TARGET = freebsd
+ 
+ # pass CPU=<cpu_name> to make to optimize for a particular CPU
+-CPU = generic
++#CPU = generic
+ #CPU = i586
+ #CPU = i686
+ #CPU = ultrasparc
+ 
+ # By default, we use libc's regex. WARNING! On Solaris 8/Sparc, group
+ # references seem broken using libc ! Use pcre instead.
+-REGEX=libc
++REGEX?=libc
+ #REGEX=pcre
+ #REGEX=static-pcre
+ 
+ # tools options
+-CC = gcc
+-LD = gcc
++CC? = gcc
++LD? = gcc
+ 
+ # This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre
+-PCREDIR!= pcre-config --prefix 2>/dev/null || :
+-#PCREDIR=/usr/local
++#PCREDIR!= pcre-config --prefix 2>/dev/null || :
++PCREDIR=${LOCALBASE}
+ 
+-# This is for OpenBSD 3.0 and above
+-COPTS.openbsd = -DENABLE_POLL -DENABLE_KQUEUE
+-LIBS.openbsd =
++# This is for FreeBSD
++COPTS.freebsd = -DENABLE_POLL -DENABLE_KQUEUE
++LIBS.freebsd =
+ 
+ # CPU dependant optimizations
+ COPTS.generic = -O2
+@@ -52,7 +52,7 @@
+ 
+ # you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG="
+ #DEBUG = -g -DDEBUG_MEMORY -DDEBUG_FULL
+-DEBUG = -g
++#DEBUG = -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
+@@ -60,7 +60,7 @@
+ # 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 = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
+ 
+ # redefine this if you want to add some special PATH to include/libs
+ ADDINC =
+@@ -69,7 +69,7 @@
+ # set some defines when needed.
+ # Known ones are -DENABLE_POLL
+ # - use -DTPROXY to compile with transparent proxy support.
+-DEFINE = -DTPROXY
++#DEFINE = -DTPROXY
+ 
+ # global options
+ TARGET_OPTS=$(COPTS.$(TARGET))
+@@ -79,7 +79,7 @@
+ COPTS=-Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(DEFINE)
+ LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
+ 
+-CFLAGS = -Wall $(COPTS) $(DEBUG)
++CFLAGS += -Wall $(COPTS)
+ LDFLAGS = -g
+ 
+ OBJS = src/haproxy.o src/list.o src/chtbl.o src/hashpjw.o src/base64.o \
+@@ -93,7 +93,9 @@
+ all: haproxy
+ 
+ haproxy: $(OBJS)
+-	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
++#	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
++	 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS)
++
+ 
+ .SUFFIXES: .c.o
+ 
diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist
index b6620605f7ed..bbb2d129893f 100644
--- a/net/haproxy-devel/pkg-plist
+++ b/net/haproxy-devel/pkg-plist
@@ -28,3 +28,4 @@ etc/haproxy.conf-dist
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+