From tmseck@netcologne.de  Sun Mar 13 13:04:17 2005
Return-Path: <tmseck@netcologne.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0640816A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 Mar 2005 13:04:17 +0000 (GMT)
Received: from smtp2.netcologne.de (smtp2.netcologne.de [194.8.194.218])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F29DC43D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 Mar 2005 13:04:15 +0000 (GMT)
	(envelope-from tmseck@netcologne.de)
Received: from laurel.tmseck.homedns.org (xdsl-213-196-221-79.netcologne.de [213.196.221.79])
	by smtp2.netcologne.de (Postfix) with SMTP id 3C3CC421D
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 Mar 2005 14:04:11 +0100 (MET)
Received: (qmail 24470 invoked by uid 1001); 13 Mar 2005 13:04:32 -0000
Message-Id: <20050313130432.24469.qmail@laurel.tmseck.homedns.org>
Date: 13 Mar 2005 13:04:32 -0000
From: Thomas-Martin Seck <tmseck@netcologne.de>
Reply-To: Thomas-Martin Seck <tmseck@netcologne.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer] www/gatling: update to 0.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         78782
>Category:       ports
>Synopsis:       [Maintainer] www/gatling: update to 0.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    leeym
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 13 13:10:02 GMT 2005
>Closed-Date:    Thu Mar 17 06:08:05 GMT 2005
>Last-Modified:  Thu Mar 17 06:08:05 GMT 2005
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of March 13, 2005.

	
>Description:
- Update to 0.7
- Remove a patch that is no longer needed

Note to committer:
please 'cvs rm' files/patch-gatling.c
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: distinfo
===================================================================
--- distinfo	(.../www/gatling)	(revision 442)
+++ distinfo	(.../local/gatling)	(revision 442)
@@ -1,2 +1,2 @@
-MD5 (gatling-0.6.tar.bz2) = 2067d666c01834f2c8702b08644f95d8
-SIZE (gatling-0.6.tar.bz2) = 47267
+MD5 (gatling-0.7.tar.bz2) = 3c6d3e859b539f24b6ffaffd1659d3f7
+SIZE (gatling-0.7.tar.bz2) = 53029
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile	(.../www/gatling)	(revision 442)
+++ files/patch-Makefile	(.../local/gatling)	(revision 442)
@@ -24,8 +24,8 @@
  	$(CC) -c $< -I. $(CFLAGS)
  
  tlsgatling: gatling.c ssl.o
