View | Details | Raw Unified | Return to bug 253763
Collapse All | Expand All

(-)b/www/gatling/Makefile (-8 / +21 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	gatling
4
PORTNAME=	gatling
5
PORTVERSION=	0.15
5
PORTVERSION=	0.16
6
PORTREVISION=	2
7
CATEGORIES=	www benchmarks ftp
6
CATEGORIES=	www benchmarks ftp
8
MASTER_SITES=	http://www.fefe.de/gatling/
7
MASTER_SITES=	https://www.fefe.de/gatling/
9
8
10
MAINTAINER=	coco@executive-computing.de
9
MAINTAINER=	coco@executive-computing.de
11
COMMENT=	High performance webserver with scalability benchmark tools
10
COMMENT=	High performance webserver with scalability benchmark tools
Lines 15-30 LICENSE= GPLv2 Link Here
15
BROKEN_mips=		fails to compile: dirfd.c: error: expected ';', ',' or ')' before 'key'
14
BROKEN_mips=		fails to compile: dirfd.c: error: expected ';', ',' or ')' before 'key'
16
BROKEN_mips64=		fails to compile: dirfd.c: error: expected ';', ',' or ')' before 'key'
15
BROKEN_mips64=		fails to compile: dirfd.c: error: expected ';', ',' or ')' before 'key'
17
16
18
BUILD_DEPENDS=	libowfat>=0.31:devel/libowfat
17
BUILD_DEPENDS=	libowfat>=0.32:devel/libowfat
19
18
20
USES=		compiler:c++11-lang gmake ssl tar:xz
19
USES=		compiler:c++11-lang gmake ssl tar:xz
21
USE_RC_SUBR=	gatling
20
USE_RC_SUBR=	gatling
22
21
22
MAKEFILE=	GNUmakefile
23
23
CFLAGS+=	-I${LOCALBASE}/include/libowfat -I${OPENSSLINC} -I${LOCALBASE}/include
24
CFLAGS+=	-I${LOCALBASE}/include/libowfat -I${OPENSSLINC} -I${LOCALBASE}/include
25
# Make alloca() prototype visible
26
CFLAGS+=	-D__BSD_VISIBLE
27
# Make crypt() prototype visible
28
CFLAGS+=	-D__XSI_VISIBLE
24
LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
29
LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
25
30
26
MAKEFILE=	GNUmakefile
27
28
bin=		dl
31
bin=		dl
29
sbin=		gatling
32
sbin=		gatling
30
GATLING8=	gatling.8
33
GATLING8=	gatling.8
Lines 36-45 PORTDOCS= CHANGES README README.antidos README.cgi README.ftp \ Link Here
36
PORTEXAMPLES=	run-gatling cgi acc getlinks hcat hitprofile matchiprange \
39
PORTEXAMPLES=	run-gatling cgi acc getlinks hcat hitprofile matchiprange \
37
		referrer
40
		referrer
38
41
39
OPTIONS_DEFINE=	BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS DOCS EXAMPLES DEBUG
42
OPTIONS_DEFINE=	BENCHMARKS BROKEN_ITOJUN_V6 SMB TLS ZLIB OPTIMIZED_CFLAGS DOCS EXAMPLES DEBUG
40
OPTIONS_SUB=	yes
41
OPTIONS_DEFAULT=	BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS
43
OPTIONS_DEFAULT=	BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS
44
OPTIONS_SUB=	yes
42
BENCHMARKS_DESC=	Install some benchmark programs
45
BENCHMARKS_DESC=	Install some benchmark programs
46
BROKEN_ITOJUN_V6_DESC=	Works around problems binding to IPv4 addresses
43
TLS_DESC=		Build and install tlsgatling
47
TLS_DESC=		Build and install tlsgatling
44
ZLIB_DESC=		Compress outgoing data
48
ZLIB_DESC=		Compress outgoing data
45
49
Lines 56-61 PLIST_FILES+= man/man1/bench.1.gz Link Here
56
MAKE_ENV+=	BENCHMARKS=1
60
MAKE_ENV+=	BENCHMARKS=1
57
.endif
61
.endif
58
62
63
.if ${PORT_OPTIONS:MBROKEN_ITOJUN_V6}
64
# Causes a warning about "KAME madness" but works around
65
# gatling failing to bind to IPv4 addresses.
66
CFLAGS+=	-D__broken_itojun_v6__
67
.endif
59
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && !defined(WITH_DEBUG)
68
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && !defined(WITH_DEBUG)
60
CFLAGS+=	-O2 -fomit-frame-pointer
69
CFLAGS+=	-O2 -fomit-frame-pointer
61
.endif
70
.endif
Lines 69-74 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-disable_smb Link Here
69
.endif
78
.endif
70
79
71
.if ${PORT_OPTIONS:MTLS}
80
.if ${PORT_OPTIONS:MTLS}
81
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base
82
# XXX: It's conceivable that it works with LibreSSL as well ...
83
BROKEN=	gatling requires OpenSSL 1.1.0 or later, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf
84
.endif
72
MAKE_ENV+=	TLSGATLING=1
85
MAKE_ENV+=	TLSGATLING=1
73
sbin+=		tlsgatling
86
sbin+=		tlsgatling
74
PORTDOCS+=	README.tls
87
PORTDOCS+=	README.tls
(-)b/www/gatling/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1487014927
1
TIMESTAMP = 1613797941
2
SHA256 (gatling-0.15.tar.xz) = 6fa329d0ced0c80deb8dde5460e9d9e984bee94f265043d7fdec0e253dce9aa4
2
SHA256 (gatling-0.16.tar.xz) = 5f96438ee201d7f1f6c2e0849ff273b196bdc7493f29a719ce8ed08c8be6365b
3
SIZE (gatling-0.15.tar.xz) = 121804
3
SIZE (gatling-0.16.tar.xz) = 126844
(-)b/www/gatling/files/patch-GNUmakefile (-13 / +19 lines)
Lines 1-8 Link Here
1
--- /tmp/GNUmakefile	2017-02-13 11:43:57.882750000 -0800
1
diff --git GNUmakefile GNUmakefile
2
+++ GNUmakefile	2017-02-13 11:56:19.109139000 -0800
2
index 6af7b35..c2002de 100644
3
@@ -1,24 +1,22 @@
3
--- GNUmakefile
4
-#DEBUG=1
4
+++ GNUmakefile
5
-ZLIB=1
5
@@ -1,13 +1,19 @@
6
 #DEBUG=1
7
 ZLIB=1
6
-prefix=/opt/diet
8
-prefix=/opt/diet
7
+prefix=${PREFIX}
9
+prefix=${PREFIX}
8
 BINDIR=${prefix}/bin
10
 BINDIR=${prefix}/bin
Lines 10-16 Link Here
10
 man1dir=$(MANDIR)/man1
12
 man1dir=$(MANDIR)/man1
11
 
13
 
12
-TARGETS=gatling httpbench bindbench dl ioerr bench tlsgatling_nofail \
14
-TARGETS=gatling httpbench bindbench dl ioerr bench tlsgatling_nofail \
13
-pthreadbench cgi ptlsgatling_nofail
15
-pthreadbench cgi ptlsgatling_nofail tlsdl_nofail ptlsdl_nofail
14
-TARGETS2=mktestdata mmapbench manymapbench forkbench forksbench
16
-TARGETS2=mktestdata mmapbench manymapbench forkbench forksbench
15
+TARGETS=gatling dl cgi
17
+TARGETS=gatling dl cgi
16
+TARGETS2=
18
+TARGETS2=
Lines 24-41 Link Here
24
 ALLTARGETS=$(TARGETS) acc hcat referrer hitprofile matchiprange getlinks \
26
 ALLTARGETS=$(TARGETS) acc hcat referrer hitprofile matchiprange getlinks \
25
 rellink $(TARGETS2)
27
 rellink $(TARGETS2)
26
 
28
 
27
 all: $(ALLTARGETS)
29
@@ -18,14 +24,6 @@ CROSS=
28
 
30
 
29
-CROSS=
31
 path = $(subst :, ,$(PATH))
30
-#CROSS=i686-mingw32-
32
 gcc_path = $(foreach dir,$(path),$(wildcard $(dir)/$(CROSS)gcc))
33
-ifeq ($(strip $(gcc_path)),)
34
-CC=$(CROSS)clang
35
-else
31
-CC=$(CROSS)gcc
36
-CC=$(CROSS)gcc
37
-endif
38
-
32
-CFLAGS=-pipe -Wall
39
-CFLAGS=-pipe -Wall
33
-LDFLAGS=
40
-LDFLAGS=
34
-
41
 
35
 #CFLAGS+=-DSTATE_DEBUG -DMOREDEBUG -DDEBUG_EVENTS -DSMDEBUG
42
 #CFLAGS+=-DSTATE_DEBUG -DMOREDEBUG -DDEBUG_EVENTS -DSMDEBUG
36
 
43
 
37
 path = $(subst :, ,$(PATH))
44
@@ -43,15 +41,11 @@ endif
38
@@ -36,15 +34,11 @@
39
 # to build without diet libc support, use $ make DIET=
45
 # to build without diet libc support, use $ make DIET=
40
 # see http://www.fefe.de/dietlibc/ for details about the diet libc
46
 # see http://www.fefe.de/dietlibc/ for details about the diet libc
41
 
47
 
Lines 53-59 Link Here
53
 endif
59
 endif
54
 
60
 
55
 LDLIBS=-lowfat
61
 LDLIBS=-lowfat
56
@@ -136,11 +130,13 @@
62
@@ -159,11 +153,13 @@ libsocket: trysocket.c
57
 	rm -f trysocket
63
 	rm -f trysocket
58
 
64
 
59
 libiconv: tryiconv.c
65
 libiconv: tryiconv.c
(-)b/www/gatling/pkg-descr (-2 / +1 lines)
Lines 1-4 Link Here
1
gatling is a high-performance HTTP and FTP server. Some scalability benchmark
1
gatling is a high-performance HTTP and FTP server. Some scalability benchmark
2
tests are included, too.
2
tests are included, too.
3
3
4
WWW: http://www.fefe.de/gatling/
4
WWW: https://www.fefe.de/gatling/
5
- 

Return to bug 253763