From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 3 08:20:14 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D22537B404 for ; Tue, 3 Jun 2003 08:20:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFBB443F75 for ; Tue, 3 Jun 2003 08:20:12 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h53FKCUp032957 for ; Tue, 3 Jun 2003 08:20:12 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h53FKCKm032956; Tue, 3 Jun 2003 08:20:12 -0700 (PDT) Resent-Date: Tue, 3 Jun 2003 08:20:12 -0700 (PDT) Resent-Message-Id: <200306031520.h53FKCKm032956@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F85137B401 for ; Tue, 3 Jun 2003 08:10:44 -0700 (PDT) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 726FF43F75 for ; Tue, 3 Jun 2003 08:10:42 -0700 (PDT) (envelope-from sheepkiller@cultdeadsheep.org) Received: (qmail 55730 invoked from network); 3 Jun 2003 15:10:38 -0000 Received: from unknown (HELO lucifer.culteadsheep.org) (192.168.0.2) by goofy.cultdeadsheep.org with SMTP; 3 Jun 2003 15:10:38 -0000 Received: by lucifer.culteadsheep.org (sSMTP sendmail emulation); Tue, 3 Jun 2003 17:10:42 +0200 Message-Id: <20030603151042.726FF43F75@mx1.FreeBSD.org> Date: Tue, 3 Jun 2003 17:10:42 +0200 From: "Clement Laforet" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/52905: [maintainer update]: net/haproxy 1.1.20 -> 1.1.21 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 15:20:14 -0000 >Number: 52905 >Category: ports >Synopsis: [maintainer update]: net/haproxy 1.1.20 -> 1.1.21 >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: Tue Jun 03 08:20:12 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 4.8-STABLE i386 >Organization: cotds.org >Environment: System: FreeBSD lucifer.cultdeadsheep.org 4.8-STABLE FreeBSD 4.8-STABLE #7: Fri May 23 16:05:05 CEST 2003 clement@lucifer.cultdeadsheep.org:/usr/src/sys/compile/LUCIFER i386 >Description: - Update haproxy to 1.1.21 - Fix small bug in port - Cosmetic changes >How-To-Repeat: N/A. >Fix: --- hadiff begins here --- Index: haproxy/Makefile =================================================================== RCS file: /SERVICES/cvs/FreeBSD/ports/net/haproxy/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- haproxy/Makefile 3 Jun 2003 05:20:23 -0000 1.1 +++ haproxy/Makefile 3 Jun 2003 15:06:57 -0000 @@ -6,7 +6,7 @@ # PORTNAME= haproxy -PORTVERSION= 1.1.20 +PORTVERSION= 1.1.21 PORTREVISION= 0 CATEGORIES= net www MASTER_SITES= http://w.ods.org/tools/haproxy/ \ @@ -15,7 +15,7 @@ MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= High-performance and highly-robust TCP/HTTP load balancer -STATS_INTERVAL= 0 +STATS_INTERVAL?= 0 REGEX_TYPE?= libc MAKE_ENV+= REGEX=${REGEX_TYPE} INTERVAL=${STATS_INTERVAL} @@ -25,6 +25,14 @@ PKGNAMESUFFIX= -pcre LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre .endif + +pre-everything: + @${ECHO_MSG} "" + @${ECHO_MSG} "Available options:" + @${ECHO_MSG} "WITH_PCRE: Use pcre regex engine" + @${ECHO_MSG} "STATS_INTERVAL=###: Statistics interval in milliseconds," + @${ECHO_MSG} " (default to 0, disabled)" + @${ECHO_MSG} "" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin Index: haproxy/distinfo =================================================================== RCS file: /SERVICES/cvs/FreeBSD/ports/net/haproxy/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- haproxy/distinfo 3 Jun 2003 05:20:23 -0000 1.1 +++ haproxy/distinfo 3 Jun 2003 15:06:57 -0000 @@ -1 +1 @@ -MD5 (haproxy-1.1.20.tar.gz) = 0017b1fac1a61c3daccc504000edc4f2 +MD5 (haproxy-1.1.21.tar.gz) = 181d68471dd02c63c5a3dc65e9d6cdfe Index: haproxy/files/patch-Makefile =================================================================== RCS file: /SERVICES/cvs/FreeBSD/ports/net/haproxy/files/patch-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile --- haproxy/files/patch-Makefile 3 Jun 2003 05:20:23 -0000 1.1 +++ haproxy/files/patch-Makefile 3 Jun 2003 15:06:57 -0000 @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Apr 16 21:43:09 2003 -+++ Makefile Wed Apr 30 17:07:18 2003 -@@ -1,22 +1,18 @@ +--- 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 @@ -9,25 +9,35 @@ #TARGET = linux22 #TARGET = solaris #TARGET = solarisv9 --#TARGET = openbsd + #TARGET = openbsd - -CC = gcc -LD = gcc -+TARGET = openbsd ++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=/usr/local -+#PCREDIR := $(shell pcre-config --prefix 2>/dev/null) +-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 -@@ -44,8 +40,8 @@ +@@ -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 @@ -38,7 +48,7 @@ COPTS=$(COPTS.$(TARGET)) $(COPTS.$(REGEX)) LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) -@@ -53,16 +49,13 @@ +@@ -53,16 +55,13 @@ # - use -DSTATTIME=0 to disable statistics, else specify an interval in # milliseconds. # - use -DTPROXY to compile with transparent proxy support. --- hadiff ends here --- >Release-Note: >Audit-Trail: >Unformatted: