CVS commit: pkgsrc/mk

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Apr 20 16:32:42 UTC 2019

Modified Files:
        pkgsrc/mk: mpi.buildlink3.mk
        pkgsrc/mk/compiler: ccc.mk
        pkgsrc/mk/configure: gnu-configure.mk

Log Message:
mk: fix pkglint warnings about ambiguous variables

When a Makefile fragment contains $0, this means a Makefile variable, not
a shell or AWK variable.

The bug in ccc.mk survived unnoticed for almost 15 years. The bug in
gnu-configure.mk for MirBSD got only half as old.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mk/mpi.buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mk/compiler/ccc.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mk/configure/gnu-configure.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/mpi.buildlink3.mk
diff -u pkgsrc/mk/mpi.buildlink3.mk:1.3 pkgsrc/mk/mpi.buildlink3.mk:1.4
--- pkgsrc/mk/mpi.buildlink3.mk:1.3     Sat Sep 24 18:34:24 2016
+++ pkgsrc/mk/mpi.buildlink3.mk Sat Apr 20 16:32:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mpi.buildlink3.mk,v 1.3 2016/09/24 18:34:24 kamil Exp $
+# $NetBSD: mpi.buildlink3.mk,v 1.4 2019/04/20 16:32:42 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages
 # that use any MPI implementation instead of one particular one.
@@ -18,15 +18,15 @@ MPI_BUILDLINK3_MK=  # define it
 .include "../../mk/bsd.prefs.mk"
 
 # Try to find if we have anything installed already
-.if exists($(LOCALBASE)/bin/mpicc)
+.if exists(${LOCALBASE}/bin/mpicc)
 _MPI_PACKAGE!= ${PKG_INFO} -Q PKGPATH -F ${LOCALBASE}/bin/mpicc
 MPI_TYPE?=     ${_MPI_PACKAGE:T}
 .else
 
 MPI_TYPE?=     mpich   # default to MPICH due to backward compatibility
-.if $(MPI_TYPE) == "mpich"
+.if ${MPI_TYPE} == "mpich"
 _MPI_PACKAGE=  parallel/mpi-ch
-.elif $(MPI_TYPE) == "openmpi"
+.elif ${MPI_TYPE} == "openmpi"
 _MPI_PACKAGE=  parallel/openmpi
 .else # invalid or unimplemented type
 PKG_FAIL_REASON+=      \
@@ -34,6 +34,6 @@ PKG_FAIL_REASON+=     \
 .endif
 .endif
 
-.include "../../$(_MPI_PACKAGE)/buildlink3.mk"
+.include "../../${_MPI_PACKAGE}/buildlink3.mk"
 
 .endif # MPI_BUILDLINK3_MK

Index: pkgsrc/mk/compiler/ccc.mk
diff -u pkgsrc/mk/compiler/ccc.mk:1.19 pkgsrc/mk/compiler/ccc.mk:1.20
--- pkgsrc/mk/compiler/ccc.mk:1.19      Tue Jun  2 22:32:49 2009
+++ pkgsrc/mk/compiler/ccc.mk   Sat Apr 20 16:32:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ccc.mk,v 1.19 2009/06/02 22:32:49 joerg Exp $
+# $NetBSD: ccc.mk,v 1.20 2019/04/20 16:32:42 rillig Exp $
 #
 # This is the compiler definition for the Compaq C Compilers.
 #
@@ -35,7 +35,7 @@ _COMPILER_STRIP_VARS+=        ${_CCC_VARS}
 
 .if exists(${CCPATH}) && !defined(CC_VERSION_STRING)
 CC_VERSION_STRING!=    ${CCPATH} -V 2>&1 | ${AWK} '{print; exit(0);}'
-CC_VERSION!=           ${CCPATH} -V 2>&1 | ${AWK} '{print "CCC-"$3; exit(0);}'
+CC_VERSION!=           ${CCPATH} -V 2>&1 | ${AWK} '{print "CCC-"$$3; exit(0);}'
 .else
 CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           CCC

Index: pkgsrc/mk/configure/gnu-configure.mk
diff -u pkgsrc/mk/configure/gnu-configure.mk:1.18 pkgsrc/mk/configure/gnu-configure.mk:1.19
--- pkgsrc/mk/configure/gnu-configure.mk:1.18   Wed Apr  3 19:10:26 2019
+++ pkgsrc/mk/configure/gnu-configure.mk        Sat Apr 20 16:32:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: gnu-configure.mk,v 1.18 2019/04/03 19:10:26 rillig Exp $
+# $NetBSD: gnu-configure.mk,v 1.19 2019/04/20 16:32:42 rillig Exp $
 #
 # Package-settable variables:
 #
@@ -170,7 +170,7 @@ _SCRIPT.configure-scripts-osdep=                                    \
                                found = 0;                              \
                        }                                               \
                }                                                       \
-               { print $0 }' $$file >$$file.override;                  \
+               { print $$0 }' $$file >$$file.override;                 \
        ${CHMOD} +x $$file.override;                                    \
        ${TOUCH} -r $$file $$file.override;                             \
        ${MV} -f $$file.override $$file