Attachment #82913 for bug #118552

View | Details | Raw Unified | Return to bug 118552
Collapse All | Expand All

Lines 6-12 Link Here

(-)/home/klr/ports/haproxy-devel/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= haproxy	8	PORTNAME= haproxy
9	PORTVERSION= 1.3.12.2	9	PORTVERSION= 1.3.14
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= http://haproxy.1wt.eu/download/1.3/src/	11	MASTER_SITES= http://haproxy.1wt.eu/download/1.3/src/
12	PKGNAMESUFFIX= -devel	12	PKGNAMESUFFIX= -devel
Lines 36-42 Link Here
36	.endif	36	.endif
37		37
38	post-install:	38	post-install:
39	@${ECHO_MSG} ""	39	@${ECHO_MSG} "${CFLAGS}"
40	@${ECHO_MSG} ""	40	@${ECHO_MSG} ""
41	@${ECHO_MSG} ""	41	@${ECHO_MSG} ""
42	@${ECHO_MSG} "${PORTNAME} is now installed."	42	@${ECHO_MSG} "${PORTNAME} is now installed."




# New ports collection makefile for:    haproxy-devel
# Date created:         Thu May  3 16:30:19 WEST 2007
# Whom:                 Hugo Saro <hugo@barafranca.com>
#
# $FreeBSD: ports/net/haproxy-devel/Makefile,v 1.20 2007/09/12 05:20:13 edwin Exp $
#

PORTNAME=	haproxy
PORTVERSION=	1.3.12
#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

CONFLICTS=	haproxy-1.2*
USE_RC_SUBR=	haproxy

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}
#	@${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

post-install:
	@${ECHO_MSG} ""
	@${ECHO_MSG} ""
	@${ECHO_MSG} ""
	@${ECHO_MSG} "haproxy ${PORTVERSION} is now installed."
	@${ECHO_MSG} "To configure it, rename ${LOCALBASE}/etc/haproxy.conf-dist"
	@${ECHO_MSG} "and add haproxy_enable=\"YES\" to /etc/rc.conf"
	@${ECHO_MSG} ""
	@${ECHO_MSG} ""

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/home/klr/ports/haproxy-devel/distinfo (-3 / +3 lines)
1	MD5 (haproxy-1.3.12.2.tar.gz) = d299484c1bfcaacc360ee3adf2fb51ea	1	MD5 (haproxy-1.3.14.tar.gz) = baa977bbabc1ef0208748f475bf6bf3d
2	SHA256 (haproxy-1.3.12.2.tar.gz) = 975786a16274a104fa269781322755314a3ec276dbeab3db94418d1dd7ee3547	2	SHA256 (haproxy-1.3.14.tar.gz) = 25c25ae068ed846f4650d4a53bd9ad06328ab182995a216deff9f2eec029d324
3	SIZE (haproxy-1.3.12.2.tar.gz) = 373552	3	SIZE (haproxy-1.3.14.tar.gz) = 434389

Lines 1-3 Link Here

(-)/home/klr/ports/haproxy-devel/distinfo.orig (-3 lines)
1	MD5 (haproxy-1.3.12.tar.gz) = cdff6845362b29f9b2be4c207aa1fbb1
2	SHA256 (haproxy-1.3.12.tar.gz) = 6fc6a48ed67ef10ba860f8a16a27d7de1d8499c331aa8037ea129c230caf141b
3	SIZE (haproxy-1.3.12.tar.gz) = 355376




--- Makefile.bsd.orig   2007-12-06 00:25:44.000000000 +0000
+++ Makefile.bsd        2007-12-11 15:07:31.578883070 +0000
@@ -1,7 +1,4 @@
-# This makefile is dedicated to OpenBSD (and possibly other BSDs)
-# You should use it this way :
-#   make TARGET=os CPU=cpu
-#
+# This makefile is dedicated to FreeBSD
 # Some optional components may be added, such as DLMALLOC :
 #
 #   make TARGET=freebsd CPU=i686 DLMALLOC_SRC=/usr/local/src/dlmalloc.c \
@@ -9,7 +6,7 @@

 # 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
@@ -24,26 +21,25 @@
 #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 = cc
+LD = cc

 # 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=${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
-COPTS.i586 = -O2 -march=i586
-COPTS.i686 = -O2 -march=i686
-COPTS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc
+#COPTS.generic = -O2
+#COPTS.i586 = -O2 -march=i586
+#COPTS.i686 = -O2 -march=i686
+#COPTS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc

 # options for standard regex library
-COPTS.libc=
-LIBS.libc=
+#COPTS.libc=
+#LIBS.libc=

 # options for libpcre
 COPTS.pcre=-DUSE_PCRE -I$(PCREDIR)/include
@@ -55,7 +51,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
@@ -63,19 +59,19 @@
 # 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 =
-ADDLIB =
+#ADDINC =
+#ADDLIB =

 # redefine this if you want to add some special .o files
-OPT_OBJS =
+#OPT_OBJS =

 # set some defines when needed.
 # Known ones are -DENABLE_POLL
 # - use -DTPROXY to compile with transparent proxy support.
-DEFINE = -DTPROXY
+#DEFINE = -DTPROXY

 # May be changed to patch PAGE_SIZE on every platform when using dlmalloc
 DLMALLOC_THRES=4096
@@ -95,7 +91,7 @@
 COPTS   = -Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) \
           $(SMALL_OPTS) $(VER_OPTS) $(DEFINE)
 LIBS    = $(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
-CFLAGS  = -Wall $(COPTS) $(DEBUG)
+CFLAGS  += -Wall $(COPTS) $(DEBUG)
 LDFLAGS = -g

 OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \

 all: haproxy
 
 haproxy: $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
+#	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
+	 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS)
+
 
 .SUFFIXES: .c.o
 

Lines 1-3 Link Here

(-)/home/klr/ports/haproxy-devel/pkg-message.orig (-3 lines)
1	===> BE CAREFULL HOW TO BOOT on 1.1.28 or after:
2	To run haproxy from startup, add haproxy_enable="YES" in your
3	/etc/rc.conf.

Lines 17-22 Link Here

(-)/home/klr/ports/haproxy-devel/pkg-plist (+1 lines)
17	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt	17	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt
18	%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt	18	%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
19	%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt	19	%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
		20	%%PORTDOCS%%%%DOCSDIR%%/internals/ebtree
20	%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt	21	%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt
21	%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt	22	%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt
22	%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt	23	%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt




sbin/haproxy
%%PORTDOCS%%%%DOCSDIR%%/architecture.txt
%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt
%%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt
%%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt
%%PORTDOCS%%%%DOCSDIR%%/tcp-splicing.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%%/internals/connection-scale.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.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/todo.cttproxy
etc/haproxy.conf-dist
%%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
%%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
%%PORTDOCS%%@dirrm %%DOCSDIR%%


Return to bug 118552

Lines 1-50 Link Here

