From b4f920543059af038598712771c3211999ef42a6 Mon Sep 17 00:00:00 2001 From: rillig Date: Mon, 5 Dec 2005 20:49:47 +0000 Subject: Fixed pkglint warnings. The warnings are mostly quoting issues, for example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some other changes are outlined in http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html --- benchmarks/iozone/Makefile | 18 +++++++++--------- benchmarks/kttcp/Makefile | 6 +++--- benchmarks/lmbench/Makefile | 4 ++-- benchmarks/lmbench/distinfo | 6 +++--- benchmarks/lmbench/patches/patch-ae | 4 ++-- benchmarks/lmbench/patches/patch-ak | 4 ++-- benchmarks/netio/Makefile | 4 ++-- benchmarks/ttcp/Makefile | 8 ++++---- benchmarks/ttcp/distinfo | 4 ++-- benchmarks/ttcp/patches/patch-ab | 4 ++-- benchmarks/ubench/Makefile | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile index d791a0e8bed..d2e92299e47 100644 --- a/benchmarks/iozone/Makefile +++ b/benchmarks/iozone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/10/31 17:26:02 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:49:51 rillig Exp $ DISTNAME= iozone3_248 PKGNAME= iozone-3.248 @@ -22,20 +22,20 @@ MAKEFILE= makefile .include "../../mk/bsd.prefs.mk" .if !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux" - BUILD_TARGET= ${LOWER_OPSYS} +BUILD_TARGET= ${LOWER_OPSYS} .elif (${OPSYS} == "SunOS") - BUILD_TARGET= Solaris +BUILD_TARGET= Solaris .elif (${OPSYS} == "Darwin") - BUILD_TARGET= macosx +BUILD_TARGET= macosx .elif (${OPSYS} == "IRIX") - BUILD_TARGET= ${OPSYS}${ABI:M64} +BUILD_TARGET= ${OPSYS}${ABI:M64} .elif (${OPSYS} == "BSDOS") - BUILD_TARGET= bsdi +BUILD_TARGET= bsdi .elif (${OPSYS} == "AIX") - BUILD_TARGET= ${OPSYS} +BUILD_TARGET= ${OPSYS} .else - # XXX: generic should work, but specific target would be better - BUILD_TARGET= generic +# XXX: generic should work, but specific target would be better +BUILD_TARGET= generic .endif INSTALLATION_DIRS= bin man/man1 diff --git a/benchmarks/kttcp/Makefile b/benchmarks/kttcp/Makefile index 6a330beee05..bbcb6c5c0ea 100644 --- a/benchmarks/kttcp/Makefile +++ b/benchmarks/kttcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/23 08:53:42 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:51 rillig Exp $ DISTNAME= kttcp-${VERSION} CATEGORIES= benchmarks net @@ -6,11 +6,11 @@ MASTER_SITES= # empty DISTFILES= # empty MAINTAINER= thorpej@NetBSD.org -COMMENT= kttcp kernel network throughput benchmark +COMMENT= Kernel network throughput benchmark VERSION= 20020711 -ONLY_FOR_PLATFORM= NetBSD-1.6[B-Z]*-* NetBSD-[2-9]* +ONLY_FOR_PLATFORM= NetBSD-1.6[B-Z]*-* NetBSD-[2-9]*-* PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile index b6bc549f160..2d13efd7a83 100644 --- a/benchmarks/lmbench/Makefile +++ b/benchmarks/lmbench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/07/16 19:10:38 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:51 rillig Exp $ DISTNAME= lmbench-2alpha11 PKGNAME= lmbench-2.11a @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gmake perl:run BUILD_TARGET= build -MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} INSTALLATION_DIRS= man/man1 man/man3 man/man8 diff --git a/benchmarks/lmbench/distinfo b/benchmarks/lmbench/distinfo index 80ab4c89cad..4003416c40c 100644 --- a/benchmarks/lmbench/distinfo +++ b/benchmarks/lmbench/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2005/05/23 08:55:56 rillig Exp $ +$NetBSD: distinfo,v 1.9 2005/12/05 20:49:51 rillig Exp $ SHA1 (lmbench-2alpha11.tgz) = 7480815b8f8d4000647db59eb6160e9dbac06490 RMD160 (lmbench-2alpha11.tgz) = 361401104fd5ea3a6e0a26a754ffd66fb2d9e9d6 @@ -7,10 +7,10 @@ SHA1 (patch-aa) = 0f16f206d56cfdfdd870d21afcef46e3b8e2c53a SHA1 (patch-ab) = b25c659fd808535738591892c552b062bb7e7e8f SHA1 (patch-ac) = 2aa73fbf3119db95ca483f676bd3f3c2fd25c8f6 SHA1 (patch-ad) = a196e6a4734de9a0d698d38f1691b1146bda45a2 -SHA1 (patch-ae) = 9a1475b04bb51f2d36edf8f6cf572235a31c55e0 +SHA1 (patch-ae) = 6d55be411c3b1e02fb269a24c1fd115e6e86855a SHA1 (patch-af) = 9390d4b6fa950beb0020b44ad520dd22a8a2178e SHA1 (patch-ag) = cf5d1f3cf24b9fb6ab4a1a84ad8a44fda858add4 SHA1 (patch-ah) = 3784e219af5be023bc7fe00dd8656f5af100279c SHA1 (patch-ai) = 81f3695239b96dfa848a6bc47f739038efc79dca SHA1 (patch-aj) = c0ddc2b95dab57b96f886dedcd6f253eadd9bf70 -SHA1 (patch-ak) = 347fc345f90872e922faace9fc651b5d8033dc64 +SHA1 (patch-ak) = 486db292921675cac78b8e266da84ca04ed8d697 diff --git a/benchmarks/lmbench/patches/patch-ae b/benchmarks/lmbench/patches/patch-ae index 33ead658987..cfb6db094e1 100644 --- a/benchmarks/lmbench/patches/patch-ae +++ b/benchmarks/lmbench/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2004/05/23 23:28:29 danw Exp $ +$NetBSD: patch-ae,v 1.3 2005/12/05 20:49:51 rillig Exp $ --- src/lmdd.c.orig Fri Jul 31 15:55:18 1998 +++ src/lmdd.c -@@ -40,7 +40,6 @@ char *id = "$Id: lmdd.c,v 1.23 1997/12/0 +@@ -40,7 +40,6 @@ #include #include #include diff --git a/benchmarks/lmbench/patches/patch-ak b/benchmarks/lmbench/patches/patch-ak index 4a378bb5046..a345f87d9e3 100644 --- a/benchmarks/lmbench/patches/patch-ak +++ b/benchmarks/lmbench/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1 2004/06/16 04:33:51 minskim Exp $ +$NetBSD: patch-ak,v 1.2 2005/12/05 20:49:51 rillig Exp $ --- src/lmhttp.c.orig 1998-07-31 14:55:18.000000000 -0500 +++ src/lmhttp.c -@@ -17,6 +17,7 @@ char *id = "$Id: s.lmhttp.c 1.6 98/06/29 +@@ -17,6 +17,7 @@ #include #include #endif diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile index 75bf8bd3548..3d33bc6f7ec 100644 --- a/benchmarks/netio/Makefile +++ b/benchmarks/netio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/08/10 07:03:13 xtraeme Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:51 rillig Exp $ DISTNAME= netio123 PKGNAME= netio-1.23 @@ -14,7 +14,7 @@ LICENSE= no-commercial-use PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} -MAKE_FLAGS+= CC="${CC}" CFLAGS="-DUNIX ${PTHREAD_CFLAGS} ${CFLAGS}" \ +MAKE_FLAGS+= CC=${CC:Q} CFLAGS="-DUNIX ${PTHREAD_CFLAGS} ${CFLAGS}" \ LFLAGS="${PTHREAD_LDFLAGS} ${LDFLAGS}" \ LIBS="${PTHREAD_LIBS} ${LIBS}" O=.o OUT=-o X= diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile index 828905cd367..92fbca139a6 100644 --- a/benchmarks/ttcp/Makefile +++ b/benchmarks/ttcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/07/30 15:50:38 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:51 rillig Exp $ DISTNAME= ttcp PKGNAME= ${DISTNAME}-1.12 @@ -14,15 +14,15 @@ COMMENT= TCP testing and performance measuring tool PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} \ - MANOWN=${MANOWN} MANGRP=${MANGRP} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \ + MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} .include "../../mk/bsd.prefs.mk" MANCOMPRESSED_IF_MANZ= YES .if (${OPSYS} == Darwin) -MAKE_FLAGS= CFLAGS="-Din_addr_t=\"unsigned long\"" +MAKE_FLAGS+= CFLAGS="-Din_addr_t=\"unsigned long\"" .endif INSTALLATION_DIRS= bin man/cat1 man/man1 diff --git a/benchmarks/ttcp/distinfo b/benchmarks/ttcp/distinfo index 1bec744ec56..9386104aab4 100644 --- a/benchmarks/ttcp/distinfo +++ b/benchmarks/ttcp/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2005/11/07 13:55:32 joerg Exp $ +$NetBSD: distinfo,v 1.9 2005/12/05 20:49:51 rillig Exp $ SHA1 (ttcp.tar.Z) = 33a60af208eff3dc9ae745060f44b24c4e74aa7e RMD160 (ttcp.tar.Z) = b5cb1a8efe0f716d25d58a4950f35bac47b17668 Size (ttcp.tar.Z) = 18163 bytes SHA1 (patch-aa) = a9717aa9fd5f8cdff1a39c9b7d6ab17abbe399ad -SHA1 (patch-ab) = 402874d81ec7c76b7279d4d4e79a5b851bf95804 +SHA1 (patch-ab) = b72ffd575ed97f62977743518c2b887182fe5595 diff --git a/benchmarks/ttcp/patches/patch-ab b/benchmarks/ttcp/patches/patch-ab index 3baa876d734..264a3c9c1c9 100644 --- a/benchmarks/ttcp/patches/patch-ab +++ b/benchmarks/ttcp/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2005/11/07 13:55:32 joerg Exp $ +$NetBSD: patch-ab,v 1.7 2005/12/05 20:49:51 rillig Exp $ --- ttcp.c.orig 1997-02-27 21:30:23.000000000 +0000 +++ ttcp.c -@@ -55,6 +55,7 @@ static char RCSid[] = "ttcp.c $Revision: +@@ -55,6 +55,7 @@ #include #include #include /* struct timeval */ diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile index 918da5a2372..780b2370205 100644 --- a/benchmarks/ubench/Makefile +++ b/benchmarks/ubench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/09/03 05:57:45 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:51 rillig Exp $ # DISTNAME= ubench-0.32 @@ -11,7 +11,7 @@ COMMENT= The Unix Benchmark utility BUILD_TARGET= ubench -SUBST_CLASSES= path +SUBST_CLASSES+= path SUBST_STAGE.path= post-configure SUBST_FILES.path= Makefile SUBST_SED.path= -e "s,/usr/local,${PREFIX}," -- cgit v1.2.3