From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 27 18:00:13 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1613410656A7 for ; Wed, 27 May 2009 18:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9546E8FC0A for ; Wed, 27 May 2009 18:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RI0B44042068 for ; Wed, 27 May 2009 18:00:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n4RI0BlU042067; Wed, 27 May 2009 18:00:11 GMT (envelope-from gnats) Resent-Date: Wed, 27 May 2009 18:00:11 GMT Resent-Message-Id: <200905271800.n4RI0BlU042067@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, Dennis Herrmann Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92F7F10656AE for ; Wed, 27 May 2009 17:52:33 +0000 (UTC) (envelope-from adox@mcx2.org) Received: from mail-bw0-f213.google.com (mail-bw0-f213.google.com [209.85.218.213]) by mx1.freebsd.org (Postfix) with ESMTP id 0D4EF8FC19 for ; Wed, 27 May 2009 17:52:32 +0000 (UTC) (envelope-from adox@mcx2.org) Received: by bwz9 with SMTP id 9so4925869bwz.43 for ; Wed, 27 May 2009 10:52:32 -0700 (PDT) Received: by 10.103.160.9 with SMTP id m9mr170833muo.96.1243446751027; Wed, 27 May 2009 10:52:31 -0700 (PDT) Received: from localhost (p4FE2CE22.dip.t-dialin.net [79.226.206.34]) by mx.google.com with ESMTPS id 28sm10575791fxm.1.2009.05.27.10.52.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 27 May 2009 10:52:30 -0700 (PDT) Message-Id: <4a1d7dde.1c0db80a.1df8.3b8f@mx.google.com> Date: Wed, 27 May 2009 10:52:30 -0700 (PDT) From: Dennis Herrmann Sender: Dennis Herrmann To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: tmseck@netcologne.de Subject: ports/135003: [PATCH] www/gatling: update to 0.10 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 18:00:13 -0000 >Number: 135003 >Category: ports >Synopsis: [PATCH] www/gatling: update to 0.10 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed May 27 18:00:11 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dennis Herrmann >Release: FreeBSD 7.2-RC2 i386 >Organization: >Environment: System: FreeBSD dhn.homeunix.com 7.2-RC2 FreeBSD 7.2-RC2 #6: Fri May 1 13:06:15 CEST >Description: - Update to 0.10 Added file(s): - files/patch-http.c Port maintainer (tmseck@netcologne.de) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- gatling-0.10.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/gatling/Makefile,v retrieving revision 1.13 diff -u -u -r1.13 Makefile --- Makefile 25 Jul 2008 14:34:48 -0000 1.13 +++ Makefile 27 May 2009 17:47:29 -0000 @@ -6,7 +6,7 @@ # PORTNAME= gatling -PORTVERSION= 0.9 +PORTVERSION= 0.10 CATEGORIES= www benchmarks ftp ipv6 MASTER_SITES= http://dl.fefe.de/ @@ -19,8 +19,8 @@ USE_GMAKE= yes USE_OPENSSL= yes -CFLAGS+= -I${LOCALBASE}/include/libowfat -I${OPENSSLINC} -LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} +MAKE_ARGS= CFLAGS="-I${LOCALBASE}/include/libowfat -I${OPENSSLINC} -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${OPENSSLLIB} -lc -lcrypt -liconv" MAKEFILE= GNUmakefile MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -41,6 +41,10 @@ .include +.if ${OSVERSION} < 700000 +BROKEN= Does not compile on FreeBSD 6.X +.endif + .if defined(WITH_GATLING_BENCHMARKS) || defined(WITH_BENCHMARKS) PORTDOCS+= README.bindbench README.forkbench README.httpbench \ README.manymapbench README.mmapbench Index: distinfo =================================================================== RCS file: /home/pcvs/ports/www/gatling/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- distinfo 28 Aug 2007 10:55:06 -0000 1.7 +++ distinfo 26 May 2009 19:27:37 -0000 @@ -1,3 +1,3 @@ -MD5 (gatling-0.9.tar.bz2) = bae9a695b7ced3ba0a4b359369273a66 -SHA256 (gatling-0.9.tar.bz2) = 6fa7c1278fd7d05422e073e4062cd931e10d2593fe73728fdcf0e2541db01bbe -SIZE (gatling-0.9.tar.bz2) = 73831 +MD5 (gatling-0.10.tar.bz2) = 04e8434156d91657c77a8a038c5b27cf +SHA256 (gatling-0.10.tar.bz2) = 1981ee8706a423e06e507c25202e83785595feabe68c148350818bc50380d416 +SIZE (gatling-0.10.tar.bz2) = 98422 Index: files/patch-GNUmakefile =================================================================== RCS file: /home/pcvs/ports/www/gatling/files/patch-GNUmakefile,v retrieving revision 1.2 diff -u -u -r1.2 patch-GNUmakefile --- files/patch-GNUmakefile 28 Aug 2007 10:55:06 -0000 1.2 +++ files/patch-GNUmakefile 26 May 2009 20:02:29 -0000 @@ -1,8 +1,8 @@ ---- GNUmakefile.orig Wed Jan 31 18:05:38 2007 -+++ GNUmakefile Mon Aug 27 16:49:36 2007 -@@ -1,21 +1,26 @@ +--- GNUmakefile.orig 2009-05-26 21:54:28.000000000 +0200 ++++ GNUmakefile 2009-05-26 22:01:26.000000000 +0200 +@@ -1,23 +1,30 @@ #DEBUG=1 --ZLIB=1 + ZLIB=1 -prefix=/opt/diet +prefix=${PREFIX} BINDIR=${prefix}/bin @@ -10,8 +10,10 @@ man1dir=$(MANDIR)/man1 -TARGETS=gatling httpbench bindbench dl ioerr bench tlsgatling \ --pthreadbench cgi getlinks rellink acc hcat +-pthreadbench cgi -TARGETS2=mktestdata mmapbench manymapbench forkbench forksbench +-ALLTARGETS=$(TARGETS) acc hcat referrer hitprofile matchiprange getlinks \ +-rellink $(TARGETS2) +TARGETS=cgi dl gatling getlinks rellink acc hcat referrer +TARGETS2= +ifdef BENCHMARKS @@ -21,8 +23,11 @@ +ifdef TLSGATLING +TARGETS+=tlsgatling +endif ++ ++#ALLTARGETS=$(TARGETS) acc hcat referrer hitprofile matchiprange getlinks \ ++#rellink $(TARGETS2) --all: $(TARGETS) $(TARGETS2) +-all: $(ALLTARGETS) +all: checklibs $(TARGETS) $(TARGETS2) -CROSS= @@ -37,7 +42,7 @@ path = $(subst :, ,$(PATH)) diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) -@@ -32,15 +37,11 @@ +@@ -34,15 +41,11 @@ # to build without diet libc support, use $ make DIET= # see http://www.fefe.de/dietlibc/ for details about the diet libc @@ -55,7 +60,7 @@ endif LDLIBS=-lowfat -@@ -66,7 +67,7 @@ +@@ -68,7 +71,7 @@ CC:=$(DIET) $(CC) pthreadbench: pthreadbench.o @@ -64,16 +69,16 @@ forksbench: forkbench.o $(CC) -static -o $@ forkbench.o $(LDFLAGS) $(LDLIBS) -@@ -74,7 +75,7 @@ - gatling.o: version.h havesetresuid.h +@@ -81,7 +84,7 @@ + $(OBJS) gatling.o: gatling.h version.h gatling_features.h - tlsgatling: gatling.c ssl.o mime.o -- -$(CC) -o $@ gatling.c ssl.o mime.o $(CFLAGS) -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS) + tlsgatling: gatling.c ssl.o $(HTTPS_OBJS) +- -$(CC) -o $@ gatling.c ssl.o $(HTTPS_OBJS) $(CFLAGS) -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS) + $(CC) -o $@ gatling.c ssl.o mime.o $(CFLAGS) -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS) - gatling: gatling.o mime.o - $(CC) $(LDFLAGS) $@.o mime.o -o $@ $(LDLIBS) -@@ -107,9 +108,13 @@ + gatling: gatling.o $(OBJS) md5lib + $(CC) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LDLIBS) `cat md5lib` +@@ -121,9 +124,13 @@ rm -f trysocket libiconv: tryiconv.c @@ -90,7 +95,7 @@ rm -f tryiconv libcrypt: trycrypt.c -@@ -130,9 +135,11 @@ +@@ -151,9 +158,11 @@ ar q $@ dummy.o -ranlib $@ @@ -98,16 +103,16 @@ + LDLIBS+=`cat libsocket libiconv libcrypt` --$(TARGETS): libsocketkludge.a libsocket libiconv libcrypt +-$(TARGETS): libsocketkludge.a libsocket libiconv libcrypt md5lib +$(TARGETS): libsocketkludge.a install: gatling dl getlinks install -d $(DESTDIR)$(BINDIR) $(man1dir) -@@ -144,7 +151,7 @@ +@@ -165,7 +174,7 @@ rm -f $(DESTDIR)$(BINDIR)/gatling $(DESTDIR)$(BINDIR)/tlsgatling $(DESTDIR)$(man1dir)/gatling.1 $(DESTDIR)$(man1dir)/bench.1 clean: -- rm -f $(TARGETS) *.o version.h core *.core libsocket libsocketkludge.a dummy.c libiconv libcrypt havesetresuid.h +- rm -f $(ALLTARGETS) *.o version.h core *.core libsocket libsocketkludge.a dummy.c libiconv libcrypt havesetresuid.h md5lib + rm -f $(TARGETS) $(TARGETS2) *.o version.h core *.core libsocket libsocketkludge.a dummy.c libiconv libcrypt havesetresuid.h VERSION=gatling-$(shell head -n 1 CHANGES|sed 's/://') Index: files/patch-http.c =================================================================== RCS file: files/patch-http.c diff -N files/patch-http.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-http.c 27 May 2009 16:54:23 -0000 @@ -0,0 +1,14 @@ +--- http.c.orig 2009-05-27 18:53:16.000000000 +0200 ++++ http.c 2009-05-27 18:53:56.000000000 +0200 +@@ -167,9 +167,11 @@ + array_cats(&c,"\">"); + cathtml(&c,base+ab[i].name); + if (S_ISDIR(ab[i].ss.st_mode)) array_cats(&c,"/"); else ++/* + #ifndef __MINGW32__ + if (S_ISLNK(ab[i].ss.st_mode)) array_cats(&c,"@"); + #endif ++*/ + array_cats(&c,""); + + j=fmt_2digits(buf,x->tm_mday); --- gatling-0.10.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: