Date: Wed, 13 Aug 2014 17:07:43 +0200 From: Carlo Strub <cs@FreeBSD.org> To: vanilla@FreeBSD.org Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r364753 - in head/www/gatling: . files Message-ID: <1407942463.639247.546514528.132749.2@c-st.net> In-Reply-To: <201408130315.s7D3FWYs042556@svn.freebsd.org> References: <201408130315.s7D3FWYs042556@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
13/08/2014 05:16 - Vanilla I. Shu wrote: > Author: vanilla > Date: Wed Aug 13 03:15:31 2014 > New Revision: 364753 > URL: http://svnweb.freebsd.org/changeset/ports/364753 > QAT: https://qat.redports.org/buildarchive/r364753/ >=20 > Log: > - Take maintainership > - Stage > - Fix some gcc warnings > - Add LICENSE > - Define OPTIONS for DOC, EXAMPLES and DEBUG > - Silence pre-install and do-install >=20=20=20 > PR: ports/192619 > Submitted by: Marco Steinbach [coco (executive-computing.de)] >=20 > Added: > head/www/gatling/files/patch-dl.c (contents, props changed) > head/www/gatling/files/patch-gatling.c (contents, props changed) > head/www/gatling/files/patch-smb.c (contents, props changed) > Modified: > head/www/gatling/Makefile >=20 > Modified: head/www/gatling/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/gatling/Makefile Wed Aug 13 03:10:18 2014 (r364752) > +++ head/www/gatling/Makefile Wed Aug 13 03:15:31 2014 (r364753) > @@ -6,13 +6,14 @@ PORTVERSION=3D 0.13 > CATEGORIES=3D www benchmarks ftp ipv6 > MASTER_SITES=3D http://dl.fefe.de/ >=20=20 > -MAINTAINER=3D ports@FreeBSD.org > +MAINTAINER=3D coco@executive-computing.de > COMMENT=3D High performance webserver with scalability benchmark tools >=20=20 > +LICENSE=3D GPLv2 > + > BUILD_DEPENDS=3D libowfat>=3D0.29:${PORTSDIR}/devel/libowfat >=20=20 > -USE_BZIP2=3D yes > -USES=3D gmake > +USES=3D gmake tar:bzip2 > USE_OPENSSL=3D yes > USE_RC_SUBR=3D gatling >=20=20 > @@ -23,7 +24,8 @@ MAKEFILE=3D GNUmakefile >=20=20 > bin=3D dl > sbin=3D gatling > -MAN8=3D gatling.8 > +GATLING8=3D gatling.8 > +PLIST_FILES=3D man/man8/gatling.8.gz > PORTDOCS=3D CHANGES README README.antidos README.cgi README.ftp \ > README.htaccess \ > README.http README.performance README.prefetch README.proxy \ > @@ -31,13 +33,13 @@ PORTDOCS=3D CHANGES README README.antidos=20 > PORTEXAMPLES=3D run-gatling cgi acc getlinks hcat hitprofile matchiprang= e \ > referrer >=20=20 > -OPTIONS_DEFINE=3D BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS > -OPTIONS_DEFAULT=3D BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS > +OPTIONS_DEFINE=3D BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS DOCS EXAMPLES= DEBUG > +OPTIONS_SUB=3D yes > +OPTIONS_DEFAULT=3D BENCHMARKS SMB TLS ZLIB OPTIMIZED_CFLAGS DOCS EXAMPLES > BENCHMARKS_DESC=3D Install some benchmark programs > TLS_DESC=3D Build and install tlsgatling > ZLIB_DESC=3D Compress outgoing data >=20=20 > -NO_STAGE=3D yes > .include <bsd.port.pre.mk> >=20=20 > .if ${PORT_OPTIONS:MBENCHMARKS} > @@ -45,8 +47,9 @@ PORTDOCS+=3D README.bindbench README.forkb > README.manymapbench README.mmapbench > bin+=3D bindbench forkbench forksbench httpbench ioerr manymapbench \ > mktestdata mmapbench pthreadbench > -examples+=3D prep run-bench > -MAN1+=3D bench.1 > +PORTEXAMPLES+=3D prep run-bench > +BENCH1=3D bench.1 > +PLIST_FILES+=3D man/man1/bench.1.gz > MAKE_ENV+=3D BENCHMARKS=3D1 > .endif >=20=20 > @@ -81,26 +84,22 @@ STRIP=3D > BROKEN=3D Does not compile on ia64, powerpc, or sparc64 > .endif >=20=20 > -PLIST_FILES=3D ${bin:S,^,bin/,} ${sbin:S,^,sbin/,} sbin/gatling_wrapper > +PLIST_FILES+=3D ${bin:S,^,bin/,} ${sbin:S,^,sbin/,} sbin/gatling_wrapper >=20=20 > pre-install: > @cd ${WRKSRC} && ${CP} gatling.1 gatling.8 >=20=20 > do-install: > - cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin > - cd ${WRKSRC} && ${INSTALL_PROGRAM} ${sbin} ${PREFIX}/sbin > - ${INSTALL_SCRIPT} ${FILESDIR}/gatling_wrapper ${PREFIX}/sbin > -.if ${PORT_OPTIONS:MEXAMPLES} > - ${MKDIR} ${EXAMPLESDIR} > - cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${EXAMPLESDIR} > -.endif > -.if !empty(MAN1) > - cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 > -.endif > - cd ${WRKSRC} && ${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8 > -.if ${PORT_OPTIONS:MDOCS} > - ${MKDIR} ${DOCSDIR} > - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} > -.endif > + @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}${EXAMPLE= SDIR} > +.if !empty(BENCH1) > + @cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/= man1 > +.endif > + @cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/ma= n/man8 > + @${MKDIR} ${STAGEDIR}${DOCSDIR} > + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} >=20=20 > .include <bsd.port.post.mk> >=20 > Added: head/www/gatling/files/patch-dl.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/gatling/files/patch-dl.c Wed Aug 13 03:15:31 2014 (r364753) > @@ -0,0 +1,9 @@ > +--- dl.c.orig 2014-08-12 18:52:40.000000000 +0200 > ++++ dl.c 2014-08-12 18:55:42.000000000 +0200 > +@@ -1,3 +1,6 @@ > ++#ifdef __FreeBSD__ > ++#include <stdio.h> > ++#endif > + #define _FILE_OFFSET_BITS 64 > + #define _GNU_SOURCE > + #include "socket.h" >=20 > Added: head/www/gatling/files/patch-gatling.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/gatling/files/patch-gatling.c Wed Aug 13 03:15:31 2014 (r364= 753) > @@ -0,0 +1,11 @@ > +--- gatling.c.orig 2014-08-12 18:41:26.000000000 +0200 > ++++ gatling.c 2014-08-12 18:42:24.000000000 +0200 > +@@ -1736,7 +1736,7 @@ > + Y=3Dsizeof(workgroup_utf16); > + x=3Dworkgroup; > + y=3Dworkgroup_utf16; > +-#ifdef __sun__ > ++#if defined(__sun__) || defined(__FreeBSD__) > + if (iconv(i,(const char**)&x,&X,&y,&Y)) panic("UTF-16 conversion of > workgroup failed.\n"); > + #else > + if (iconv(i,&x,&X,&y,&Y)) panic("UTF-16 conversion of workgroup fai= led.\n"); >=20 > Added: head/www/gatling/files/patch-smb.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/gatling/files/patch-smb.c Wed Aug 13 03:15:31 2014 (r364753) > @@ -0,0 +1,14 @@ > +--- smb.c.orig 2014-08-12 18:48:53.000000000 +0200 > ++++ smb.c 2014-08-12 18:49:02.000000000 +0200 > +@@ -511,7 +511,11 @@ > + X=3Dssize; > + Y=3Ddsize?dsize-1:dsize; // the -1 makes sure we have a 0 byte at the= end > + memset(dest,0,dsize); > ++#if defined(__sun__) || defined(__FreeBSD__) > ++ if (iconv(wc2utf8,(const char**)&x,&X,&y,&Y)) return 0; > ++#else > + if (iconv(wc2utf8,&x,&X,&y,&Y)) return 0; > ++#endif > + return dsize-Y; > + } > +=20 >=20 These large changes, especially the new options, merit a PORTREVISION bump,= no? -- Carlo Strub Ports committer=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1407942463.639247.546514528.132749.2>