Attachment 152790 Details for Bug 197475 – update

[patch] update

nuttcp.diff (text/plain), 4.75 KB, created by Kurt Jaeger on 2015-02-09 08:04:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2015-02-09 08:04:45 UTC

Size: 4.75 KB

patch

obsolete

>diff -r -u -N benchmarks/nuttcp/Makefile /usr/home/pi/myp/benchmarks/nuttcp/Makefile
>--- benchmarks/nuttcp/Makefile	2014-06-09 10:11:13.000000000 +0200
>+++ /usr/home/pi/myp/benchmarks/nuttcp/Makefile	2015-02-09 09:00:55.000000000 +0100
>@@ -2,27 +2,24 @@
> # $FreeBSD: head/benchmarks/nuttcp/Makefile 356065 2014-06-01 09:00:15Z ohauer $
> 
> PORTNAME=	nuttcp
>-PORTVERSION=	6.1.2
>+PORTVERSION=	7.3.2
> CATEGORIES=	benchmarks net
>-MASTER_SITES=	ftp://ftp.lcp.nrl.navy.mil/pub/${PORTNAME}/ \
>-		ftp://ftp.lcp.nrl.navy.mil/pub/${PORTNAME}/beta/:beta
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>-		${NUTTSCPDISTFILE}:beta
>-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>+MASTER_SITES=	http://nuttcp.net/nuttcp/
>+DISTFILES=	beta/${PORTNAME}-${PORTVERSION}.c beta/${NUTTSCPDISTFILE} latest/${PORTNAME}.8 latest/examples.txt latest/LICENSE latest/README
>+EXTRACT_ONLY=	# none
>+WRKSRC=		${WRKDIR}
> 
> MAINTAINER=	andrewclarkii@gmail.com
> COMMENT=	TCP/UDP network testing tool
> 
>-USES=		tar:bzip2 shebangfix
>-SHEBANG_FILES=	../nuttscp
>-MAKEFILE=	/dev/null
>-ALL_TARGET=	${PORTNAME}
>+USES=		shebangfix
>+SHEBANG_FILES=	nuttscp
> 
>-NUTTSCPVERSION=	1.7
>+NUTTSCPVERSION=	2.2
> NUTTSCPDISTFILE=nuttscp-${NUTTSCPVERSION}
> 
> OPTIONS_DEFINE=	NUTTSCP
>-OPTIONS_DEFAULT=	NUTTSCP
>+OPTIONS_DEFAULT=NUTTSCP
> 
> NUTTSCP_DESC=	Install script for copying files over nuttcp
> OPTIONS_SUB=	yes
>@@ -31,11 +28,15 @@
> .include <bsd.port.options.mk>
> 
> post-extract:
>-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${NUTTSCPDISTFILE} ${WRKDIR}/nuttscp
>+	${CP} ${DISTDIR}/beta/${NUTTSCPDISTFILE} ${WRKDIR}/nuttscp
>+	${CP} ${DISTDIR}/beta/${PORTNAME}-${PORTVERSION}.c ${WRKDIR}/
>+	${CP} ${DISTDIR}/latest/${PORTNAME}.8 ${WRKDIR}/
>+	${CP} ${DISTDIR}/latest/LICENSE ${WRKDIR}/
>+	${CP} ${DISTDIR}/latest/README ${WRKDIR}/
>+	${CP} ${DISTDIR}/latest/examples.txt ${WRKDIR}/
> 
>-post-patch:
>-	${FIND} ${WRKSRC}/ -type f -exec \
>-		${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' {} +
>+do-build:
>+	cd ${WRKDIR} && ${CC} -o ${PORTNAME} nuttcp-${PORTVERSION}.c
> 
> do-install:
> .	if ${PORT_OPTIONS:MNUTTSCP}
>@@ -43,18 +44,12 @@
> 		( cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf nuttscp nuttrcp )
> .	endif
> 
>-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
>-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
>+	${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
>+	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
> 
> 	${MKDIR} ${STAGEDIR}${DATADIR}/
> .	for file in LICENSE README examples.txt
> 		${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}/
> .	endfor
> 
>-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xinetd.d/
>-.	for file in ${PORTNAME} ${PORTNAME}4 ${PORTNAME}6
>-		${INSTALL_DATA} ${WRKSRC}/xinetd.d/${file} \
>-			${STAGEDIR}${PREFIX}/etc/xinetd.d/
>-.	endfor
>-
> .include <bsd.port.mk>
>diff -r -u -N benchmarks/nuttcp/distinfo /usr/home/pi/myp/benchmarks/nuttcp/distinfo
>--- benchmarks/nuttcp/distinfo	2014-06-09 10:11:13.000000000 +0200
>+++ /usr/home/pi/myp/benchmarks/nuttcp/distinfo	2015-02-09 08:35:12.000000000 +0100
>@@ -1,4 +1,12 @@
>-SHA256 (nuttcp-6.1.2.tar.bz2) = 054e96d9d68fe917df6f25fab15c7755bdd480f6420d7d48d9194a1a52378169
>-SIZE (nuttcp-6.1.2.tar.bz2) = 77169
>-SHA256 (nuttscp-1.7) = 71901d572ff2b472d2a3b7e1e4804c9d875b07e1a31e994b5f33d45d19111962
>-SIZE (nuttscp-1.7) = 18582
>+SHA256 (beta/nuttcp-7.3.2.c) = 4deb98a21bb8d2f75dff95436f85d616cdf321b50f29b2bf5f0ff9a0d42b0d62
>+SIZE (beta/nuttcp-7.3.2.c) = 265085
>+SHA256 (beta/nuttscp-2.2) = 0874f2f87b8def21bd3d1b18dab449e3d97648100d0c824af109eba897e2160d
>+SIZE (beta/nuttscp-2.2) = 28729
>+SHA256 (latest/nuttcp.8) = 83f10cb19e11e37a00fa78ad1f87afc02e5250777e91e78bdf2f2485d372e2c5
>+SIZE (latest/nuttcp.8) = 16157
>+SHA256 (latest/examples.txt) = eb94d5424880164cae4b4b5d8f4ab25299cb3396a32c4dcb136e9718c0844938
>+SIZE (latest/examples.txt) = 5933
>+SHA256 (latest/LICENSE) = ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6
>+SIZE (latest/LICENSE) = 17987
>+SHA256 (latest/README) = 7ad8dcb72bd72afed8f32a13d3f81614b659afacdfa91ca57b41ff20cd4806a1
>+SIZE (latest/README) = 5666
>diff -r -u -N benchmarks/nuttcp/pkg-descr /usr/home/pi/myp/benchmarks/nuttcp/pkg-descr
>--- benchmarks/nuttcp/pkg-descr	2014-06-09 10:11:13.000000000 +0200
>+++ /usr/home/pi/myp/benchmarks/nuttcp/pkg-descr	2015-02-09 08:58:16.000000000 +0100
>@@ -9,4 +9,4 @@
> as a server mode, rate limiting, multiple parallel streams, and
> timer based usage.
> 
>-WWW: http://www.lcp.nrl.navy.mil/nuttcp/
>+WWW: http://nuttcp.net/
>diff -r -u -N benchmarks/nuttcp/pkg-plist /usr/home/pi/myp/benchmarks/nuttcp/pkg-plist
>--- benchmarks/nuttcp/pkg-plist	2014-10-20 21:25:07.000000000 +0200
>+++ /usr/home/pi/myp/benchmarks/nuttcp/pkg-plist	2015-02-09 08:34:22.000000000 +0100
>@@ -4,7 +4,4 @@
> %%DATADIR%%/LICENSE
> %%DATADIR%%/README
> %%DATADIR%%/examples.txt
>-etc/xinetd.d/nuttcp
>-etc/xinetd.d/nuttcp4
>-etc/xinetd.d/nuttcp6
> man/man8/nuttcp.8.gz

Flags:

koobs: maintainer-approval? (andrewclarkii)

Actions: View | Diff

Attachments on bug 197475: 152790