From tmseck@netcologne.de  Sat Aug  7 09:47:09 2004
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 D7EFD16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Aug 2004 09:47:09 +0000 (GMT)
Received: from smtp2.netcologne.de (smtp2.netcologne.de [194.8.194.218])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A054D43D5A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Aug 2004 09:47:09 +0000 (GMT)
	(envelope-from tmseck@netcologne.de)
Received: from laurel.tmseck.homedns.org (xdsl-213-196-247-102.netcologne.de [213.196.247.102])
	by smtp2.netcologne.de (Postfix) with SMTP id 0E04E4482
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Aug 2004 11:47:08 +0200 (MEST)
Received: (qmail 34536 invoked by uid 1001); 7 Aug 2004 09:47:29 -0000
Message-Id: <20040807094729.34535.qmail@laurel.tmseck.homedns.org>
Date: 7 Aug 2004 09:47:29 -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: install manpage, add to ftp and ipv6 categories
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         70111
>Category:       ports
>Synopsis:       [Maintainer] www/gatling: install manpage, add to ftp and ipv6 categories
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 07 09:50:21 GMT 2004
>Closed-Date:    Thu Aug 12 16:14:02 GMT 2004
>Last-Modified:  Thu Aug 12 16:14:02 GMT 2004
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of August 7th, 2004.

	
>Description:
	
Install a manpage for gatling and add the port to the ftp and ipv6 categories.

Note to committer:
please "cvs add" files/patch-gatling.1
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: files/patch-gatling.1
===================================================================
--- files/patch-gatling.1	(revision 0)
+++ files/patch-gatling.1	(revision 167)
@@ -0,0 +1,8 @@
+--- gatling.1.orig	Sat Aug  7 10:59:24 2004
++++ gatling.1	Sat Aug  7 10:59:37 2004
+@@ -1,4 +1,4 @@
+-.TH gatling 8
++.TH gatling 1
+ .SH NAME
+ gatling \- high performance file server
+ .SH SYNOPSIS
Index: Makefile
===================================================================
--- Makefile	(.../www/gatling)	(revision 167)
+++ Makefile	(.../local/gatling)	(revision 167)
@@ -7,7 +7,8 @@
 
 PORTNAME=	gatling
 PORTVERSION=	0.5
-CATEGORIES=	www benchmarks
+PORTREVISION=	1
+CATEGORIES=	www benchmarks ftp ipv6
 MASTER_SITES=	http://dl.fefe.de/
 
 MAINTAINER=	tmseck@netcologne.de
@@ -24,6 +25,7 @@
 bin=		dl gatling
 examples=	run-gatling
 examplesdir=	${EXAMPLESDIR:S,^${PREFIX}/,,}
+MAN1=		gatling.1
 .if !defined(NOPORTDOCS)
 PORTDOCS=	CHANGES README README.ftp README.http README.performance \
 		README.prefetch README.proxy README.redirect