(-)/home/klr/ports/haproxy-devel/Makefile.orig (-50 lines)
1	# New ports collection makefile for: haproxy-devel
2	# Date created: Thu May 3 16:30:19 WEST 2007
3	# Whom: Hugo Saro <hugo@barafranca.com>
4	#
5	# $FreeBSD: ports/net/haproxy-devel/Makefile,v 1.20 2007/09/12 05:20:13 edwin Exp $
6	#
7
8	PORTNAME= haproxy
9	PORTVERSION= 1.3.12
10	#PORTREVISION= 0
11	CATEGORIES= net
12	MASTER_SITES= http://haproxy.1wt.eu/download/1.3/src/
13	PKGNAMESUFFIX= -devel
14	DISTFILES= ${DISTNAME}.tar.gz
15
16	MAINTAINER= hugo@barafranca.com
17	COMMENT= The Reliable, High Performance TCP/HTTP Load Balancer
18
19	CONFLICTS= haproxy-1.2*
20	USE_RC_SUBR= haproxy
21
22	MAKEFILE= Makefile.bsd
23
24	do-install:
25	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
26
27	.if !defined(NOPORTDOCS)
28	@${MKDIR} ${DOCSDIR}
29	@${MKDIR} ${DOCSDIR}/design-thoughts
30	@${MKDIR} ${DOCSDIR}/internals
31	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
32	# @${INSTALL_DATA} ${WRKSRC}/doc/design-thoughts/* ${DOCSDIR}/design-thoughts/
33	# @${INSTALL_DATA} ${WRKSRC}/doc/internals/* ${DOCSDIR}/internals/
34	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} internals ${DOCSDIR}/)
35	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} design-thoughts ${DOCSDIR}/)
36	@${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
37	${LOCALBASE}/etc/haproxy.conf-dist
38	.endif
39
40	post-install:
41	@${ECHO_MSG} ""
42	@${ECHO_MSG} ""
43	@${ECHO_MSG} ""
44	@${ECHO_MSG} "haproxy ${PORTVERSION} is now installed."
45	@${ECHO_MSG} "To configure it, rename ${LOCALBASE}/etc/haproxy.conf-dist"
46	@${ECHO_MSG} "and add haproxy_enable=\"YES\" to /etc/rc.conf"
47	@${ECHO_MSG} ""
48	@${ECHO_MSG} ""
49
50	.include <bsd.port.mk>

Lines 1-97 Link Here

(-)/home/klr/ports/haproxy-devel/files/patch-Makefile.bsd (-62 / +66 lines)
1	--- Makefile.bsd.orig Mon Apr 16 00:33:37 2007	1	--- Makefile.bsd.orig 2007-12-06 00:25:44.000000000 +0000
2	+++ Makefile.bsd Fri May 4 04:05:12 2007	2	+++ Makefile.bsd 2007-12-11 15:07:31.578883070 +0000
3	@@ -1,4 +1,4 @@	3	@@ -1,7 +1,4 @@
4	-# This makefile is dedicated to OpenBSD (and possibly other BSDs)	4	-# This makefile is dedicated to OpenBSD (and possibly other BSDs)
5	+# This makefile is dedicated to FreeBSD (and possibly other BSDs)	5	-# You should use it this way :
6	# You should use it this way :	6	-# make TARGET=os CPU=cpu
7	# make TARGET=os CPU=cpu	7	-#
8		8	+# This makefile is dedicated to FreeBSD
9	@@ -6,31 +6,31 @@	9	# Some optional components may be added, such as DLMALLOC :
10		10	#
		11	# make TARGET=freebsd CPU=i686 DLMALLOC_SRC=/usr/local/src/dlmalloc.c \
		12	@@ -9,7 +6,7 @@
		13
11	# Select target OS. TARGET must match a system for which COPTS and LIBS are	14	# Select target OS. TARGET must match a system for which COPTS and LIBS are
12	# correctly defined below.	15	# correctly defined below.
13	-TARGET = openbsd	16	-TARGET = openbsd
14	+TARGET = freebsd	17	+TARGET = freebsd
15		18
16	# pass CPU=<cpu_name> to make to optimize for a particular CPU	19	# pass CPU=<cpu_name> to make to optimize for a particular CPU
17	-CPU = generic	20	CPU = generic
18	+#CPU = generic	21	@@ -24,26 +21,25 @@
19	#CPU = i586
20	#CPU = i686
21	#CPU = ultrasparc
22
23	# By default, we use libc's regex. WARNING! On Solaris 8/Sparc, group
24	# references seem broken using libc ! Use pcre instead.
25	-REGEX=libc
26	+REGEX?=libc
27	#REGEX=pcre
28	#REGEX=static-pcre	22	#REGEX=static-pcre
29		23
30	# tools options	24	# tools options
31	-CC = gcc	25	-CC = gcc
32	-LD = gcc	26	-LD = gcc
33	+CC? = gcc	27	+CC = cc
34	+LD? = gcc	28	+LD = cc
35		29
36	# This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre	30	# This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre
37	-PCREDIR!= pcre-config --prefix 2>/dev/null \|\| :	31	PCREDIR!= pcre-config --prefix 2>/dev/null \|\| :
38	-#PCREDIR=/usr/local	32	#PCREDIR=/usr/local
39	+#PCREDIR!= pcre-config --prefix 2>/dev/null \|\| :	33
40	+PCREDIR=${LOCALBASE}
41
42	-# This is for OpenBSD 3.0 and above	34	-# This is for OpenBSD 3.0 and above
43	-COPTS.openbsd = -DENABLE_POLL -DENABLE_KQUEUE	35	-COPTS.openbsd = -DENABLE_POLL -DENABLE_KQUEUE
44	-LIBS.openbsd =	36	-LIBS.openbsd =
45	+# This is for FreeBSD
46	+COPTS.freebsd = -DENABLE_POLL -DENABLE_KQUEUE	37	+COPTS.freebsd = -DENABLE_POLL -DENABLE_KQUEUE
47	+LIBS.freebsd =	38	+LIBS.freebsd =
48		39
49	# CPU dependant optimizations	40	# CPU dependant optimizations
50	COPTS.generic = -O2	41	-COPTS.generic = -O2
51	@@ -52,7 +52,7 @@	42	-COPTS.i586 = -O2 -march=i586
52		43	-COPTS.i686 = -O2 -march=i686
		44	-COPTS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc
		45	+#COPTS.generic = -O2
		46	+#COPTS.i586 = -O2 -march=i586
		47	+#COPTS.i686 = -O2 -march=i686
		48	+#COPTS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc
		49
		50	# options for standard regex library
		51	-COPTS.libc=
		52	-LIBS.libc=
		53	+#COPTS.libc=
		54	+#LIBS.libc=
		55
		56	# options for libpcre
		57	COPTS.pcre=-DUSE_PCRE -I$(PCREDIR)/include
		58	@@ -55,7 +51,7 @@
		59
53	# you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG="	60	# you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG="
54	#DEBUG = -g -DDEBUG_MEMORY -DDEBUG_FULL	61	#DEBUG = -g -DDEBUG_MEMORY -DDEBUG_FULL
55	-DEBUG = -g	62	-DEBUG = -g
56	+#DEBUG = -g	63	+#DEBUG = -g
57		64
58	# if small memory footprint is required, you can reduce the buffer size. There	65	# if small memory footprint is required, you can reduce the buffer size. There
59	# are 2 buffers per concurrent session, so 16 kB buffers will eat 32 MB memory	66	# are 2 buffers per concurrent session, so 16 kB buffers will eat 32 MB memory
60	@@ -60,7 +60,7 @@	67	@@ -63,19 +59,19 @@
61	# will avoid the additionnal paramters to overflow a page. 8030 bytes is	68	# will avoid the additionnal paramters to overflow a page. 8030 bytes is
62	# exactly 5.5 TCP segments of 1460 bytes.	69	# exactly 5.5 TCP segments of 1460 bytes.
63	#SMALL_OPTS =	70	#SMALL_OPTS =
64	-SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024	71	-SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
65	+#SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024	72	+#SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
66		73
67	# redefine this if you want to add some special PATH to include/libs	74	# redefine this if you want to add some special PATH to include/libs
68	ADDINC =	75	-ADDINC =
69	@@ -69,7 +69,7 @@	76	-ADDLIB =
		77	+#ADDINC =
		78	+#ADDLIB =
		79
		80	# redefine this if you want to add some special .o files
		81	-OPT_OBJS =
		82	+#OPT_OBJS =
		83
70	# set some defines when needed.	84	# set some defines when needed.
71	# Known ones are -DENABLE_POLL	85	# Known ones are -DENABLE_POLL
72	# - use -DTPROXY to compile with transparent proxy support.	86	# - use -DTPROXY to compile with transparent proxy support.
73	-DEFINE = -DTPROXY	87	-DEFINE = -DTPROXY
74	+#DEFINE = -DTPROXY	88	+#DEFINE = -DTPROXY
75		89
76	# global options	90	# May be changed to patch PAGE_SIZE on every platform when using dlmalloc
77	TARGET_OPTS=$(COPTS.$(TARGET))	91	DLMALLOC_THRES=4096
78	@@ -79,7 +79,7 @@	92	@@ -95,7 +91,7 @@
79	COPTS=-Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(DEFINE)	93	COPTS = -Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) \
80	LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)	94	$(SMALL_OPTS) $(VER_OPTS) $(DEFINE)
81		95	LIBS = $(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
82	-CFLAGS = -Wall $(COPTS) $(DEBUG)	96	-CFLAGS = -Wall $(COPTS) $(DEBUG)
83	+CFLAGS += -Wall $(COPTS)	97	+CFLAGS += -Wall $(COPTS) $(DEBUG)
84	LDFLAGS = -g	98	LDFLAGS = -g
85		99
86	OBJS = src/haproxy.o src/list.o src/chtbl.o src/hashpjw.o src/base64.o \	100	OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \
87	@@ -93,7 +93,9 @@	101
88	all: haproxy
89
90	haproxy: $(OBJS)
91	- $(LD) $(LDFLAGS) -o $@ $> $(LIBS)
92	+# $(LD) $(LDFLAGS) -o $@ $> $(LIBS)
93	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS)
94	+
95
96	.SUFFIXES: .c.o
97

Lines 1-31 Link Here

(-)/home/klr/ports/haproxy-devel/pkg-plist.orig (-31 lines)
1	sbin/haproxy
2	%%PORTDOCS%%%%DOCSDIR%%/architecture.txt
3	%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
4	%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt
5	%%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt
6	%%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt
7	%%PORTDOCS%%%%DOCSDIR%%/tcp-splicing.txt
8	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends-v0.txt
9	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt
10	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt
11	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/buffers.fig
12	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/config-language.txt
13	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/cttproxy-changes.txt
14	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt
15	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url
16	%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt
17	%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
18	%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
19	%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt
20	%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt
21	%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt
22	%%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt
23	%%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt
24	%%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt
25	%%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt
26	%%PORTDOCS%%%%DOCSDIR%%/internals/todo.cttproxy
27	etc/haproxy.conf-dist
28	%%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
29	%%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
30	%%PORTDOCS%%@dirrm %%DOCSDIR%%
31