From ca65c57cee88f5ae79b9da84343404d91d34b702 Mon Sep 17 00:00:00 2001 From: mi Date: Fri, 27 Apr 2001 17:01:06 +0000 Subject: . Upgrade to the latest version. . Change the port versioning scheme from the seemingly static 1.0 to one based on the date (the way author releases it). . Enable the SSL (https) support by default (unless NO_OPENSSL is set). . Use Makefile.bsd instead of patching the software's Makefile -- the new Makefile.bsd is nearly twice smaller than the old patch-aa. . Add the author-approved patch-idle, which allows to specify the timeout at run-time (on command line), instead of at compile-time. The maintainer submitted the PR below three weeks ago, and agreed for me to close it with this commit. Approved by: maintainer PR: ports/26429 (related) --- www/http_load/Makefile | 12 ++++++++++-- www/http_load/distinfo | 2 +- www/http_load/files/Makefile.bsd | 12 ++++++++++++ www/http_load/files/patch-aa | 16 --------------- www/http_load/files/patch-idle | 42 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 19 deletions(-) create mode 100644 www/http_load/files/Makefile.bsd delete mode 100644 www/http_load/files/patch-aa create mode 100644 www/http_load/files/patch-idle (limited to 'www/http_load') diff --git a/www/http_load/Makefile b/www/http_load/Makefile index 4c988c5fb204..02fce648d023 100644 --- a/www/http_load/Makefile +++ b/www/http_load/Makefile @@ -6,15 +6,23 @@ # PORTNAME= http_load -PORTVERSION= 1.0 +PORTVERSION= 20010405 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/http_load/ -DISTNAME= http_load_10nov99 +DISTNAME= http_load_05apr2001 MAINTAINER= ask@valueclick.com WRKSRC= ${WRKDIR}/http_load +MAKEFILE= ${FILESDIR}/Makefile.bsd MAN1= http_load.1 +MANCOMPRESSED= maybe + +.ifndef NO_OPENSSL +USE_OPENSSL= yes +.else +PKGNAMESUFFIX= -nossl +.endif .include diff --git a/www/http_load/distinfo b/www/http_load/distinfo index a7610bd6a381..58d5bc4cadd8 100644 --- a/www/http_load/distinfo +++ b/www/http_load/distinfo @@ -1 +1 @@ -MD5 (http_load_10nov99.tar.gz) = 0a673461ba291c2070f9b93015bf85bf +MD5 (http_load_05apr2001.tar.gz) = 69e2269ae71692b12d1db64eadbcf8a0 diff --git a/www/http_load/files/Makefile.bsd b/www/http_load/files/Makefile.bsd new file mode 100644 index 000000000000..a26caac69497 --- /dev/null +++ b/www/http_load/files/Makefile.bsd @@ -0,0 +1,12 @@ +PROG = http_load +SRCS = http_load.c timers.c + +.ifndef NO_OPENSSL +CFLAGS += -DUSE_SSL -I${OPENSSLBASE}/include ${OPENSSL_CFLAGS} +LDADD += -L${OPENSSLBASE}/lib -lssl -lcrypto +.endif + +BINDIR = ${LOCALBASE}/bin +MANDIR = ${LOCALBASE}/man/man + +.include diff --git a/www/http_load/files/patch-aa b/www/http_load/files/patch-aa deleted file mode 100644 index 57e16a17840e..000000000000 --- a/www/http_load/files/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.orig Thu Sep 9 21:13:21 1999 -+++ Makefile Sat Jul 29 15:36:30 2000 -@@ -16,9 +16,10 @@ - - BINDIR = /usr/local/bin - MANDIR = /usr/local/man/man1 --CC = gcc --#CFLAGS = -O $(SSL_DEFS) $(SSL_INC) --CFLAGS = -g $(SSL_DEFS) $(SSL_INC) -+CC ?= gcc -+CFLAGS ?= -O -+CFLAGS += $(SSL_DEFS) $(SSL_INC) -+#CFLAGS = -g $(SSL_DEFS) $(SSL_INC) - #LDFLAGS = -s $(SSL_LIBS) $(SYSV_LIBS) - LDFLAGS = -g $(SSL_LIBS) $(SYSV_LIBS) - diff --git a/www/http_load/files/patch-idle b/www/http_load/files/patch-idle new file mode 100644 index 000000000000..720423a4ef00 --- /dev/null +++ b/www/http_load/files/patch-idle @@ -0,0 +1,42 @@ +--- http_load.c Thu Apr 5 21:07:27 2001 ++++ http_load.c Thu Apr 26 16:11:40 2001 +@@ -139,2 +139,3 @@ + static int do_checksum, do_throttle, do_verbose, do_jitter, do_proxy; ++static int idle_secs = IDLE_SECS; + static float throttle; +@@ -311,2 +312,12 @@ + } ++ else if ( strncmp( argv[argn], "-timeout", sizeof("-timeout") ) == 0 && argn + 1 < argc ) ++ { ++ idle_secs = atoi( argv[++argn] ); ++ if ( idle_secs < 1 ) ++ { ++ (void) fprintf( ++ stderr, "%s: timeout seconds must be at least 1\n", argv0 ); ++ exit( 1 ); ++ } ++ } + else +@@ -459,2 +470,4 @@ + (void) fprintf( stderr, ++ " -timeout N\n" ); ++ (void) fprintf( stderr, + " -fetches N | -seconds N\n" ); +@@ -629,3 +642,3 @@ + connections[cnum].idle_timer = tmr_create( +- nowP, idle_connection, client_data, IDLE_SECS * 1000L, 0 ); ++ nowP, idle_connection, client_data, idle_secs * 1000L, 0 ); + connections[cnum].wakeup_timer = (Timer*) 0; +--- http_load.1 Fri Mar 30 22:42:13 2001 ++++ http_load.1 Thu Apr 26 16:27:09 2001 +@@ -10,2 +10,4 @@ + .RB [ -verbose ] ++.RB [ -timeout ++.IR seconds ] + .RI ( +@@ -48,2 +50,5 @@ + The -proxy flag lets you run http_load through a web proxy. ++.PP ++The -timeout flag specifies the amount of seconds to wait for request. ++Default is a compile-time define. (Usually -- 60 seconds). + .PP -- cgit