Attachment #145728 for bug #192619

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

Lines 6-18 Link Here

(-)gatling/Makefile (-20 / +23 lines)
6	CATEGORIES= www benchmarks ftp ipv6	6	CATEGORIES= www benchmarks ftp ipv6
7	MASTER_SITES= http://dl.fefe.de/	7	MASTER_SITES= http://dl.fefe.de/
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= coco@executive-computing.de
10	COMMENT= High performance webserver with scalability benchmark tools	10	COMMENT= High performance webserver with scalability benchmark tools
11		11
		12	LICENSE= GPLv2
		13
12	BUILD_DEPENDS= libowfat>=0.29:${PORTSDIR}/devel/libowfat	14	BUILD_DEPENDS= libowfat>=0.29:${PORTSDIR}/devel/libowfat
13		15
14	USE_BZIP2= yes	16	USES= gmake tar:bzip2
15	USES= gmake
16	USE_OPENSSL= yes	17	USE_OPENSSL= yes
17	USE_RC_SUBR= gatling	18	USE_RC_SUBR= gatling
18		19
Lines 23-29 Link Here
23		24
24	bin= dl	25	bin= dl
25	sbin= gatling	26	sbin= gatling
26	MAN8= gatling.8	27	GATLING8= gatling.8
		28	PLIST_FILES= man/man8/gatling.8.gz
27	PORTDOCS= CHANGES README README.antidos README.cgi README.ftp \	29	PORTDOCS= CHANGES README README.antidos README.cgi README.ftp \
28	README.htaccess \	30	README.htaccess \
29	README.http README.performance README.prefetch README.proxy \	31	README.http README.performance README.prefetch README.proxy \
Lines 31-43 Link Here
31	PORTEXAMPLES= run-gatling cgi acc getlinks hcat hitprofile matchiprange \	33	PORTEXAMPLES= run-gatling cgi acc getlinks hcat hitprofile matchiprange \
32	referrer	34	referrer
33		35
34	OPTIONS_DEFINE= BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS	36	OPTIONS_DEFINE= BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS DOCS EXAMPLES DEBUG
35	OPTIONS_DEFAULT= BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS	37	OPTIONS_SUB= yes
		38	OPTIONS_DEFAULT= BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS DOCS EXAMPLES
36	BENCHMARKS_DESC= Install some benchmark programs	39	BENCHMARKS_DESC= Install some benchmark programs
37	TLS_DESC= Build and install tlsgatling	40	TLS_DESC= Build and install tlsgatling
38	ZLIB_DESC= Compress outgoing data	41	ZLIB_DESC= Compress outgoing data
39		42
40	NO_STAGE= yes
41	.include <bsd.port.pre.mk>	43	.include <bsd.port.pre.mk>
42		44
43	.if ${PORT_OPTIONS:MBENCHMARKS}	45	.if ${PORT_OPTIONS:MBENCHMARKS}
Lines 45-52 Link Here
45	README.manymapbench README.mmapbench	47	README.manymapbench README.mmapbench
46	bin+= bindbench forkbench forksbench httpbench ioerr manymapbench \	48	bin+= bindbench forkbench forksbench httpbench ioerr manymapbench \
47	mktestdata mmapbench pthreadbench	49	mktestdata mmapbench pthreadbench
48	examples+= prep run-bench	50	PORTEXAMPLES+= prep run-bench
49	MAN1+= bench.1	51	BENCH1= bench.1
		52	PLIST_FILES+= man/man1/bench.1.gz
