Tue Dec 17 15:05:23 2013 UTC ()
Small fixes:
1.) Comment out "MASTER_SITES". The URL no longer works and all copies
    that Google can find are "pkgsrc" distfile mirrors.
2.) Fix various "pkglint" errors.


(tron)
diff -r1.20 -r1.21 pkgsrc/benchmarks/ttcp/Makefile
diff -r1.11 -r1.12 pkgsrc/benchmarks/ttcp/distinfo
diff -r1.3 -r1.4 pkgsrc/benchmarks/ttcp/patches/patch-aa
diff -r1.8 -r1.9 pkgsrc/benchmarks/ttcp/patches/patch-ab
cvs diff -r1.20 -r1.21 pkgsrc/benchmarks/ttcp/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/ttcp/Makefile 2012/09/11 22:37:15 1.20
+++ pkgsrc/benchmarks/ttcp/Makefile 2013/12/17 15:05:23 1.21
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile,v 1.20 2012/09/11 22:37:15 asau Exp $ 1# $NetBSD: Makefile,v 1.21 2013/12/17 15:05:23 tron Exp $
2 2
3DISTNAME= ttcp 3DISTNAME= ttcp
4PKGNAME= ${DISTNAME}-1.12 4PKGNAME= ${DISTNAME}-1.12
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= benchmarks net 6CATEGORIES= benchmarks net
7MASTER_SITES= ftp://ftp.ptb.de/pub/benchmarks/ 7#MASTER_SITES= ftp://ftp.ptb.de/pub/benchmarks/
8EXTRACT_SUFX= .tar.Z 8EXTRACT_SUFX= .tar.Z
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.ccci.com/tools/ttcp/ 11HOMEPAGE= http://www.ccci.com/tools/ttcp/
12COMMENT= TCP testing and performance measuring tool 12COMMENT= TCP testing and performance measuring tool
13LICENSE= public-domain 13LICENSE= public-domain
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16 16
17USE_BSD_MAKEFILE= yes 17USE_BSD_MAKEFILE= yes
 18USE_TOOLS+= nroff
18MAKE_ENV+= NOGCCERROR=yes 19MAKE_ENV+= NOGCCERROR=yes
19WRKSRC= ${WRKDIR} 20WRKSRC= ${WRKDIR}
20 21
21.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
22 23
23MANCOMPRESSED_IF_MANZ= YES 24MANCOMPRESSED_IF_MANZ= YES
24 25
25#.if (${OPSYS} == Darwin) 26#.if (${OPSYS} == Darwin)
26#CFLAGS+= "-Din_addr_t=\"unsigned long\"" 27#CFLAGS+= "-Din_addr_t=\"unsigned long\""
27#MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} 28#MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
28#.endif 29#.endif
29 30
30INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 31INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
cvs diff -r1.11 -r1.12 pkgsrc/benchmarks/ttcp/distinfo (expand / switch to unified diff)

--- pkgsrc/benchmarks/ttcp/distinfo 2007/01/18 11:28:00 1.11
+++ pkgsrc/benchmarks/ttcp/distinfo 2013/12/17 15:05:23 1.12
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.11 2007/01/18 11:28:00 rillig Exp $ 1$NetBSD: distinfo,v 1.12 2013/12/17 15:05:23 tron Exp $
2 2
3SHA1 (ttcp.tar.Z) = 33a60af208eff3dc9ae745060f44b24c4e74aa7e 3SHA1 (ttcp.tar.Z) = 33a60af208eff3dc9ae745060f44b24c4e74aa7e
4RMD160 (ttcp.tar.Z) = b5cb1a8efe0f716d25d58a4950f35bac47b17668 4RMD160 (ttcp.tar.Z) = b5cb1a8efe0f716d25d58a4950f35bac47b17668
5Size (ttcp.tar.Z) = 18163 bytes 5Size (ttcp.tar.Z) = 18163 bytes
6SHA1 (patch-aa) = 4ef0fe369d4836a4de758a4cd62fda4785a471b7 6SHA1 (patch-aa) = 96e3a9136bae4057682d2b3cfea2ec8c8bb21eaa
7SHA1 (patch-ab) = a4419e0ee02a8b6d30ac13913f45fc9f5f9d7746 7SHA1 (patch-ab) = 265c19e05e22ce9fff7596b7b1efca0c07a7f4e0
cvs diff -r1.3 -r1.4 pkgsrc/benchmarks/ttcp/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/benchmarks/ttcp/patches/patch-aa 2007/01/18 11:28:00 1.3
+++ pkgsrc/benchmarks/ttcp/patches/patch-aa 2013/12/17 15:05:23 1.4
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: patch-aa,v 1.3 2007/01/18 11:28:00 rillig Exp $ 1$NetBSD: patch-aa,v 1.4 2013/12/17 15:05:23 tron Exp $
 2
 3Fix build.
2 4
3--- Makefile.orig Tue Mar 26 16:19:05 2002 5--- Makefile.orig Tue Mar 26 16:19:05 2002
4+++ Makefile 6+++ Makefile
5@@ -0,0 +1,3 @@ 7@@ -0,0 +1,3 @@
6+PROG= ttcp 8+PROG= ttcp
7+ 9+
8+.include <bsd.prog.mk> 10+.include <bsd.prog.mk>
cvs diff -r1.8 -r1.9 pkgsrc/benchmarks/ttcp/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/benchmarks/ttcp/patches/patch-ab 2005/12/21 11:49:51 1.8
+++ pkgsrc/benchmarks/ttcp/patches/patch-ab 2013/12/17 15:05:23 1.9
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.8 2005/12/21 11:49:51 tron Exp $ 1$NetBSD: patch-ab,v 1.9 2013/12/17 15:05:23 tron Exp $
 2
 3Fix build.
2 4
3--- ttcp.c.orig 1997-02-27 21:30:23.000000000 +0000 5--- ttcp.c.orig 1997-02-27 21:30:23.000000000 +0000
4+++ ttcp.c 2005-12-21 11:40:39.000000000 +0000 6+++ ttcp.c 2005-12-21 11:40:39.000000000 +0000
5@@ -44,17 +44,19 @@ 7@@ -44,17 +44,19 @@
6 /* #define BSD41a */ 8 /* #define BSD41a */
7 /* #define SYSV */ /* required on SGI IRIX releases before 3.3 */ 9 /* #define SYSV */ /* required on SGI IRIX releases before 3.3 */
8  10
9-#include <stdio.h> 11-#include <stdio.h>
10-#include <signal.h> 12-#include <signal.h>
11-#include <ctype.h> 13-#include <ctype.h>
12-#include <errno.h> 14-#include <errno.h>
13 #include <sys/types.h> 15 #include <sys/types.h>
14 #include <sys/socket.h> 16 #include <sys/socket.h>