--	$(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
-+	$(CC) -o $@ $(CFLAGS) $> -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
+-	-$(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
++	-$(CC) -o $@ $(CFLAGS) $> -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
  
  libsocket: trysocket.c
  	if $(DIET) $(CC) $(CFLAGS) -o trysocket trysocket.c >/dev/null 2>&1; then echo ""; else \
Index: files/patch-gatling.c
===================================================================
--- files/patch-gatling.c	(.../www/gatling)	(revision 442)
+++ files/patch-gatling.c	(.../local/gatling)	(revision 442)
@@ -1,11 +0,0 @@
---- gatling.c.orig	Mon Jan 31 17:14:45 2005
-+++ gatling.c	Sun Feb 20 17:02:12 2005
-@@ -3088,7 +3088,7 @@ void forkslave(int fd,buffer* in) {
-     }
-   }
- error:
--  write(fd,&code,4);
-+  if (write(fd,&code,4)!=4) exit(0);
-   code=strlen(msg);
-   write(fd,&code,4);
-   {
Index: Makefile
===================================================================
--- Makefile	(.../www/gatling)	(revision 442)
+++ Makefile	(.../local/gatling)	(revision 442)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gatling
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.7
 CATEGORIES=	www benchmarks ftp ipv6
 MASTER_SITES=	http://dl.fefe.de/
 

	


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback  
State-Changed-By: ahze 
State-Changed-When: Sun Mar 13 19:36:41 GMT 2005 
State-Changed-Why:  
Does not compile on 4.x 

===>  Building for gatling-0.7 
(head -n 1 CHANGES | sed 's/([^:]*):/#define VERSION "1"/') > version.h 
cc -O -pipe  -I/usr/local/include/libowfat -I/usr/include  -c gatling.c 
if  cc -O -pipe  -I/usr/local/include/libowfat -I/usr/include  -o trysocket trysocket.c >/dev/null 2>&1; then echo ""; else  if  cc -O -pipe  -I/usr/local/include/libowfat -I/usr/include  -o trysocket trysocket.c -lsocket >/dev/null 2>&1; then echo "-lsocket"; else  if  cc -O -pipe  -I/usr/local/include/libowfat -I/usr/include  -o trysocket trysocket.c -lsocket -lnsl >/dev/null 2>&1; then echo "-lsocket -lnsl";  fi; fi; fi > libsocket 
rm -f trysocket 
if  cc -O -pipe  -I/usr/local/include/libowfat -I/usr/include  -o tryiconv tryiconv.c >/dev/null 2>&1; then echo ""; else  if  cc -O -pipe  -I/usr/local/include/libowfat -I/usr/include  -o tryiconv tryiconv.c -liconv >/dev/null 2>&1; then echo "-liconv";  fi; fi > libiconv 
rm -f tryiconv 
cc -o gatling gatling.o  -L/usr/local/lib -lowfat -L/usr/lib -rpath=/usr/lib:/usr/local/lib `cat libsocket libiconv` 
gatling.o: In function `http_openfile': 
gatling.o(.text+0x2018): undefined reference to `scan_urlencoded2' 
*** Error code 1 

Stop in /tmp/a/ports/www/gatling/work/gatling-0.7. 
*** Error code 1 


Does not compile on 5.x 

===>  Building for gatling-0.7 
(head -n 1 CHANGES | sed 's/([^:]*):/#define VERSION "1"/') > version.h 
cc -O2 -pipe -march=athlon-xp -c gatling.c 
gatling.c:14:20: socket.h: No such file or directory 
gatling.c:15:16: io.h: No such file or directory 
gatling.c:16:20: buffer.h: No such file or directory 
gatling.c:17:17: ip4.h: No such file or directory 
gatling.c:18:17: ip6.h: No such file or directory 
gatling.c:19:19: array.h: No such file or directory 
gatling.c:20:18: case.h: No such file or directory 
gatling.c:21:17: fmt.h: No such file or directory 
gatling.c:22:17: iob.h: No such file or directory 
gatling.c:23:17: str.h: No such file or directory 
gatling.c:24:18: scan.h: No such file or directory 
gatling.c:25:22: textcode.h: No such file or directory 
gatling.c:26:20: uint32.h: No such file or directory 
gatling.c:27:20: uint16.h: No such file or directory 
gatling.c:28:18: mmap.h: No such file or directory 
gatling.c:57:24: havealloca.h: No such file or directory 
gatling.c:60: error: syntax error before "next" 
gatling.c:60: warning: data definition has no type or storage class 
gatling.c:109: error: syntax error before "origdir" 
gatling.c:109: warning: data definition has no type or storage class 
gatling.c: In function `carp': 
gatling.c:127: error: `buffer_2' undeclared (first use in this function) 
gatling.c:127: error: (Each undeclared identifier is reported only once 
gatling.c:127: error: for each function it appears in.) 
gatling.c: At top level: 
gatling.c:203: error: syntax error before "array" 
gatling.c:206: error: syntax error before "uint32" 
gatling.c:220: error: syntax error before "uint64" 
gatling.c:244: error: syntax error before "uint16" 
gatling.c: In function `add_proxy': 
gatling.c:276: error: structure has no member named `scope_id' 
gatling.c:279: error: structure has no member named `port' 
gatling.c: At top level: 
gatling.c:291: error: syntax error before '*' token 
gatling.c: In function `proxy_connection': 
gatling.c:310: error: `IP6_FMT' undeclared (first use in this function) 
gatling.c:317: error: structure has no member named `myport' 
gatling.c:320: error: structure has no member named `r' 
gatling.c:320: warning: assignment makes pointer from integer without a cast 
gatling.c:334: error: `buffer_1' undeclared (first use in this function) 
gatling.c:334: error: structure has no member named `port' 
gatling.c:347: error: structure has no member named `port' 
gatling.c:359: error: structure has no member named `port' 
gatling.c:359: error: structure has no member named `scope_id' 
gatling.c:364: error: `FMT_ULONG' undeclared (first use in this function) 
gatling.c:370: error: structure has no member named `port' 
gatling.c:371: error: structure has no member named `scope_id' 
gatling.c:392: error: syntax error before "a" 
gatling.c:394: error: structure has no member named `r' 
gatling.c:394: warning: initialization makes pointer from integer without a cast 
gatling.c:399: error: `a' undeclared (first use in this function) 
gatling.c:405: error: `b' undeclared (first use in this function) 


http://www.freebsd.org/cgi/query-pr.cgi?pr=78782 

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: Michael Johnson <ahze@FreeBSD.org>
Cc: freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/78782: [Maintainer] www/gatling: update to 0.7
Date: Mon, 14 Mar 2005 16:16:42 +0100

 * Michael Johnson (ahze@FreeBSD.org):
 
 > Does not compile on 4.x
 ...
 > Does not compile on 5.x
 ...
 
 www/gatling is very closely tied to devel/libowfat and gatling-0.7
 requires libowfat-0.22 to build. Please check whether you have
 libowfat-0.22 installed; it builds here on RELENG_5 and RELENG_4.
Responsible-Changed-From-To: freebsd-ports-bugs->leeym 
Responsible-Changed-By: leeym 
Responsible-Changed-When: Thu Mar 17 04:52:11 GMT 2005 
Responsible-Changed-Why:  
I will take care of this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78782 
State-Changed-From-To: feedback->closed 
State-Changed-By: leeym 
State-Changed-When: Thu Mar 17 06:08:03 GMT 2005 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78782 
>Unformatted:
