diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2004-07-30 22:21:53 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-07-30 22:21:53 +0000 |
commit | 7476d04c1cf2e71d6c3dde7e7a8c24d1208842d3 (patch) | |
tree | fe700d0052651783cd0a050ddb38bd6755b269b3 /www/gatling | |
parent | - Update to 0.20 (diff) |
- Update to 0.5
PR: ports/69801
Submitted by: Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=115124
Diffstat (limited to 'www/gatling')
-rw-r--r-- | www/gatling/Makefile | 6 | ||||
-rw-r--r-- | www/gatling/distinfo | 4 | ||||
-rw-r--r-- | www/gatling/files/patch-Makefile | 14 | ||||
-rw-r--r-- | www/gatling/files/patch-gatling.c | 31 |
4 files changed, 12 insertions, 43 deletions
diff --git a/www/gatling/Makefile b/www/gatling/Makefile index 65e35ef32b51..a502724a457c 100644 --- a/www/gatling/Makefile +++ b/www/gatling/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gatling -PORTVERSION= 0.4 -PORTREVISION= 2 +PORTVERSION= 0.5 CATEGORIES= www benchmarks MASTER_SITES= http://dl.fefe.de/ @@ -18,6 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/devel/libowfat USE_BZIP2= yes +CFLAGS+= -I${LOCALBASE}/include/libowfat MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lowfat" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -26,7 +26,7 @@ examples= run-gatling examplesdir= ${EXAMPLESDIR:S,^${PREFIX}/,,} .if !defined(NOPORTDOCS) PORTDOCS= CHANGES README README.ftp README.http README.performance \ - README.prefetch + README.prefetch README.proxy README.redirect .endif OPTIONS= BENCHMARKS "Install system benchmark programs" on diff --git a/www/gatling/distinfo b/www/gatling/distinfo index 9aceabc339c7..57155a1b1540 100644 --- a/www/gatling/distinfo +++ b/www/gatling/distinfo @@ -1,2 +1,2 @@ -MD5 (gatling-0.4.tar.bz2) = fcc8dffa24663205c0bb317dee74b22b -SIZE (gatling-0.4.tar.bz2) = 33923 +MD5 (gatling-0.5.tar.bz2) = ee15becac325864afc99cca6f3d08779 +SIZE (gatling-0.5.tar.bz2) = 42576 diff --git a/www/gatling/files/patch-Makefile b/www/gatling/files/patch-Makefile index 8ad9d66eb310..44aad7e04229 100644 --- a/www/gatling/files/patch-Makefile +++ b/www/gatling/files/patch-Makefile @@ -1,17 +1,17 @@ ---- Makefile.orig Thu Feb 19 17:22:17 2004 -+++ Makefile Mon Feb 23 01:12:25 2004 -@@ -6,9 +6,7 @@ +--- Makefile.orig Sat May 8 02:26:21 2004 ++++ Makefile Fri Jul 30 11:06:07 2004 +@@ -8,10 +8,6 @@ all: $(TARGET) -CC=gcc --CFLAGS=-pipe -Wall -Os -I../libowfat/ +-CFLAGS=-pipe -Wall -O -I../libowfat/ -LDFLAGS=-s -L../libowfat/ -lowfat -+CFLAGS+=-I${LOCALBASE}/include/libowfat - +- gatling: gatling.o libsocket libiconv $(CC) -o $@ gatling.o $(LDFLAGS) `cat libsocket libiconv` -@@ -32,7 +30,7 @@ + +@@ -34,7 +30,7 @@ $(CC) -static -o $@ forkbench.o $(LDFLAGS) pthreadbench: pthreadbench.o diff --git a/www/gatling/files/patch-gatling.c b/www/gatling/files/patch-gatling.c deleted file mode 100644 index 9d9c2f94306c..000000000000 --- a/www/gatling/files/patch-gatling.c +++ /dev/null @@ -1,31 +0,0 @@ -! Fix a filedescriptor leak. This change requires libowfat-0.18 -! Correct return code for FTP CWD -! Obtained from gatling cvs ---- gatling.c.orig Fri Feb 27 16:09:53 2004 -+++ gatling.c Fri Feb 27 16:13:28 2004 -@@ -876,7 +876,7 @@ - c+=fmt_str(c,"\r\n\r\n"); - iob_addbuf_free(&h->iob,h->hdrbuf,c - h->hdrbuf); - if (!head) -- iob_addfile(&h->iob,fd,range_first,range_last-range_first); -+ iob_addfile_close(&h->iob,fd,range_first,range_last-range_first); - if (logging) { - if (h->hdrbuf[9]=='3') { - buffer_puts(buffer_1,head?"HEAD/304 ":"GET/304 "); -@@ -1034,7 +1034,7 @@ - range_last=ss.st_size; - range_first=h->ftp_rest; h->ftp_rest=0; - if (range_first>range_last) range_first=range_last; -- iob_addfile(&b->iob,b->filefd,range_first,range_last-range_first); -+ iob_addfile_close(&b->iob,b->filefd,range_first,range_last-range_first); - if (logging) { - buffer_putulonglong(buffer_1,range_last-range_first); - buffer_putspace(buffer_1); -@@ -1428,7 +1428,7 @@ - } - y[fmt_str(y,x)]=0; - h->ftppath=y; -- h->hdrbuf="200 ok.\r\n"; -+ h->hdrbuf="250 ok.\r\n"; - return 0; - } |