From 5ec134d67dbba7a354689af359fb4dd92bc8cbec 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 --- parallel/GridSim/Makefile | 4 ++-- parallel/glunix/Makefile | 8 ++++---- parallel/glunix/distinfo | 4 ++-- parallel/glunix/patches/patch-bv | 4 ++-- parallel/mpi-ch/Makefile | 14 +++++++------- parallel/p5-Parallel-Pvm/Makefile | 6 +++--- parallel/pvm3/Makefile | 10 +++++----- parallel/pvm3/arch.mk | 6 +++--- parallel/sge/Makefile | 10 +++++----- 9 files changed, 33 insertions(+), 33 deletions(-) (limited to 'parallel') diff --git a/parallel/GridSim/Makefile b/parallel/GridSim/Makefile index 345557d2b51..83bc01da4eb 100644 --- a/parallel/GridSim/Makefile +++ b/parallel/GridSim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/09/28 20:52:25 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:50 rillig Exp $ # DISTNAME= gridsimtoolkit-3.0 @@ -12,7 +12,7 @@ MAINTAINER= jschauma@NetBSD.org HOMEPAGE= http://www.gridbus.org/gridsim/ COMMENT= Toolkit for simulation of parallel systems -USE_JAVA2= run +USE_JAVA2= 1.4 PKG_JVMS_ACCEPTED= sun-jdk14 jdk14 NO_BUILD= yes diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile index 6380e7763c1..f2dc91e2c4a 100644 --- a/parallel/glunix/Makefile +++ b/parallel/glunix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/29 11:25:12 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:51 rillig Exp $ DISTNAME= glunix-release-1-0a PKGNAME= glunix-1.0a @@ -30,9 +30,9 @@ MESSAGE_SUBST+= NOW_ROOT=${NOW_ROOT} FLAGS+=-DL_ENDIAN .endif -MAKE_ENV+= OPSYS=${OPSYS} ARCH=${MACHINE_ARCH} NOW_ROOT=${NOW_ROOT} -MAKE_ENV+= PORTSDIR=${PKGDIR} WRKDIR=${WRKDIR} FLAGS="${FLAGS}" -MAKE_ENV+= SSH=${SSH} +MAKE_ENV+= OPSYS=${OPSYS:Q} ARCH=${MACHINE_ARCH:Q} NOW_ROOT=${NOW_ROOT:Q} +MAKE_ENV+= PORTSDIR=${PKGDIR:Q} WRKDIR=${WRKDIR:Q} FLAGS=${FLAGS:Q} +MAKE_ENV+= SSH=${SSH:Q} .if exists(/usr/sbin/user) USER_CMD= /usr/sbin/user diff --git a/parallel/glunix/distinfo b/parallel/glunix/distinfo index 9c1a589ae32..d38731af170 100644 --- a/parallel/glunix/distinfo +++ b/parallel/glunix/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2005/05/29 14:38:32 wiz Exp $ +$NetBSD: distinfo,v 1.5 2005/12/05 20:50:51 rillig Exp $ SHA1 (glunix-release-1-0a.tar.gz) = 8c69f5252e00fc4143a088c9b555b5e0c5b350f8 RMD160 (glunix-release-1-0a.tar.gz) = a718ebe775b697ebae14ba3a277994dc6c5a4c8d @@ -50,7 +50,7 @@ SHA1 (patch-br) = d013a9091c7270b83c76e80afb1178985bf35968 SHA1 (patch-bs) = b625e5fefd631e8277574efc5cfe1e7604751a30 SHA1 (patch-bt) = 328c06576c24a7fe4ce25ff4d816d4f51029023a SHA1 (patch-bu) = 80ba6229ebbbe981bacaece312b3882541a7a276 -SHA1 (patch-bv) = 32df71b44baba4bb47d0cdf124f7d620c534309a +SHA1 (patch-bv) = fbe100fa1a6bd8c3a4dd7c1ae401a129122537e1 SHA1 (patch-bw) = 3f42749265da2b783b429ca357ee5c0f6f67f371 SHA1 (patch-bx) = ed841b216f4d41ed2777081dbd0eaa6bb426ff09 SHA1 (patch-by) = 7f15f359d307ba064f7cc3d0ed98d0a8189eff39 diff --git a/parallel/glunix/patches/patch-bv b/parallel/glunix/patches/patch-bv index 1a52c51a3d4..81a7fe01e5b 100644 --- a/parallel/glunix/patches/patch-bv +++ b/parallel/glunix/patches/patch-bv @@ -1,8 +1,8 @@ -$NetBSD: patch-bv,v 1.3 2005/05/29 14:38:33 wiz Exp $ +$NetBSD: patch-bv,v 1.4 2005/12/05 20:50:51 rillig Exp $ --- progs/glush/sh.sem.c.orig 1995-07-20 20:09:24.000000000 +0200 +++ progs/glush/sh.sem.c -@@ -50,7 +50,7 @@ RCSID("$Id: sh.sem.c,v 1.1 1995/07/20 18 +@@ -50,7 +50,7 @@ #endif /* CLOSE_ON_EXEC */ #if defined(__sparc__) || defined(sparc) diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index 5de75c12284..503d5096e8e 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/07/16 01:19:17 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:51 rillig Exp $ DISTNAME= mpich-1.2.6 PKGREVISION= 1 @@ -25,7 +25,7 @@ MPI_RSH?= ssh .include "../../mk/bsd.prefs.mk" -CONFIGURE_ARGS= -prefix=${PREFIX} +CONFIGURE_ARGS+= -prefix=${PREFIX} CONFIGURE_ARGS+= -docdir=${PREFIX}/share/doc/mpi-ch CONFIGURE_ARGS+= -htmldir=${PREFIX}/share/doc/html/mpi-ch CONFIGURE_ARGS+= -opt=-O @@ -35,16 +35,16 @@ CONFIGURE_ARGS+= --with-mpe CONFIGURE_ARGS+= --disable-devdebug CONFIGURE_ARGS+= --disable-f90 CONFIGURE_ARGS+= --disable-f90modules -CONFIGURE_ENV+= sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ENV+= PERL=${PERL5} -CONFIGURE_ENV+= PERLFULLPATH=${PERL5} +CONFIGURE_ENV+= sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ENV+= PERL=${PERL5:Q} +CONFIGURE_ENV+= PERLFULLPATH=${PERL5:Q} # build PATH in the config file is not a problem CHECK_WRKREF_SKIP+= ${PREFIX}/share/examples/mpi-ch/perftest/config.system .if ${OPSYS} == "NetBSD" CONFIGURE_ARGS+= --with-arch=netbsd -PLIST_SUBST+= MPICH_OPSYS="${LOWER_OPSYS}" +PLIST_SUBST+= MPICH_OPSYS=${LOWER_OPSYS:Q} .elif ${OPSYS} == "IRIX" CONFIGURE_ARGS+= --with-arch=IRIX${ABI:S/32/N32/} PLIST_SUBST+= MPICH_OPSYS="${OPSYS}${ABI:S/32/N32/}" @@ -55,7 +55,7 @@ PLIST_SUBST+= MPICH_OPSYS="${OPSYS}${ABI:S/32/N32/}" CONFIGURE_ARGS+= --disable-weak-symbols .endif -MAKE_ENV+= RSHCOMMAND="${MPI_RSH}" +MAKE_ENV+= RSHCOMMAND=${MPI_RSH:Q} BUILD_DEFS+= MPI_RSH diff --git a/parallel/p5-Parallel-Pvm/Makefile b/parallel/p5-Parallel-Pvm/Makefile index dac3883097d..6cd6e59f634 100644 --- a/parallel/p5-Parallel-Pvm/Makefile +++ b/parallel/p5-Parallel-Pvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:29 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:51 rillig Exp $ # DISTNAME= Parallel-Pvm-1.3.0 @@ -14,8 +14,8 @@ HOMEPAGE= http://www.epm.ornl.gov/pvm/pvm_home.html COMMENT= Perl module for PVM (Parallel Virtual Machine) PVM_ROOT?= ${LOCALBASE}/pvm3 -CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT} PVM_ARCH=${PVM_ARCH} -MAKE_ENV+= PVM_ROOT=${PVM_ROOT} PVM_ARCH=${PVM_ARCH} +CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT:Q} PVM_ARCH=${PVM_ARCH:Q} +MAKE_ENV+= PVM_ROOT=${PVM_ROOT:Q} PVM_ARCH=${PVM_ARCH:Q} PERL5_PACKLIST= auto/Parallel/Pvm/.packlist MESSAGE_SUBST+= PVM_ROOT=${PVM_ROOT} EXAMPLES_DIR= ${PREFIX}/share/examples/p5-Parallel-Pvm diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile index 2d38eaf8513..feaf264e663 100644 --- a/parallel/pvm3/Makefile +++ b/parallel/pvm3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/09/28 14:31:08 rillig Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:51 rillig Exp $ DISTNAME= pvm3.4.5 PKGNAME= pvm-3.4.5 @@ -22,12 +22,12 @@ USE_LANGUAGES= fortran USE_LIBTOOL= yes PVM_ROOT= ${WRKSRC} -MAKE_ENV+= PVM_ROOT=${WRKSRC} +MAKE_ENV+= PVM_ROOT=${WRKSRC:Q} MAKE_ENV+= PVM_ARCH= -MAKE_ENV+= SSH=${PVM_SSH} -MAKE_ENV+= MKDIR="${MKDIR}" +MAKE_ENV+= SSH=${PVM_SSH:Q} +MAKE_ENV+= MKDIR=${MKDIR:Q} MAKE_ENV+= PVMLIB_VER=3:4 -MAKE_ENV+= PVM_DIR=${PVM_DIR} +MAKE_ENV+= PVM_DIR=${PVM_DIR:Q} BUILD_TARGET= all install # Set PVM_ARCH to the correct value for this machine platform. diff --git a/parallel/pvm3/arch.mk b/parallel/pvm3/arch.mk index 3de9e7e4067..bb1edd0018c 100644 --- a/parallel/pvm3/arch.mk +++ b/parallel/pvm3/arch.mk @@ -1,4 +1,4 @@ -# $NetBSD: arch.mk,v 1.7 2005/04/28 23:11:14 jlam Exp $ +# $NetBSD: arch.mk,v 1.8 2005/12/05 20:50:51 rillig Exp $ # .include "../../mk/bsd.prefs.mk" @@ -34,5 +34,5 @@ _PVM_ARCH= # empty .endif PVM_ARCH= ${_PVM_OPSYS}${_PVM_ARCH} -PLIST_SUBST+= PVM_ARCH=${PVM_ARCH} -FILES_SUBST+= PVM_ARCH=${PVM_ARCH} +PLIST_SUBST+= PVM_ARCH=${PVM_ARCH:Q} +FILES_SUBST+= PVM_ARCH=${PVM_ARCH:Q} diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile index 4fa91751586..d2dcb55e32d 100644 --- a/parallel/sge/Makefile +++ b/parallel/sge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:50 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:51 rillig Exp $ # DISTNAME= sge-5.3p6 @@ -17,11 +17,11 @@ USE_TOOLS+= gmake perl:run CFLAGS+= -D${UPPER_OPSYS} CONFIGURE_ENV+= REMOTE=sge -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" +CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q} CONFIGURE_ARGS+= --with-grd=${SGE_BUILDARCH} -PLIST_SUBST+= SGE_ARCH=${SGE_ARCH} +PLIST_SUBST+= SGE_ARCH=${SGE_ARCH:Q} MESSAGE_SUBST+= SGE_ROOT=${SGE_ROOT} -MAKE_ENV+= PERL5=${PERL5} +MAKE_ENV+= PERL5=${PERL5:Q} USE_PKGINSTALL= YES SGE_USER?= sgeadmin @@ -67,7 +67,7 @@ SGE_BUILDARCH_cmd= ${ECHO} "${SGE_ARCH}" | ${TR} a-z A-Z SGE_ARCH= darwin SGE_BUILDARCH= DARWIN .else -PKG_FAIL_REASON= "SGE_ARCH and SGE_BUILDARCH need to be confgured for your OS" +PKG_FAIL_REASON+= "SGE_ARCH and SGE_BUILDARCH need to be configured for your OS" .endif SGE_BUILDARCH?= ${SGE_BUILDARCH_cmd:sh} -- cgit v1.2.3