svn commit: r388810 - in head/www/webstone-ssl: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Jun 8 01:20:09 UTC 2015
Author: amdmi3
Date: Mon Jun 8 01:20:07 2015
New Revision: 388810
URL: https://svnweb.freebsd.org/changeset/ports/388810
Log:
- Add LICENSE
- Fix shebangs
- Simplify WRKSRC handling
- Fix stripping
- Drop @dirrm* from plist
Added:
head/www/webstone-ssl/files/patch-src_Makefile.in
- copied, changed from r388782, head/www/webstone-ssl/files/patch-Makefile.in
head/www/webstone-ssl/files/patch-src_get.c
- copied, changed from r388782, head/www/webstone-ssl/files/patch-get.c
Deleted:
head/www/webstone-ssl/files/patch-Makefile.in
head/www/webstone-ssl/files/patch-get.c
Modified:
head/www/webstone-ssl/Makefile
head/www/webstone-ssl/pkg-plist
Modified: head/www/webstone-ssl/Makefile
==============================================================================
--- head/www/webstone-ssl/Makefile Mon Jun 8 01:20:00 2015 (r388809)
+++ head/www/webstone-ssl/Makefile Mon Jun 8 01:20:07 2015 (r388810)
@@ -3,7 +3,7 @@
PORTNAME= webstone
PORTVERSION= 2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www benchmarks
MASTER_SITES= http://crypto.stanford.edu/~nagendra/projects/WebStone/download/
PKGNAMESUFFIX= -ssl
@@ -12,10 +12,15 @@ DISTNAME= WebStone-SSL-${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= World wide web server benchmarking with SSL support
-WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}/src
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+USES= shebangfix tar:tgz
+SHEBANG_FILES= bin/*.wpl bin/*.pl
GNU_CONFIGURE= yes
-USES= tar:tgz
+WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}
+CONFIGURE_WRKSRC= ${WRKSRC}/src
+BUILD_WRKSRC= ${WRKSRC}/src
USE_OPENSSL= yes
ALL_TARGET= install
MAKE_JOBS_UNSAFE= yes
@@ -24,23 +29,27 @@ CPPFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
pre-configure:
- @${RM} -f ${WRKSRC}/config.cache
+ @${RM} -f ${WRKSRC}/src/config.cache
do-install:
- @${RMDIR} ${WRKSRC}/../bin/runs
+ @${RMDIR} ${WRKSRC}/bin/runs
@${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/bin
@${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/conf
@${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/lgm
- ${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${STAGEDIR}${PREFIX}/webstone-ssl/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${STAGEDIR}${PREFIX}/webstone-ssl/lgm
- ${INSTALL_DATA} ${WRKSRC}/../conf/* ${STAGEDIR}${PREFIX}/webstone-ssl/conf
- ${INSTALL_SCRIPT} ${WRKSRC}/../webstone ${STAGEDIR}${PREFIX}/webstone-ssl
- @${MKDIR} ${WRKSRC}/../bin/runs
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/webstone-ssl/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/lgm/* ${STAGEDIR}${PREFIX}/webstone-ssl/lgm
+ ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${PREFIX}/webstone-ssl/conf
+ ${INSTALL_SCRIPT} ${WRKSRC}/webstone ${STAGEDIR}${PREFIX}/webstone-ssl
+ @${MKDIR} ${WRKSRC}/bin/runs
.for i in webclient webmaster genrand
+ ${CHMOD} u+w ${STAGEDIR}${PREFIX}/webstone-ssl/bin/${i}
${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone-ssl/bin/${i}
+ ${CHMOD} u-w ${STAGEDIR}${PREFIX}/webstone-ssl/bin/${i}
.endfor
.for i in ws20_cgi ws25_cgi
+ ${CHMOD} u+w ${STAGEDIR}${PREFIX}/webstone-ssl/lgm/${i}
${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone-ssl/lgm/${i}
+ ${CHMOD} u-w ${STAGEDIR}${PREFIX}/webstone-ssl/lgm/${i}
.endfor
.include <bsd.port.mk>
Copied and modified: head/www/webstone-ssl/files/patch-src_Makefile.in (from r388782, head/www/webstone-ssl/files/patch-Makefile.in)
==============================================================================
--- head/www/webstone-ssl/files/patch-Makefile.in Sun Jun 7 20:57:49 2015 (r388782, copy source)
+++ head/www/webstone-ssl/files/patch-src_Makefile.in Mon Jun 8 01:20:07 2015 (r388810)
@@ -1,6 +1,6 @@
---- Makefile.in.orig Fri Jun 16 05:49:19 2000
-+++ Makefile.in Tue Mar 13 04:51:41 2001
-@@ -29,7 +29,7 @@
+--- src/Makefile.in.orig 2000-06-15 20:49:19 UTC
++++ src/Makefile.in
+@@ -29,7 +29,7 @@ PRODUCT = @PRODUCT@
VERSION = @VERSION@
CC = @CC@
@@ -9,7 +9,7 @@
LDFLAGS = @LDFLAGS@
INCLUDES =
CFLAGS = @CFLAGS@ -DSTONE_SSL
-@@ -47,11 +47,11 @@
+@@ -47,11 +47,11 @@ EXECUTABLE3 = genrand
MAIN3 = genrand.c
MASTERSRCS = timefunc.c bench.c parse_file_list.c statistics.c \
@@ -23,7 +23,7 @@
COMPILE = $(CC) $(CFLAGS) $(DEFS) $(INCLUDES)
-@@ -64,9 +64,9 @@
+@@ -64,9 +64,9 @@ TARGETS = $(EXECUTABLE1) $(EXECUTABLE2)
.SUFFIXES:
.SUFFIXES: .c .o
Copied and modified: head/www/webstone-ssl/files/patch-src_get.c (from r388782, head/www/webstone-ssl/files/patch-get.c)
==============================================================================
--- head/www/webstone-ssl/files/patch-get.c Sun Jun 7 20:57:49 2015 (r388782, copy source)
+++ head/www/webstone-ssl/files/patch-src_get.c Mon Jun 8 01:20:07 2015 (r388810)
@@ -1,5 +1,5 @@
---- get.c.orig 2000-06-21 19:15:41 UTC
-+++ get.c
+--- src/get.c.orig 2000-06-21 19:15:41 UTC
++++ src/get.c
@@ -169,27 +169,33 @@ get(char *loc, NETPORT port, char *url,
OpenSSL_add_all_algorithms();
OpenSSL_add_ssl_algorithms();
Modified: head/www/webstone-ssl/pkg-plist
==============================================================================
--- head/www/webstone-ssl/pkg-plist Mon Jun 8 01:20:00 2015 (r388809)
+++ head/www/webstone-ssl/pkg-plist Mon Jun 8 01:20:07 2015 (r388810)
@@ -49,7 +49,3 @@ webstone-ssl/lgm/keepme
webstone-ssl/lgm/ws20_cgi
webstone-ssl/lgm/ws25_cgi
webstone-ssl/webstone
- at dirrm webstone-ssl/bin
- at dirrm webstone-ssl/conf
- at dirrm webstone-ssl/lgm
- at dirrm webstone-ssl
More information about the svn-ports-all
mailing list