Date: Wed, 24 Sep 2003 13:37:44 +0200 From: Clement Laforet <sheepkiller@cultdeadsheep.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Clement Laforet <sheepkiller@cultdeadsheep.org> Subject: ports/57157: [update] net/haproxy: Message-ID: <20030924113747.E97854400D@mx1.FreeBSD.org> Resent-Message-ID: <200309241140.h8OBeGcw047489@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57157 >Category: ports >Synopsis: [update] net/haproxy: >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Sep 24 04:40:16 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 22 08:20:10 CEST 2003 clement@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386 >Description: Changelog: - update to v1.1.24 - add french and english documentation - Compile is quiet now under -CURRENT Removed file: * files/patch-Makefile.in >How-To-Repeat: N/A. >Fix: --- haproxy.diff begins here --- Index: haproxy/Makefile =================================================================== RCS file: /WORK/REPO/ports/net/haproxy/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- haproxy/Makefile 4 Jun 2003 15:30:38 -0000 1.2 +++ haproxy/Makefile 23 Sep 2003 08:57:25 -0000 @@ -6,8 +6,7 @@ # PORTNAME= haproxy -PORTVERSION= 1.1.21 -PORTREVISION= 0 +PORTVERSION= 1.1.24 CATEGORIES= net www MASTER_SITES= http://w.ods.org/tools/haproxy/ \ http://w.ods.org/tools/haproxy/old/ @@ -15,30 +14,49 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= High-performance and highly-robust TCP/HTTP load balancer +USE_REINPLACE= yes + STATS_INTERVAL?= 0 -REGEX_TYPE?= libc +CFLAGS+= -DSTATTIME=${STATS_INTERVAL} -MAKE_ENV+= REGEX=${REGEX_TYPE} INTERVAL=${STATS_INTERVAL} +.if defined(WITH_TPROXY) +CFLAGS+= -DTPROXY +.endif .if defined(WITH_PCRE) -REGEX_TYPE= pcre PKGNAMESUFFIX= -pcre LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +CFLAGS+= -DUSE_PCRE -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lpcreposix -lpcre .endif pre-fetch: @${ECHO_MSG} "" @${ECHO_MSG} "Available options:" @${ECHO_MSG} "WITH_PCRE: Use pcre regex engine" + @${ECHO_MSG} "WITH_DTPROXY: Enable Transparent proxy support" @${ECHO_MSG} "STATS_INTERVAL=###: Statistics interval in milliseconds," @${ECHO_MSG} " (default to 0, disabled)" @${ECHO_MSG} "" +post-patch: + @${REINPLACE_CMD} -e 's!localtime(!localtime((time_t *)!' ${WRKSRC}/haproxy.c + +do-build: + @(cd ${WRKSRC} ;\ + echo "Compiling haproxy:" ; \ + echo "${CC} ${CFLAGS} ${LDFLAGS} ${PORTNAME}.c -o ${PORTNAME}" ;\ + ${CC} ${CFLAGS} ${LDFLAGS} ${PORTNAME}.c -o ${PORTNAME} ) + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \ + @${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin + @${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \ ${PREFIX}/etc/haproxy.cfg.sample - ${INSTALL_SCRIPT} ${FILESDIR}/haproxy.sh \ + @${INSTALL_SCRIPT} ${FILESDIR}/haproxy.sh \ ${PREFIX}/etc/rc.d/haproxy.sh.sample +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} +.endif .include <bsd.port.mk> Index: haproxy/distinfo =================================================================== RCS file: /WORK/REPO/ports/net/haproxy/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- haproxy/distinfo 4 Jun 2003 15:30:38 -0000 1.2 +++ haproxy/distinfo 23 Sep 2003 08:57:25 -0000 @@ -1 +1 @@ -MD5 (haproxy-1.1.21.tar.gz) = 181d68471dd02c63c5a3dc65e9d6cdfe +MD5 (haproxy-1.1.24.tar.gz) = 3ddd10a8bf6e415eaa32851c39c2b67c Index: haproxy/pkg-plist =================================================================== RCS file: /WORK/REPO/ports/net/haproxy/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- haproxy/pkg-plist 3 Jun 2003 05:20:23 -0000 1.1 +++ haproxy/pkg-plist 23 Sep 2003 08:57:25 -0000 @@ -1,3 +1,6 @@ sbin/haproxy etc/haproxy.cfg.sample etc/rc.d/haproxy.sh.sample +%%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt +%%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt +@dirrm %%DOCSDIR%% Index: haproxy/files/patch-Makefile =================================================================== RCS file: haproxy/files/patch-Makefile diff -N haproxy/files/patch-Makefile --- haproxy/files/patch-Makefile 4 Jun 2003 15:30:38 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,71 +0,0 @@ ---- Makefile.orig Tue May 6 00:11:59 2003 -+++ Makefile Tue Jun 3 16:22:55 2003 -@@ -1,22 +1,21 @@ - # Select target OS. TARGET must match a system for which COPTS and LIBS are - # correctly defined below. - # You can set it on make's command line. eg: make TARGET=solaris --TARGET = linux24 -+#TARGET = linux24 - #TARGET = linux22 - #TARGET = solaris - #TARGET = solarisv9 - #TARGET = openbsd -- --CC = gcc --LD = gcc -+TARGET = FreeBSD - - # By default, we use libc's regex. --REGEX=libc -+#REGEX=libc - #REGEX=pcre - - # This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre --PCREDIR := $(shell pcre-config --prefix 2>/dev/null || :) -+#PCREDIR := $(shell pcre-config --prefix 2>/dev/null || :) - #PCREDIR=/usr/local -+PCREDIR=${LOCALBASE} - - # This is for Linux 2.4 with netfilter - COPTS.linux24 = -O2 -DNETFILTER -@@ -38,14 +37,17 @@ - COPTS.openbsd = -O2 - LIBS.openbsd = - -+COPTS.FreeBSD = -O2 -+LIBS.FreeBSD = -+ - COPTS.libc= - LIBS.libs= - - COPTS.pcre=-DUSE_PCRE -I$(PCREDIR)/include - LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre - --#DEBUG = --DEBUG = -g -+DEBUG = -+#DEBUG = -g - - COPTS=$(COPTS.$(TARGET)) $(COPTS.$(REGEX)) - LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) -@@ -53,16 +55,13 @@ - # - use -DSTATTIME=0 to disable statistics, else specify an interval in - # milliseconds. - # - use -DTPROXY to compile with transparent proxy support. --CFLAGS = -Wall $(COPTS) $(DEBUG) -DSTATTIME=0 -DTPROXY --LDFLAGS = -g -+CFLAGS+= -Wall $(COPTS) $(DEBUG) -DSTATTIME=$(INTERVAL) -+LDFLAGS+= - - all: haproxy - --haproxy: haproxy.o -- $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -- --%.o: %.c -- $(CC) $(CFLAGS) -c -o $@ $< -+haproxy: -+ $(CC) $(CFLAGS) haproxy.c $(LIBS) $(LDFLAGS) -o haproxy - - clean: - rm -f *.[oas] *~ core haproxy test nohup.out gmon.out --- haproxy.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030924113747.E97854400D>