Date: 1 Feb 2005 22:03:55 -0000 From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/76980: [Maintainer] www/gatling: update to 0.6 Message-ID: <20050201220355.6242.qmail@laurel.tmseck.homedns.org> Resent-Message-ID: <200502012210.j11MAGgH031820@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76980
>Category: ports
>Synopsis: [Maintainer] www/gatling: update to 0.6
>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 Feb 01 22:10:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 4.11-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of Feb 01, 2005.
>Description:
- update gatling to 0.6
- remove a patch that is no longer needed
- move server programs to ${PREFIX}/sbin
Note: this version requires libowfat >= 0.21 to be installed in order to
build!
Note to committer:
please 'cvs rm' files/patch-gatling.c
(sorry for the churn, the vendor decided to release 0.6 shortly after
I submitted the update to 0.5_2)
ports/UPDATING information:
AFFECTS: users of www/gatling
AUTHOR: tmseck@netcologne.de
gatling-0.6 needs at least libowfat-0.21 to build. Please update
devel/libowfat manually before you update gatling or use
'portupgrade -R gatling' to automate this process.
>How-To-Repeat:
>Fix:
Apply this patch:
Index: distinfo
===================================================================
--- distinfo (.../www/gatling) (revision 387)
+++ distinfo (.../local/gatling) (revision 387)
@@ -1,2 +1,2 @@
-MD5 (gatling-0.5.tar.bz2) = ee15becac325864afc99cca6f3d08779
-SIZE (gatling-0.5.tar.bz2) = 42576
+MD5 (gatling-0.6.tar.bz2) = 2067d666c01834f2c8702b08644f95d8
+SIZE (gatling-0.6.tar.bz2) = 47267
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile (.../www/gatling) (revision 387)
+++ files/patch-Makefile (.../local/gatling) (revision 387)
@@ -1,14 +1,7 @@
---- Makefile.orig Sat May 8 02:26:21 2004
-+++ 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
+--- Makefile.orig Tue Feb 1 17:50:50 2005
++++ Makefile Tue Feb 1 17:53:20 2005
+@@ -8,10 +8,6 @@
- TARGET=gatling httpbench dl bindbench mmapbench forkbench pthreadbench \
- mktestdata manymapbench ioerr forksbench
-
all: $(TARGET)
-CC=gcc
@@ -18,7 +11,7 @@
gatling: gatling.o libsocket libiconv
$(CC) -o $@ gatling.o $(LDFLAGS) `cat libsocket libiconv`
-@@ -34,7 +31,7 @@
+@@ -34,7 +30,7 @@
$(CC) -static -o $@ forkbench.o $(LDFLAGS)
pthreadbench: pthreadbench.o
@@ -27,3 +20,12 @@
mktestdata: mktestdata.o
$(CC) -o $@ mktestdata.o $(LDFLAGS)
+@@ -50,7 +50,7 @@
+ $(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)
+
+ 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 387)
+++ files/patch-gatling.c (.../local/gatling) (revision 387)
@@ -1,19 +0,0 @@
---- gatling.c.orig Wed Jul 28 15:23:51 2004
-+++ gatling.c Mon Jan 31 18:42:03 2005
-@@ -1261,6 +1261,7 @@ e404:
- ++c;
- if ((i=scan_ulonglong(c,&range_last))) {
- if (!i) goto rangeerror;
-+ ++range_last;
- }
- }
- } else {
-@@ -1311,7 +1312,7 @@ rangeerror:
- c+=fmt_str(c,"\r\nContent-Range: bytes ");
- c+=fmt_ulonglong(c,range_first);
- c+=fmt_str(c,"-");
-- c+=fmt_ulonglong(c,range_last);
-+ c+=fmt_ulonglong(c,range_last-1);
- c+=fmt_str(c,"/");
- c+=fmt_ulonglong(c,ss.st_size);
- }
Index: Makefile
===================================================================
--- Makefile (.../www/gatling) (revision 387)
+++ Makefile (.../local/gatling) (revision 387)
@@ -2,12 +2,11 @@
# Date created: Feb 21, 2004
# Whom: Thomas-Martin Seck <tmseck@netcologne.de>
#
-# $FreeBSD: ports/www/gatling/Makefile,v 1.6 2005/02/01 12:11:48 vs Exp $
+# $FreeBSD$
#
PORTNAME= gatling
-PORTVERSION= 0.5
-PORTREVISION= 2
+PORTVERSION= 0.6
CATEGORIES= www benchmarks ftp ipv6
MASTER_SITES= http://dl.fefe.de/
@@ -17,17 +16,21 @@
BUILD_DEPENDS= ${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/devel/libowfat
USE_BZIP2= yes
+USE_OPENSSL= yes
-MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lowfat" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+CFLAGS+= -I${LOCALBASE}/include/libowfat -I${OPENSSLINC}
+LDFLAGS+= -L${LOCALBASE}/lib -lowfat -L${OPENSSLLIB}
-bin= dl gatling
+MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+bin= dl
examples= run-gatling
examplesdir= ${EXAMPLESDIR:S,^${PREFIX}/,,}
+sbin= gatling tlsgatling
MAN8= gatling.8
.if !defined(NOPORTDOCS)
-PORTDOCS= CHANGES README README.ftp README.http README.performance \
- README.prefetch README.proxy README.redirect
+PORTDOCS= CHANGES README README.ftp README.htaccess README.http \
+ README.performance README.prefetch README.proxy README.redirect
.endif
OPTIONS= BENCHMARKS "Install system benchmark programs" on
@@ -43,13 +46,15 @@
.endif
PLIST_DIRS= ${examplesdir}
-PLIST_FILES= ${bin:S,^,bin/,} ${examples:S,^,${examplesdir}/,}
+PLIST_FILES= ${bin:S,^,bin/,} ${examples:S,^,${examplesdir}/,} \
+ ${sbin:S,^,sbin/,}
pre-install:
@cd ${WRKSRC} && ${CP} gatling.1 gatling.8
do-install:
cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin
+ cd ${WRKSRC} && ${INSTALL_PROGRAM} ${sbin} ${PREFIX}/sbin
${MKDIR} ${EXAMPLESDIR}
cd ${WRKSRC} && ${INSTALL_SCRIPT} ${examples} ${EXAMPLESDIR}
cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050201220355.6242.qmail>