@@ -48,6 +50,7 @@
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin
 	${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${examples} ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>Release-Note:
>Audit-Trail:

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/70111: [Maintainer] www/gatling: install manpage, add to ftp and ipv6 categories
Date: Sat, 7 Aug 2004 18:28:05 +0200

 Sorry, the manpage belongs to section 8, at least on FreeBSD if I
 understand intro(8) correctly.
 
 Please apply this patch, files/patch-gatling.1 is not needed:
 
 Index: Makefile
 ===================================================================
 --- Makefile	(.../www/gatling)	(revision 168)
 +++ Makefile	(.../local/gatling)	(revision 168)
 @@ -7,7 +7,8 @@
  
  PORTNAME=	gatling
  PORTVERSION=	0.5
 -CATEGORIES=	www benchmarks
 +PORTREVISION=	1
 +CATEGORIES=	www benchmarks ftp ipv6
  MASTER_SITES=	http://dl.fefe.de/
  
  MAINTAINER=	tmseck@netcologne.de
 @@ -24,6 +25,7 @@
  bin=		dl gatling
  examples=	run-gatling
  examplesdir=	${EXAMPLESDIR:S,^${PREFIX}/,,}
 +MAN8=		gatling.1
  .if !defined(NOPORTDOCS)
  PORTDOCS=	CHANGES README README.ftp README.http README.performance \
  		README.prefetch README.proxy README.redirect
 @@ -48,6 +50,7 @@
  	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin
  	${MKDIR} ${EXAMPLESDIR}
  	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${examples} ${EXAMPLESDIR}
 +	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MAN1PREFIX}/man/man8
  .if !defined(NOPORTDOCS)
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/70111: [Maintainer] www/gatling: install manpage, add to ftp and ipv6 categories
Date: Sat, 7 Aug 2004 18:33:13 +0200

 * Thomas-Martin Seck (tmseck@netcologne.de):
 
 > Sorry, the manpage belongs to section 8, at least on FreeBSD if I
 > understand intro(8) correctly.
 > 
 > Please apply this patch, files/patch-gatling.1 is not needed:
 > 
 
 Sigh. It's too muggy today. This is the correct patch (fixed MANnPREFIX):
 
 Index: Makefile
 ===================================================================
 --- Makefile	(.../www/gatling)	(revision 169)
 +++ Makefile	(.../local/gatling)	(revision 169)
 @@ -7,7 +7,8 @@
  
  PORTNAME=	gatling
  PORTVERSION=	0.5
 -CATEGORIES=	www benchmarks
 +PORTREVISION=	1
 +CATEGORIES=	www benchmarks ftp ipv6
  MASTER_SITES=	http://dl.fefe.de/
  
  MAINTAINER=	tmseck@netcologne.de
 @@ -24,6 +25,7 @@
  bin=		dl gatling
  examples=	run-gatling
  examplesdir=	${EXAMPLESDIR:S,^${PREFIX}/,,}
 +MAN8=		gatling.1
  .if !defined(NOPORTDOCS)
  PORTDOCS=	CHANGES README README.ftp README.http README.performance \
  		README.prefetch README.proxy README.redirect
 @@ -48,6 +50,7 @@
  	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin
  	${MKDIR} ${EXAMPLESDIR}
  	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${examples} ${EXAMPLESDIR}
 +	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
  .if !defined(NOPORTDOCS)
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/70111: [Maintainer] www/gatling: install manpage, add to ftp and ipv6 categories
Date: Sun, 8 Aug 2004 16:00:59 +0200

 * Thomas-Martin Seck (tmseck@netcologne.de):
 
 > * Thomas-Martin Seck (tmseck@netcologne.de):
 > 
 > > Sorry, the manpage belongs to section 8, at least on FreeBSD if I
 > > understand intro(8) correctly.
 > > 
 > > Please apply this patch, files/patch-gatling.1 is not needed:
 > > 
 > 
 > Sigh. It's too muggy today. This is the correct patch (fixed MANnPREFIX):
 
 Sorry for polluting the gnats db :(
 
 This patch does install gatling.8 in the right place and in a way that
 man(1) does indeed find it afterwards:
 
 Index: Makefile
 ===================================================================
 --- Makefile	(.../www/gatling)	(revision 170)
 +++ Makefile	(.../local/gatling)	(revision 170)
 @@ -7,7 +7,8 @@
  
  PORTNAME=	gatling
  PORTVERSION=	0.5
 -CATEGORIES=	www benchmarks
 +PORTREVISION=	1
 +CATEGORIES=	www benchmarks ftp ipv6
  MASTER_SITES=	http://dl.fefe.de/
  
  MAINTAINER=	tmseck@netcologne.de
 @@ -24,6 +25,7 @@
  bin=		dl gatling
  examples=	run-gatling
  examplesdir=	${EXAMPLESDIR:S,^${PREFIX}/,,}
 +MAN8=		gatling.8
  .if !defined(NOPORTDOCS)
  PORTDOCS=	CHANGES README README.ftp README.http README.performance \
  		README.prefetch README.proxy README.redirect
 @@ -44,10 +46,14 @@
  PLIST_DIRS=	${examplesdir}
  PLIST_FILES=	${bin:S,^,bin/,} ${examples:S,^,${examplesdir}/,}
  
 +pre-install:
 +	@cd ${WRKSRC} && ${CP} gatling.1 gatling.8
 +
  do-install:
  	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin
  	${MKDIR} ${EXAMPLESDIR}
  	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${examples} ${EXAMPLESDIR}
 +	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
  .if !defined(NOPORTDOCS)
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
State-Changed-From-To: open->feedback 
State-Changed-By: sem 
State-Changed-When: Tue Aug 10 11:57:19 GMT 2004 
State-Changed-Why:  
Ask submitter for feedback. 

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

From: Sergey Matveychuk <sem@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, tmseck@netcologne.de
Cc:  
Subject: Re: ports/70111: [Maintainer] www/gatling: install manpage, add to
 ftp and ipv6 categories
Date: Tue, 10 Aug 2004 15:57:05 +0400

 1) Does not compile on CURRENT.
 2) Why did you add this port in ftp category?
 
 -- 
 Sem.

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: Sergey Matveychuk <sem@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/70111: [Maintainer] www/gatling: install manpage, add to ftp and ipv6 categories
Date: Tue, 10 Aug 2004 17:44:01 +0200

 * Sergey Matveychuk (sem@FreeBSD.org):
 
 > 1) Does not compile on CURRENT.
 
 Is this a gcc-3.4 issue? Since it does compile on a stock 5.2.1, is it
 sufficient if I'll try to reproduce and fix it using the gcc 3.4 port?
 (I do not have room for a separate -current installation on my
 development box right now).
 
 > 2) Why did you add this port in ftp category?
 
 gatling serves files via HTTP and FTP by default. Come think of it, the
 COMMENT could be updated, too to reflect this.

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: Sergey Matveychuk <sem@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/70111: [Maintainer] www/gatling: install manpage, add to ftp and ipv6 categories
Date: Thu, 12 Aug 2004 06:54:26 +0200

 * Thomas-Martin Seck (tmseck@netcologne.de):
 
 > * Sergey Matveychuk (sem@FreeBSD.org):
 > 
 > > 1) Does not compile on CURRENT.
 > 
 > Is this a gcc-3.4 issue? Since it does compile on a stock 5.2.1, is it
 > sufficient if I'll try to reproduce and fix it using the gcc 3.4 port?
 > (I do not have room for a separate -current installation on my
 > development box right now).
 
 libowfat and gatling build on 5.2.1 with lang/gcc34 installed (I did
 'make CC=/usr/local/bin/gcc34 build').
 
 So if there is a breakage, it is probably be due to other differences
 between -current and 5.2.1.
 
 Could you give more details why it does not build (for you)?