50	MAKE_ENV+= BENCHMARKS=1	53	MAKE_ENV+= BENCHMARKS=1
51	.endif	54	.endif
52		55
Lines 81-106 Link Here
81	BROKEN= Does not compile on ia64, powerpc, or sparc64	84	BROKEN= Does not compile on ia64, powerpc, or sparc64
82	.endif	85	.endif
83		86
84	PLIST_FILES= ${bin:S,^,bin/,} ${sbin:S,^,sbin/,} sbin/gatling_wrapper	87	PLIST_FILES+= ${bin:S,^,bin/,} ${sbin:S,^,sbin/,} sbin/gatling_wrapper
85		88
86	pre-install:	89	pre-install:
87	@cd ${WRKSRC} && ${CP} gatling.1 gatling.8	90	@cd ${WRKSRC} && ${CP} gatling.1 gatling.8
88		91
89	do-install:	92	do-install:
90	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin	93	@cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${STAGEDIR}${PREFIX}/bin
91	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${sbin} ${PREFIX}/sbin	94	@cd ${WRKSRC} && ${INSTALL_PROGRAM} ${sbin} ${STAGEDIR}${PREFIX}/sbin
92	${INSTALL_SCRIPT} ${FILESDIR}/gatling_wrapper ${PREFIX}/sbin	95	@${INSTALL_SCRIPT} ${FILESDIR}/gatling_wrapper ${STAGEDIR}${PREFIX}/sbin
93	.if ${PORT_OPTIONS:MEXAMPLES}	96	.if ${PORT_OPTIONS:MEXAMPLES}
94	${MKDIR} ${EXAMPLESDIR}	97	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
95	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${EXAMPLESDIR}	98	@cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
96	.endif	99	.endif
97	.if !empty(MAN1)	100	.if !empty(BENCH1)
98	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1	101	@cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/man1
99	.endif	102	.endif
100	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8	103	@cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/man/man8
101	.if ${PORT_OPTIONS:MDOCS}	104	.if ${PORT_OPTIONS:MDOCS}
102	${MKDIR} ${DOCSDIR}	105	@${MKDIR} ${STAGEDIR}${DOCSDIR}
103	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}	106	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
104	.endif	107	.endif
105		108
106	.include <bsd.port.post.mk>	109	.include <bsd.port.post.mk>

Line 0 Link Here

(-)gatling/files/patch-dl.c (+9 lines)
	1	--- dl.c.orig 2014-08-12 18:52:40.000000000 +0200
	2	+++ dl.c 2014-08-12 18:55:42.000000000 +0200
	3	@@ -1,3 +1,6 @@
	4	+#ifdef __FreeBSD__
	5	+#include <stdio.h>
	6	+#endif
	7	#define _FILE_OFFSET_BITS 64
	8	#define _GNU_SOURCE
	9	#include "socket.h"

Line 0 Link Here

(-)gatling/files/patch-gatling.c (+11 lines)
	1	--- gatling.c.orig 2014-08-12 18:41:26.000000000 +0200
	2	+++ gatling.c 2014-08-12 18:42:24.000000000 +0200
	3	@@ -1736,7 +1736,7 @@
	4	Y=sizeof(workgroup_utf16);
	5	x=workgroup;
	6	y=workgroup_utf16;
	7	-#ifdef __sun__
	8	+#if defined(__sun__) \|\| defined(__FreeBSD__)
	9	if (iconv(i,(const char**)&x,&X,&y,&Y)) panic("UTF-16 conversion of workgroup failed.\n");
	10	#else
	11	if (iconv(i,&x,&X,&y,&Y)) panic("UTF-16 conversion of workgroup failed.\n");

Line 0 Link Here

(-)gatling/files/patch-smb.c (+14 lines)
	1	--- smb.c.orig 2014-08-12 18:48:53.000000000 +0200
	2	+++ smb.c 2014-08-12 18:49:02.000000000 +0200
	3	@@ -511,7 +511,11 @@
	4	X=ssize;
	5	Y=dsize?dsize-1:dsize; // the -1 makes sure we have a 0 byte at the end
	6	memset(dest,0,dsize);
	7	+#if defined(__sun__) \|\| defined(__FreeBSD__)
	8	+ if (iconv(wc2utf8,(const char**)&x,&X,&y,&Y)) return 0;
	9	+#else
	10	if (iconv(wc2utf8,&x,&X,&y,&Y)) return 0;
	11	+#endif
	12	return dsize-Y;
	13	}
	14

Return to bug 192619