Index: head/www/gatling/Makefile =================================================================== --- head/www/gatling/Makefile (revision 434050) +++ head/www/gatling/Makefile (revision 434051) @@ -1,105 +1,104 @@ # Created by: Thomas-Martin Seck # $FreeBSD$ PORTNAME= gatling -PORTVERSION= 0.13 -PORTREVISION= 1 +PORTVERSION= 0.15 CATEGORIES= www benchmarks ftp ipv6 -MASTER_SITES= http://dl.fefe.de/ +MASTER_SITES= http://www.fefe.de/gatling/ MAINTAINER= coco@executive-computing.de COMMENT= High performance webserver with scalability benchmark tools LICENSE= GPLv2 -BUILD_DEPENDS= libowfat>=0.29:devel/libowfat +BUILD_DEPENDS= libowfat>=0.31:devel/libowfat -USES= gmake ssl tar:bzip2 +USES= gmake ssl tar:xz USE_RC_SUBR= gatling CFLAGS+= -I${LOCALBASE}/include/libowfat -I${OPENSSLINC} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} MAKEFILE= GNUmakefile bin= dl sbin= gatling GATLING8= gatling.8 PLIST_FILES= man/man8/gatling.8.gz PORTDOCS= CHANGES README README.antidos README.cgi README.ftp \ README.htaccess \ README.http README.performance README.prefetch README.proxy \ README.redirect PORTEXAMPLES= run-gatling cgi acc getlinks hcat hitprofile matchiprange \ referrer OPTIONS_DEFINE= BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS DOCS EXAMPLES DEBUG OPTIONS_SUB= yes OPTIONS_DEFAULT= BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS BENCHMARKS_DESC= Install some benchmark programs TLS_DESC= Build and install tlsgatling ZLIB_DESC= Compress outgoing data .include .if ${PORT_OPTIONS:MBENCHMARKS} PORTDOCS+= README.bindbench README.forkbench README.httpbench \ README.manymapbench README.mmapbench bin+= bindbench forkbench forksbench httpbench ioerr manymapbench \ mktestdata mmapbench pthreadbench PORTEXAMPLES+= prep run-bench BENCH1= bench.1 PLIST_FILES+= man/man1/bench.1.gz MAKE_ENV+= BENCHMARKS=1 .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && !defined(WITH_DEBUG) CFLAGS+= -O2 -fomit-frame-pointer .endif .if ${PORT_OPTIONS:MSMB} USES+= iconv CFLAGS+= -I${LOCALBASE}/include MAKE_ENV+= ICONV=1 .else EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-disable_smb .endif .if ${PORT_OPTIONS:MTLS} MAKE_ENV+= TLSGATLING=1 sbin+= tlsgatling PORTDOCS+= README.tls .endif .if ${PORT_OPTIONS:MZLIB} MAKE_ENV+= ZLIB=1 .endif .if ${PORT_OPTIONS:MDEBUG} MAKE_ENV+= DEBUG=1 STRIP= .endif PLIST_FILES+= ${bin:S,^,bin/,} ${sbin:S,^,sbin/,} sbin/gatling_wrapper post-patch: ${REINPLACE_CMD} -e 's/\(trymd5.c\) \(-lcrypto\)/\1 $$(LDFLAGS) \2/' \ ${WRKSRC}/GNUmakefile pre-install: - @cd ${WRKSRC} && ${CP} gatling.1 gatling.8 + cd ${WRKSRC} && ${CP} gatling.1 gatling.8 do-install: - @cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${STAGEDIR}${PREFIX}/bin - @cd ${WRKSRC} && ${INSTALL_PROGRAM} ${sbin} ${STAGEDIR}${PREFIX}/sbin - @${INSTALL_SCRIPT} ${FILESDIR}/gatling_wrapper ${STAGEDIR}${PREFIX}/sbin - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC} && ${INSTALL_PROGRAM} ${sbin} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${FILESDIR}/gatling_wrapper ${STAGEDIR}${PREFIX}/sbin + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .if !empty(BENCH1) - @cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/man1 + cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/man1 .endif - @cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/man/man8 - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/www/gatling/distinfo =================================================================== --- head/www/gatling/distinfo (revision 434050) +++ head/www/gatling/distinfo (revision 434051) @@ -1,2 +1,3 @@ -SHA256 (gatling-0.13.tar.bz2) = b42145fdf7b66602fa8bc64661c2762172f6d33dbd9d53efebf821cd81e89245 -SIZE (gatling-0.13.tar.bz2) = 108128 +TIMESTAMP = 1487014927 +SHA256 (gatling-0.15.tar.xz) = 6fa329d0ced0c80deb8dde5460e9d9e984bee94f265043d7fdec0e253dce9aa4 +SIZE (gatling-0.15.tar.xz) = 121804 Index: head/www/gatling/files/patch-GNUmakefile =================================================================== --- head/www/gatling/files/patch-GNUmakefile (revision 434050) +++ head/www/gatling/files/patch-GNUmakefile (revision 434051) @@ -1,74 +1,74 @@ ---- GNUmakefile.orig 2012-12-07 12:27:09.595489622 -0800 -+++ GNUmakefile 2012-12-07 12:35:03.890478583 -0800 +--- /tmp/GNUmakefile 2017-02-13 11:43:57.882750000 -0800 ++++ GNUmakefile 2017-02-13 11:56:19.109139000 -0800 @@ -1,24 +1,22 @@ -#DEBUG=1 -ZLIB=1 -prefix=/opt/diet +prefix=${PREFIX} BINDIR=${prefix}/bin MANDIR=${prefix}/man man1dir=$(MANDIR)/man1 -TARGETS=gatling httpbench bindbench dl ioerr bench tlsgatling_nofail \ -pthreadbench cgi ptlsgatling_nofail -TARGETS2=mktestdata mmapbench manymapbench forkbench forksbench +TARGETS=gatling dl cgi +TARGETS2= +ifdef BENCHMARKS +TARGETS+=httpbench bindbench ioerr bench pthreadbench +TARGETS2+=mktestdata mmapbench manymapbench forkbench forksbench +endif +ifdef TLSGATLING +TARGETS+=tlsgatling +endif ALLTARGETS=$(TARGETS) acc hcat referrer hitprofile matchiprange getlinks \ rellink $(TARGETS2) all: $(ALLTARGETS) -CROSS= -#CROSS=i686-mingw32- -CC=$(CROSS)gcc -CFLAGS=-pipe -Wall -LDFLAGS= - #CFLAGS+=-DSTATE_DEBUG -DMOREDEBUG -DDEBUG_EVENTS -DSMDEBUG path = $(subst :, ,$(PATH)) @@ -36,15 +34,11 @@ # to build without diet libc support, use $ make DIET= # see http://www.fefe.de/dietlibc/ for details about the diet libc +DIET= + ifneq ($(DEBUG),) - CFLAGS+=-g + CFLAGS+=-g -Og LDFLAGS+=-g -else -CFLAGS+=-O2 -fomit-frame-pointer -I/usr/local/include -LDFLAGS+=-s -ifneq ($(DIET),) -DIET+=-Os -endif endif LDLIBS=-lowfat @@ -136,11 +130,13 @@ rm -f trysocket libiconv: tryiconv.c - if $(CC) $(CFLAGS) -o tryiconv tryiconv.c >/dev/null 2>&1; then echo ""; else \ - if $(CC) $(CFLAGS) -o tryiconv tryiconv.c -liconv >/dev/null 2>&1; then echo "-liconv"; else \ - if $(CC) $(CFLAGS) -o tryiconv tryiconv.c -L/usr/local/lib -liconv >/dev/null 2>&1; then \ - echo "-L/usr/local/lib -liconv"; \ - fi; fi; fi > libiconv +ifdef ICONV + if $(CC) $(CFLAGS) $(LDFLAGS) -o tryiconv tryiconv.c -liconv >/dev/null 2>&1; then echo "-L$(LDFLAGS) -liconv"; else \ + echo ""; \ + fi > libiconv +else + echo "" > libiconv +endif rm -f tryiconv libcrypt: trycrypt.c