From: Sergey Matveychuk <sem@FreeBSD.org>
To: Thomas-Martin Seck <tmseck@netcologne.de>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/70111: [Maintainer] www/gatling: install manpage, add to
 ftp and ipv6 categories
Date: Thu, 12 Aug 2004 11:42:45 +0400

 Thomas-Martin Seck wrote:
 
 > Could you give more details why it does not build (for you)?
 
 cc -O -pipe -march=athlon-xp -c gatling.c
 gatling.c:13:20: socket.h: No such file or directory
 gatling.c:14:16: io.h: No such file or directory
 gatling.c:15:20: buffer.h: No such file or directory
 gatling.c:16:17: ip4.h: No such file or directory
 gatling.c:17:17: ip6.h: No such file or directory
 gatling.c:18:19: array.h: No such file or directory
 gatling.c:19:18: case.h: No such file or directory
 gatling.c:20:17: fmt.h: No such file or directory
 gatling.c:21:17: iob.h: No such file or directory
 gatling.c:22:17: str.h: No such file or directory
 gatling.c:23:18: scan.h: No such file or directory
 gatling.c:24:22: textcode.h: No such file or directory
 gatling.c:25:20: uint32.h: No such file or directory
 gatling.c:26:20: uint16.h: No such file or directory
 gatling.c:53:24: havealloca.h: No such file or directory
 gatling.c:56: error: syntax error before "next"
 gatling.c:56: warning: data definition has no type or storage class
 gatling.c:105: error: syntax error before "origdir"
 gatling.c:105: warning: data definition has no type or storage class
 gatling.c: In function `carp':
 
 and more more over
 
 -- 
 Sem.

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: Sergey Matveychuk <sem@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/70111: [Maintainer] www/gatling: install manpage, add to ftp and ipv6 categories
Date: Thu, 12 Aug 2004 17:55:43 +0200

 * Sergey Matveychuk (sem@FreeBSD.org):
 
 > Thomas-Martin Seck wrote:
 > 
 > >Could you give more details why it does not build (for you)?
 > 
 > cc -O -pipe -march=athlon-xp -c gatling.c
 
 Ah, I see. The -I setting is not propagated through. It seems I
 outsmarted make(1) (or myself) when I changed the port to set it via the
 port's Makefile instead of patching the vendor Makefile. Interestingly,
 this works in some environments while it breaks on others.
 
 This patch includes the manpage installation, moves the CFLAGS
 setting back to the patch file where it used to be and announces the FTP
 capability:
 
 Index: pkg-descr
 ===================================================================
 --- pkg-descr	(.../www/gatling)	(revision 175)
 +++ pkg-descr	(.../local/gatling)	(revision 175)
 @@ -1,4 +1,4 @@
 -gatling is a high-performance webserver. Some scalability benchmark
 +gatling is a high-performance HTTP and FTP server. Some scalability benchmark
  tests are included, too.
  
  WWW: http://www.fefe.de/gatling/
 Index: files/patch-Makefile
 ===================================================================
 --- files/patch-Makefile	(.../www/gatling)	(revision 175)
 +++ files/patch-Makefile	(.../local/gatling)	(revision 175)
 @@ -1,7 +1,14 @@
  --- Makefile.orig	Sat May  8 02:26:21 2004
 -+++ Makefile	Fri Jul 30 11:06:07 2004
 -@@ -8,10 +8,6 @@
 ++++ Makefile	Thu Aug 12 11:37:25 2004
 +@@ -2,16 +2,13 @@
 + BINDIR=${prefix}/bin
 + MANDIR=${prefix}/man
 + man1dir=$(MANDIR)/man1
 ++CFLAGS+=-I${LOCALBASE}/include/libowfat
   
 + TARGET=gatling httpbench dl bindbench mmapbench forkbench pthreadbench \
 + mktestdata manymapbench ioerr forksbench
 + 
   all: $(TARGET)
   
  -CC=gcc
 @@ -11,7 +18,7 @@
   gatling: gatling.o libsocket libiconv
   	$(CC) -o $@ gatling.o $(LDFLAGS) `cat libsocket libiconv`
   
 -@@ -34,7 +30,7 @@
 +@@ -34,7 +31,7 @@
   	$(CC) -static -o $@ forkbench.o $(LDFLAGS)
   
   pthreadbench: pthreadbench.o
 Index: Makefile
 ===================================================================
 --- Makefile	(.../www/gatling)	(revision 175)
 +++ Makefile	(.../local/gatling)	(revision 175)
 @@ -7,7 +7,8 @@
  
  PORTNAME=	gatling
  PORTVERSION=	0.5
 -CATEGORIES=	www benchmarks
 +PORTREVISION=	1
 +CATEGORIES=	www benchmarks ftp ipv6
  MASTER_SITES=	http://dl.fefe.de/
  
  MAINTAINER=	tmseck@netcologne.de
 @@ -17,13 +18,13 @@
  
  USE_BZIP2=	yes
  
 -CFLAGS+=	-I${LOCALBASE}/include/libowfat
  MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lowfat" \
  		PTHREAD_LIBS="${PTHREAD_LIBS}"
  
  bin=		dl gatling
  examples=	run-gatling
  examplesdir=	${EXAMPLESDIR:S,^${PREFIX}/,,}
 +MAN8=		gatling.8
  .if !defined(NOPORTDOCS)
  PORTDOCS=	CHANGES README README.ftp README.http README.performance \
  		README.prefetch README.proxy README.redirect
 @@ -44,10 +45,14 @@
  PLIST_DIRS=	${examplesdir}
  PLIST_FILES=	${bin:S,^,bin/,} ${examples:S,^,${examplesdir}/,}
  
 +pre-install:
 +	@cd ${WRKSRC} && ${CP} gatling.1 gatling.8
 +
  do-install:
  	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin
  	${MKDIR} ${EXAMPLESDIR}
  	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${examples} ${EXAMPLESDIR}
 +	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
  .if !defined(NOPORTDOCS)
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
State-Changed-From-To: feedback->closed 
State-Changed-By: sem 
State-Changed-When: Thu Aug 12 16:13:51 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

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