Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Aug 2004 16:00:51 GMT
From:      Thomas-Martin Seck <tmseck@netcologne.de>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/70111: [Maintainer] www/gatling: install manpage, add to ftp and ipv6 categories
Message-ID:  <200408121600.i7CG0pj2032475@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/70111; it has been noted by GNATS.

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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408121600.i7CG0pj2032475>