From owner-svn-ports-all@FreeBSD.ORG Wed Jun 3 18:04:59 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1F81BA; Wed, 3 Jun 2015 18:04:59 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B23521D0F; Wed, 3 Jun 2015 18:04:59 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t53I4xh0092223; Wed, 3 Jun 2015 18:04:59 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t53I4vdC092213; Wed, 3 Jun 2015 18:04:57 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201506031804.t53I4vdC092213@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 3 Jun 2015 18:04:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388463 - in head/www/webstone: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2015 18:04:59 -0000 Author: amdmi3 Date: Wed Jun 3 18:04:57 2015 New Revision: 388463 URL: https://svnweb.freebsd.org/changeset/ports/388463 Log: - Add LICENSE - Fix shebangs - Simplify WRKSRC handling - Fix stripping - Drop @dirrm* from plist Added: head/www/webstone/files/patch-src_CGI-test_ws25__cgi.c - copied, changed from r387511, head/www/webstone/files/patch-CGI-test__ws25_cgi.c head/www/webstone/files/patch-src_Makefile.in - copied, changed from r387511, head/www/webstone/files/patch-Makefile.in head/www/webstone/files/patch-src_genrand.c - copied, changed from r387511, head/www/webstone/files/patch-genrand.c head/www/webstone/files/patch-src_webclient.c - copied, changed from r387511, head/www/webstone/files/patch-webclient.c head/www/webstone/files/patch-src_webmaster.c - copied, changed from r387511, head/www/webstone/files/patch-webmaster.c Deleted: head/www/webstone/files/patch-CGI-test__ws25_cgi.c head/www/webstone/files/patch-Makefile.in head/www/webstone/files/patch-genrand.c head/www/webstone/files/patch-webclient.c head/www/webstone/files/patch-webmaster.c Modified: head/www/webstone/Makefile head/www/webstone/pkg-plist Modified: head/www/webstone/Makefile ============================================================================== --- head/www/webstone/Makefile Wed Jun 3 18:03:08 2015 (r388462) +++ head/www/webstone/Makefile Wed Jun 3 18:04:57 2015 (r388463) @@ -3,6 +3,7 @@ PORTNAME= webstone PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= www benchmarks MASTER_SITES= http://www.mindcraft.com/webstone/ DISTNAME= ws25_src @@ -10,28 +11,41 @@ DISTNAME= ws25_src MAINTAINER= ports@FreeBSD.org COMMENT= World wide web server benchmarking -USES= tar:tgz +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= shebangfix tar:tgz GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/WebStone2.5/src +WRKSRC= ${WRKDIR}/WebStone${PORTVERSION} +CONFIGURE_WRKSRC= ${WRKSRC}/src +BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= install +post-patch: + @${FIND} ${WRKSRC}/bin -name "*.pl" -o -name "*.wpl" | ${XARGS} \ + ${REINPLACE_CMD} -i '' -e '1s|.*perl.*|#!${perl_CMD}|' + do-install: - @${RM} ${WRKSRC}/../bin/runs/keepme - @${RMDIR} ${WRKSRC}/../bin/runs + @${RM} ${WRKSRC}/bin/runs/keepme + @${RMDIR} ${WRKSRC}/bin/runs @${MKDIR} ${STAGEDIR}${PREFIX}/webstone/bin @${MKDIR} ${STAGEDIR}${PREFIX}/webstone/conf @${MKDIR} ${STAGEDIR}${PREFIX}/webstone/lgm - ${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${STAGEDIR}${PREFIX}/webstone/bin - ${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${STAGEDIR}${PREFIX}/webstone/lgm - ${INSTALL_DATA} ${WRKSRC}/../conf/* ${STAGEDIR}${PREFIX}/webstone/conf - ${INSTALL_SCRIPT} ${WRKSRC}/../webstone ${STAGEDIR}${PREFIX}/webstone - @${MKDIR} ${WRKSRC}/../bin/runs - @${TOUCH} ${WRKSRC}/../bin/runs/keepme + ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/webstone/bin + ${INSTALL_SCRIPT} ${WRKSRC}/lgm/* ${STAGEDIR}${PREFIX}/webstone/lgm + ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${PREFIX}/webstone/conf + ${INSTALL_SCRIPT} ${WRKSRC}/webstone ${STAGEDIR}${PREFIX}/webstone + @${MKDIR} ${WRKSRC}/bin/runs + @${TOUCH} ${WRKSRC}/bin/runs/keepme .for file in webclient webmaster genrand + ${CHMOD} u+w ${STAGEDIR}${PREFIX}/webstone/bin/${file} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone/bin/${file} + ${CHMOD} u-w ${STAGEDIR}${PREFIX}/webstone/bin/${file} .endfor .for file in ws20_cgi ws25_cgi + ${CHMOD} u+w ${STAGEDIR}${PREFIX}/webstone/lgm/${file} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone/lgm/${file} + ${CHMOD} u-w ${STAGEDIR}${PREFIX}/webstone/lgm/${file} .endfor .include Copied and modified: head/www/webstone/files/patch-src_CGI-test_ws25__cgi.c (from r387511, head/www/webstone/files/patch-CGI-test__ws25_cgi.c) ============================================================================== --- head/www/webstone/files/patch-CGI-test__ws25_cgi.c Tue May 26 18:50:09 2015 (r387511, copy source) +++ head/www/webstone/files/patch-src_CGI-test_ws25__cgi.c Wed Jun 3 18:04:57 2015 (r388463) @@ -1,5 +1,5 @@ ---- CGI-test/ws25_cgi.c~ 1998-07-25 10:49:54.000000000 +0200 -+++ CGI-test/ws25_cgi.c 2011-12-20 19:17:47.104175312 +0100 +--- src/CGI-test/ws25_cgi.c.orig 1998-07-25 08:49:54 UTC ++++ src/CGI-test/ws25_cgi.c @@ -62,7 +62,7 @@ #include #include Copied and modified: head/www/webstone/files/patch-src_Makefile.in (from r387511, head/www/webstone/files/patch-Makefile.in) ============================================================================== --- head/www/webstone/files/patch-Makefile.in Tue May 26 18:50:09 2015 (r387511, copy source) +++ head/www/webstone/files/patch-src_Makefile.in Wed Jun 3 18:04:57 2015 (r388463) @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Sep 4 18:52:21 2000 -+++ Makefile.in Mon Sep 4 18:52:45 2000 -@@ -64,9 +64,9 @@ +--- src/Makefile.in.orig 1998-07-25 07:50:19 UTC ++++ src/Makefile.in +@@ -64,9 +64,9 @@ TARGETS = $(EXECUTABLE1) $(EXECUTABLE2) .SUFFIXES: .SUFFIXES: .c .o Copied and modified: head/www/webstone/files/patch-src_genrand.c (from r387511, head/www/webstone/files/patch-genrand.c) ============================================================================== --- head/www/webstone/files/patch-genrand.c Tue May 26 18:50:09 2015 (r387511, copy source) +++ head/www/webstone/files/patch-src_genrand.c Wed Jun 3 18:04:57 2015 (r388463) @@ -1,5 +1,5 @@ ---- genrand.c~ 1998-07-25 09:50:16.000000000 +0200 -+++ genrand.c 2011-12-20 19:16:38.086174883 +0100 +--- src/genrand.c.orig 1998-07-25 07:50:16 UTC ++++ src/genrand.c @@ -31,7 +31,7 @@ #include #include "sysdep.h" @@ -9,7 +9,7 @@ main(const int argc, char* argv[]) { FILE* file; -@@ -70,4 +70,5 @@ +@@ -70,4 +70,5 @@ main(const int argc, char* argv[]) } fclose(file); Copied and modified: head/www/webstone/files/patch-src_webclient.c (from r387511, head/www/webstone/files/patch-webclient.c) ============================================================================== --- head/www/webstone/files/patch-webclient.c Tue May 26 18:50:09 2015 (r387511, copy source) +++ head/www/webstone/files/patch-src_webclient.c Wed Jun 3 18:04:57 2015 (r388463) @@ -1,6 +1,6 @@ ---- webclient.c.orig 1998-07-25 09:50:17.000000000 +0200 -+++ webclient.c 2011-12-20 19:15:12.739176097 +0100 -@@ -79,7 +79,7 @@ +--- src/webclient.c.orig 1998-07-25 07:50:17 UTC ++++ src/webclient.c +@@ -79,7 +79,7 @@ char webserver[MAXHOSTNAMELEN]; char proxyserver[MAXHOSTNAMELEN]; char debug_filename[MAXPATHLEN]; @@ -9,7 +9,7 @@ THREAD FILE *logfile; THREAD stats_t timestat; THREAD rqst_timer_t timerarray[MAXNUMOFFILES]; -@@ -691,7 +691,7 @@ +@@ -691,7 +691,7 @@ ParseCmdLine(int argc, char **argv ) } } @@ -18,7 +18,7 @@ main(int argc, char *argv[]) { long fcount = 0; -@@ -928,7 +928,7 @@ +@@ -928,7 +928,7 @@ main(int argc, char *argv[]) CloseHandle(hSemaphore); #endif /* WIN32 */ Copied and modified: head/www/webstone/files/patch-src_webmaster.c (from r387511, head/www/webstone/files/patch-webmaster.c) ============================================================================== --- head/www/webstone/files/patch-webmaster.c Tue May 26 18:50:09 2015 (r387511, copy source) +++ head/www/webstone/files/patch-src_webmaster.c Wed Jun 3 18:04:57 2015 (r388463) @@ -1,6 +1,6 @@ ---- webmaster.c.orig 1998-07-25 09:50:18.000000000 +0200 -+++ webmaster.c 2011-12-20 19:14:07.911175579 +0100 -@@ -88,7 +88,7 @@ +--- src/webmaster.c.orig 1998-07-25 07:50:18 UTC ++++ src/webmaster.c +@@ -88,7 +88,7 @@ int num_rexecs = 0; SOCKET socknum[MAXCLIENTS]; SOCKET sockIO[MAXTOTALPROCS]; SOCKET sockErr[MAXTOTALPROCS]; @@ -9,7 +9,7 @@ struct hostent *master_phe; /* IP addresses for webmaster */ -@@ -1343,7 +1343,7 @@ +@@ -1343,7 +1343,7 @@ sock_cleanup(void) } #endif /* WIN32 */ @@ -18,7 +18,7 @@ main(const int argc, char *argv[]) { -@@ -1385,6 +1385,7 @@ +@@ -1385,6 +1385,7 @@ main(const int argc, char *argv[]) /* Initalization of variables. */ /* debugfile = stdout; */ Modified: head/www/webstone/pkg-plist ============================================================================== --- head/www/webstone/pkg-plist Wed Jun 3 18:03:08 2015 (r388462) +++ head/www/webstone/pkg-plist Wed Jun 3 18:04:57 2015 (r388463) @@ -47,7 +47,3 @@ webstone/lgm/keepme webstone/lgm/ws20_cgi webstone/lgm/ws25_cgi webstone/webstone -@dirrm webstone/bin -@dirrm webstone/conf -@dirrm webstone/lgm -@dirrm webstone