Date: Fri, 18 May 2012 02:45:12 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/168021: benchmarks/dbs: Fix build on 9-stable Message-ID: <20120518024512.36a48f71.tkato432@yahoo.com> Resent-Message-ID: <201205171810.q4HIA27c098756@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 168021 >Category: ports >Synopsis: benchmarks/dbs: Fix build on 9-stable >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 17 18:10:02 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p5 i386 >Organization: >Environment: >Description: - Fix build on 9-stable - Add USE_PERL5_RUN - Support CFLAGS properly - Support PORTDOCS/PORTEXAMPLES/PLIST_FILES New file: files/patch-src__record.h Remove file: files.patch-af pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/benchmarks/dbs/Makefile benchmarks/dbs/Makefile --- /usr/ports/benchmarks/dbs/Makefile 2011-07-21 04:43:54.000000000 +0900 +++ benchmarks/dbs/Makefile 2012-05-18 00:38:47.000000000 +0900 @@ -7,40 +7,51 @@ PORTNAME= dbs PORTVERSION= 1.1.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= benchmarks MASTER_SITES= http://www.kusa.ac.jp/~yukio-m/dbs/software1.1.5/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= jkoshy + LOCAL/jkoshy MAINTAINER= ports@FreeBSD.org COMMENT= A distributed network benchmarking system RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot -DOCDIR= ${PREFIX}/share/doc/dbs/ -DOCS= dbs.man dbs.man.jis dbs_paper.ps Copyright -EXDIR= ${PREFIX}/share/examples/dbs/ -EXS= TCP2.cmd TCPvsMPEG.cmd +BUILD_WRKSRC= ${WRKSRC}/obj/${OPSYS} +INSTALL_WRKSRC= ${WRKSRC}/obj/${OPSYS} -.include <bsd.port.pre.mk> +USE_PERL5_RUN= yes +MAKEFILE= makefile -.if ${OSVERSION} >= 900000 -BROKEN= does not compile on FreeBSD 9.X -.endif +PORTDOCS= * +PORTEXAMPLES= * +PLIST_FILES= bin/dbs_view bin/dbsc bin/dbsd + +post-patch: + @${REINPLACE_CMD} -e \ + 's|/usr/local/bin/perl|${PERL}|' ${WRKSRC}/script/dbs_view -do-build: +pre-build: cd ${WRKSRC}/src; ${MAKE} dir - cd ${WRKSRC}/obj/${OPSYS}; ${MAKE} ${ALL_TARGET} PREFIX=${PREFIX} do-install: - cd ${WRKSRC}/obj/${OPSYS}; ${MAKE} ${INSTALL_TARGET} PREFIX=${PREFIX} - ${STRIP_CMD} ${PREFIX}/bin/dbsc ${PREFIX}/bin/dbsd - ${MKDIR} ${EXDIR} - cd ${WRKSRC}/sample; ${CP} -p ${EXS} ${EXDIR} +.for bin in dbsc dbsd + cd ${INSTALL_WRKSRC}; ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin +.endfor +.for bin in dbs_view + cd ${WRKSRC}/script; ${INSTALL_SCRIPT} ${bin} ${PREFIX}/bin +.endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCDIR} - cd ${WRKSRC}/doc; ${CP} -p ${DOCS} ${DOCDIR} + @${MKDIR} ${DOCSDIR} +.for doc in Copyright dbs.man dbs.man.jis dbs_paper.ps + cd ${WRKSRC}/doc; ${INSTALL_DATA} ${doc} ${DOCSDIR} +.endfor +.endif +.if !defined(NOPORTEXAMPLES) + @${MKDIR} ${EXAMPLESDIR} +.for ex in TCP2.cmd TCPvsMPEG.cmd + cd ${WRKSRC}/sample; ${INSTALL_DATA} ${ex} ${EXAMPLESDIR} +.endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/benchmarks/dbs/files/patch-aa benchmarks/dbs/files/patch-aa --- /usr/ports/benchmarks/dbs/files/patch-aa 1998-08-02 08:34:42.000000000 +0900 +++ benchmarks/dbs/files/patch-aa 2011-09-10 03:33:47.000000000 +0900 @@ -9,7 +9,7 @@ #CC =gcc -CFLAGS =-O -+CFLAGS =-O -DHAVE_SYS_PARAM_H ++CFLAGS +=-DHAVE_SYS_PARAM_H #CFLAGS =-g # debug #CFLAGS =-g -DDEBUGMODE diff -urN /usr/ports/benchmarks/dbs/files/patch-af benchmarks/dbs/files/patch-af --- /usr/ports/benchmarks/dbs/files/patch-af 1998-08-02 08:34:42.000000000 +0900 +++ benchmarks/dbs/files/patch-af 1970-01-01 09:00:00.000000000 +0900 @@ -1,12 +0,0 @@ ---- script/dbs_view-- Fri Jul 11 00:53:57 1997 -+++ script/dbs_view Sat Aug 1 20:44:46 1998 -@@ -1,7 +1,7 @@ --#!/usr/local/bin/perl --#!/usr/local/bin/perl -d - #!/usr/bin/perl - #!/usr/bin/perl -d -+#!/usr/local/bin/perl -+#!/usr/local/bin/perl -d - - ###################################################################### - # DBS: Distributed Benchmark System diff -urN /usr/ports/benchmarks/dbs/files/patch-src__record.h benchmarks/dbs/files/patch-src__record.h --- /usr/ports/benchmarks/dbs/files/patch-src__record.h 1970-01-01 09:00:00.000000000 +0900 +++ benchmarks/dbs/files/patch-src__record.h 2012-04-29 03:08:55.000000000 +0900 @@ -0,0 +1,12 @@ +--- src/record.h.orig 1997-10-13 09:36:38.000000000 +0900 ++++ src/record.h 2012-04-29 03:08:53.000000000 +0900 +@@ -69,7 +69,9 @@ + #include <netinet/tcp.h> + + #ifndef __linux__ ++#ifndef __FreeBSD__ + #include <netinet/in_pcb.h> ++#endif + #include <netinet/ip_var.h> + #include <netinet/tcpip.h> + /*#define TCPSTATES*/ diff -urN /usr/ports/benchmarks/dbs/pkg-plist benchmarks/dbs/pkg-plist --- /usr/ports/benchmarks/dbs/pkg-plist 2005-10-22 22:50:10.000000000 +0900 +++ benchmarks/dbs/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ -bin/dbs_view -bin/dbsc -bin/dbsd -%%PORTDOCS%%%%DOCSDIR%%/Copyright -%%PORTDOCS%%%%DOCSDIR%%/dbs.man -%%PORTDOCS%%%%DOCSDIR%%/dbs.man.jis -%%PORTDOCS%%%%DOCSDIR%%/dbs_paper.ps -%%EXAMPLESDIR%%/TCP2.cmd -%%EXAMPLESDIR%%/TCPvsMPEG.cmd -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%EXAMPLESDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120518024512.36a48f71.tkato432>