CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Mon, 1 Jan 2018 18:16:40 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Jan  1 18:16:39 UTC 2018

Modified Files:
        pkgsrc/audio/rio: Makefile
        pkgsrc/benchmarks/skampi: Makefile
        pkgsrc/biology/gabedit: DESCR
        pkgsrc/databases/clisp-bdb: Makefile
        pkgsrc/databases/clisp-gdbm: Makefile
        pkgsrc/databases/clisp-pgsql: Makefile
        pkgsrc/devel/clisp-pcre: Makefile
        pkgsrc/devel/clisp-syscalls: Makefile
        pkgsrc/devel/clisp-wildcard: Makefile
        pkgsrc/devel/libftdi1: Makefile
        pkgsrc/devel/tcl-tclcl: Makefile
        pkgsrc/graphics/gif2png: Makefile
        pkgsrc/graphics/tuxpaint: Makefile
        pkgsrc/lang/algol68g: Makefile
        pkgsrc/lang/chicken: Makefile
        pkgsrc/lang/clojure: Makefile
        pkgsrc/lang/ecl: Makefile
        pkgsrc/lang/gcc48-libs: buildlink3.mk
        pkgsrc/lang/gcc49-libs: buildlink3.mk
        pkgsrc/lang/gcc5-libs: buildlink3.mk
        pkgsrc/lang/gcc6-libs: buildlink3.mk
        pkgsrc/lang/kali: Makefile
        pkgsrc/lang/mercury: Makefile
        pkgsrc/lang/openjdk7: builtin.mk
        pkgsrc/lang/pforth: Makefile
        pkgsrc/lang/polyml: Makefile
        pkgsrc/lang/sbcl: Makefile
        pkgsrc/mail/deliver: Makefile
        pkgsrc/math/mathomatic: Makefile
        pkgsrc/math/minisat: Makefile
        pkgsrc/math/mtl: Makefile
        pkgsrc/math/xfractint: Makefile
        pkgsrc/net/clisp-rawsock: Makefile
        pkgsrc/net/nicotine: Makefile
        pkgsrc/parallel/gridscheduler: Makefile
        pkgsrc/parallel/openmpi: Makefile
        pkgsrc/parallel/slurm: Makefile
        pkgsrc/parallel/threadingbuildingblocks: Makefile
        pkgsrc/print/poppler-includes: Makefile
        pkgsrc/print/tex-blindtext: options.mk
        pkgsrc/security/munge: Makefile
        pkgsrc/security/openpam: Makefile
        pkgsrc/security/p5-Dancer-Plugin-Auth-RBAC: Makefile
        pkgsrc/security/tacshell: Makefile
        pkgsrc/time/projectlibre: Makefile
        pkgsrc/www/clisp-fastcgi: Makefile
        pkgsrc/www/thttpd: Makefile

Log Message:
Replaced $(ROUND) with ${CURLY} variable references.

This has been a pkglint warning for several years now, and pkglint can even
fix it automatically. And it did for this commit.

Only in lang/mercury, two passes of autofixing were necessary because there
were nested variables.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/audio/rio/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/benchmarks/skampi/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/biology/gabedit/DESCR
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/clisp-bdb/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/clisp-gdbm/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/clisp-pgsql/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/clisp-pcre/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/clisp-syscalls/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/clisp-wildcard/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/libftdi1/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/tcl-tclcl/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/graphics/gif2png/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/graphics/tuxpaint/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/algol68g/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/lang/chicken/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/clojure/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/ecl/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc48-libs/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc49-libs/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc5-libs/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc6-libs/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/kali/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/lang/mercury/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/openjdk7/builtin.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/pforth/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/polyml/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/lang/sbcl/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/deliver/Makefile
cvs rdiff -u -r1.103 -r1.104 pkgsrc/math/mathomatic/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/minisat/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/mtl/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/xfractint/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/clisp-rawsock/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/net/nicotine/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/parallel/gridscheduler/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/parallel/openmpi/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/parallel/slurm/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/parallel/threadingbuildingblocks/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/poppler-includes/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-blindtext/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/munge/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/openpam/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/p5-Dancer-Plugin-Auth-RBAC/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/tacshell/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/time/projectlibre/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/clisp-fastcgi/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/www/thttpd/Makefile

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

Modified files:

Index: pkgsrc/audio/rio/Makefile
diff -u pkgsrc/audio/rio/Makefile:1.26 pkgsrc/audio/rio/Makefile:1.27
--- pkgsrc/audio/rio/Makefile:1.26      Mon Sep  4 18:00:49 2017
+++ pkgsrc/audio/rio/Makefile   Mon Jan  1 18:16:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/09/04 18:00:49 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2018/01/01 18:16:35 rillig Exp $
 #
 
 DISTNAME=      rio007
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM=    NetBSD-*-i386 NetBSD-
 WRKSRC=                ${WRKDIR}/rio107
 MAKE_FILE=     makefile
 USE_LANGUAGES= c++
-LIBS.NetBSD=   -l$(MACHINE_ARCH)
+LIBS.NetBSD=   -l${MACHINE_ARCH}
 
 INSTALLATION_DIRS=     bin
 SPECIAL_PERMS=         bin/rio ${SETUID_ROOT_PERMS}

Index: pkgsrc/benchmarks/skampi/Makefile
diff -u pkgsrc/benchmarks/skampi/Makefile:1.27 pkgsrc/benchmarks/skampi/Makefile:1.28
--- pkgsrc/benchmarks/skampi/Makefile:1.27      Mon Sep  4 18:00:50 2017
+++ pkgsrc/benchmarks/skampi/Makefile   Mon Jan  1 18:16:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2017/09/04 18:00:50 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2018/01/01 18:16:35 rillig Exp $
 #
 
 DISTNAME=      skampi
@@ -20,7 +20,7 @@ INSTALLATION_DIRS=    bin
 
 # Force file regeneration:
 post-extract:
-       rm $(WRKSRC)/Makefile.dep
+       rm ${WRKSRC}/Makefile.dep
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/skampi ${DESTDIR}${PREFIX}/bin/skampi

Index: pkgsrc/biology/gabedit/DESCR
diff -u pkgsrc/biology/gabedit/DESCR:1.1.1.1 pkgsrc/biology/gabedit/DESCR:1.2
--- pkgsrc/biology/gabedit/DESCR:1.1.1.1        Wed Jul 22 19:05:10 2015
+++ pkgsrc/biology/gabedit/DESCR        Mon Jan  1 18:16:35 2018
@@ -24,7 +24,7 @@ Major features
      + Contours (colorcoded), Planes colorcoded, Dipole. XYZ axes
        and the principal axes of the molecule.
      + Animation of the normal modes corresponding to vibrational
-       frequencies. 
+       frequencies.
      + Animation of the rotation of geometry, surfaces, contours,
        planes colorcoded, xyz and the principal axes of the molecule.
      + Animation of contours, Animation of planes colorcoded.

Index: pkgsrc/databases/clisp-bdb/Makefile
diff -u pkgsrc/databases/clisp-bdb/Makefile:1.4 pkgsrc/databases/clisp-bdb/Makefile:1.5
--- pkgsrc/databases/clisp-bdb/Makefile:1.4     Sat Apr  6 13:09:24 2013
+++ pkgsrc/databases/clisp-bdb/Makefile Mon Jan  1 18:16:35 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2013/04/06 13:09:24 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2018/01/01 18:16:35 rillig Exp $
 #
 
 CLISP_MODULE=  berkeley-db
 
-PKGNAME=       clisp-bdb-$(CLISP_VERSION)
+PKGNAME=       clisp-bdb-${CLISP_VERSION}
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}
 

Index: pkgsrc/databases/clisp-gdbm/Makefile
diff -u pkgsrc/databases/clisp-gdbm/Makefile:1.4 pkgsrc/databases/clisp-gdbm/Makefile:1.5
--- pkgsrc/databases/clisp-gdbm/Makefile:1.4    Tue Jan 24 09:10:58 2012
+++ pkgsrc/databases/clisp-gdbm/Makefile        Mon Jan  1 18:16:35 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2012/01/24 09:10:58 sbd Exp $
+# $NetBSD: Makefile,v 1.5 2018/01/01 18:16:35 rillig Exp $
 #
 
 CLISP_MODULE=  gdbm
 
-PKGNAME=       clisp-$(CLISP_MODULE)-$(CLISP_VERSION)
+PKGNAME=       clisp-${CLISP_MODULE}-${CLISP_VERSION}
 PKGREVISION=   2
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}

Index: pkgsrc/databases/clisp-pgsql/Makefile
diff -u pkgsrc/databases/clisp-pgsql/Makefile:1.3 pkgsrc/databases/clisp-pgsql/Makefile:1.4
--- pkgsrc/databases/clisp-pgsql/Makefile:1.3   Sun Oct  9 21:41:55 2016
+++ pkgsrc/databases/clisp-pgsql/Makefile       Mon Jan  1 18:16:35 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/10/09 21:41:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2018/01/01 18:16:35 rillig Exp $
 #
 
 CLISP_MODULE=  postgresql
 
-PKGNAME=       clisp-pgsql-$(CLISP_VERSION)
+PKGNAME=       clisp-pgsql-${CLISP_VERSION}
 PKGREVISION=   2
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}

Index: pkgsrc/devel/clisp-pcre/Makefile
diff -u pkgsrc/devel/clisp-pcre/Makefile:1.4 pkgsrc/devel/clisp-pcre/Makefile:1.5
--- pkgsrc/devel/clisp-pcre/Makefile:1.4        Wed Oct 31 11:16:46 2012
+++ pkgsrc/devel/clisp-pcre/Makefile    Mon Jan  1 18:16:35 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:16:46 asau Exp $
+# $NetBSD: Makefile,v 1.5 2018/01/01 18:16:35 rillig Exp $
 #
 
 CLISP_MODULE=  pcre
 
-PKGNAME=       clisp-$(CLISP_MODULE)-$(CLISP_VERSION)
+PKGNAME=       clisp-${CLISP_MODULE}-${CLISP_VERSION}
 PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}

Index: pkgsrc/devel/clisp-syscalls/Makefile
diff -u pkgsrc/devel/clisp-syscalls/Makefile:1.4 pkgsrc/devel/clisp-syscalls/Makefile:1.5
--- pkgsrc/devel/clisp-syscalls/Makefile:1.4    Fri Dec  2 20:47:04 2011
+++ pkgsrc/devel/clisp-syscalls/Makefile        Mon Jan  1 18:16:35 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2011/12/02 20:47:04 marino Exp $
+# $NetBSD: Makefile,v 1.5 2018/01/01 18:16:35 rillig Exp $
 #
 
 CLISP_MODULE=  syscalls
 
-PKGNAME=       clisp-$(CLISP_MODULE)-$(CLISP_VERSION)
+PKGNAME=       clisp-${CLISP_MODULE}-${CLISP_VERSION}
 PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}

Index: pkgsrc/devel/clisp-wildcard/Makefile
diff -u pkgsrc/devel/clisp-wildcard/Makefile:1.3 pkgsrc/devel/clisp-wildcard/Makefile:1.4
--- pkgsrc/devel/clisp-wildcard/Makefile:1.3    Sat Apr  6 13:09:24 2013
+++ pkgsrc/devel/clisp-wildcard/Makefile        Mon Jan  1 18:16:36 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2013/04/06 13:09:24 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2018/01/01 18:16:36 rillig Exp $
 #
 
 CLISP_MODULE=  wildcard
 
-PKGNAME=       clisp-$(CLISP_MODULE)-$(CLISP_VERSION)
+PKGNAME=       clisp-${CLISP_MODULE}-${CLISP_VERSION}
 PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}

Index: pkgsrc/devel/libftdi1/Makefile
diff -u pkgsrc/devel/libftdi1/Makefile:1.19 pkgsrc/devel/libftdi1/Makefile:1.20
--- pkgsrc/devel/libftdi1/Makefile:1.19 Thu Aug 24 20:03:11 2017
+++ pkgsrc/devel/libftdi1/Makefile      Mon Jan  1 18:16:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/08/24 20:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.20 2018/01/01 18:16:36 rillig Exp $
 
 DISTNAME=      libftdi1-1.1
 PKGREVISION=   7
@@ -30,7 +30,7 @@ PKGCONFIG_OVERRIDE+=  libftdipp1.pc.in
 PLIST_SUBST+=  PYSITELIB=${PYSITELIB}
 
 do-configure:
-       (cd $(WRKSRC) ; \
+       (cd ${WRKSRC} ; \
        cmake \
        -DEXAMPLES:BOOL=off \
        -DDOCUMENTATION:BOOL=off \

Index: pkgsrc/devel/tcl-tclcl/Makefile
diff -u pkgsrc/devel/tcl-tclcl/Makefile:1.28 pkgsrc/devel/tcl-tclcl/Makefile:1.29
--- pkgsrc/devel/tcl-tclcl/Makefile:1.28        Thu Oct  9 14:06:31 2014
+++ pkgsrc/devel/tcl-tclcl/Makefile     Mon Jan  1 18:16:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/10/09 14:06:31 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2018/01/01 18:16:36 rillig Exp $
 
 DISTNAME=      tclcl-src-1.20
 PKGNAME=       tcl-${DISTNAME:S/-src//}
@@ -27,8 +27,8 @@ BUILDLINK_DEPMETHOD.libXt?=   build
 .include "../../lang/tcl/Makefile.version"
 .include "../../x11/tk/Makefile.version"
 
-CONFIGURE_ARGS+=--with-tcl-ver=$(TCL_VERSION)
-CONFIGURE_ARGS+=--with-tk-ver=$(TK_VERSION)
+CONFIGURE_ARGS+=--with-tcl-ver=${TCL_VERSION}
+CONFIGURE_ARGS+=--with-tk-ver=${TK_VERSION}
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../lang/tcl-otcl/buildlink3.mk"

Index: pkgsrc/graphics/gif2png/Makefile
diff -u pkgsrc/graphics/gif2png/Makefile:1.52 pkgsrc/graphics/gif2png/Makefile:1.53
--- pkgsrc/graphics/gif2png/Makefile:1.52       Tue Sep  8 18:52:56 2015
+++ pkgsrc/graphics/gif2png/Makefile    Mon Jan  1 18:16:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2015/09/08 18:52:56 joerg Exp $
+# $NetBSD: Makefile,v 1.53 2018/01/01 18:16:36 rillig Exp $
 
 DISTNAME=      gif2png-2.5.11
 PKGREVISION=   1
@@ -18,7 +18,7 @@ INSTALL_MAKE_FLAGS+=  prefix=${DESTDIR}${
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 post-install:
-       ${MV} ${DESTDIR}$(PREFIX)/share/man/man1/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${MV} ${DESTDIR}${PREFIX}/share/man/man1/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/graphics/tuxpaint/Makefile
diff -u pkgsrc/graphics/tuxpaint/Makefile:1.88 pkgsrc/graphics/tuxpaint/Makefile:1.89
--- pkgsrc/graphics/tuxpaint/Makefile:1.88      Sun Feb 12 06:25:31 2017
+++ pkgsrc/graphics/tuxpaint/Makefile   Mon Jan  1 18:16:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2017/02/12 06:25:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.89 2018/01/01 18:16:36 rillig Exp $
 
 DISTNAME=      tuxpaint-0.9.22
 PKGREVISION=   4
@@ -30,8 +30,8 @@ MAKE_FLAGS+=          CPPFLAGS=${CPPFLAGS:Q}
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           CHMOD=${CHMOD:Q}
 MAKE_FLAGS+=           PREFIX=${PREFIX}
-MAKE_FLAGS+=           LOCALE_PREFIX=$(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale
-MAKE_FLAGS+=           MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/
+MAKE_FLAGS+=           LOCALE_PREFIX=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale
+MAKE_FLAGS+=           MAN_PREFIX=${DESTDIR}${PREFIX}/${PKGMANDIR}/
 MAKE_FLAGS+=           GPERF=${PREFIX}/bin/gperf
 EGDIR=                 ${PREFIX}/share/examples/tuxpaint
 CONF_FILES=            ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf

Index: pkgsrc/lang/algol68g/Makefile
diff -u pkgsrc/lang/algol68g/Makefile:1.13 pkgsrc/lang/algol68g/Makefile:1.14
--- pkgsrc/lang/algol68g/Makefile:1.13  Sun Oct  9 21:41:59 2016
+++ pkgsrc/lang/algol68g/Makefile       Mon Jan  1 18:16:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/10/09 21:41:59 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/01/01 18:16:36 rillig Exp $
 
 DISTNAME=      algol68g-2.8.3
 PKGREVISION=   1
@@ -12,7 +12,7 @@ LICENSE=      gnu-gpl-v3
 
 USE_LANGUAGES= c
 GNU_CONFIGURE= yes
-CONFIGURE_ARGS=        --docdir=$(PREFIX)/share/doc/$(PKGBASE)
+CONFIGURE_ARGS=        --docdir=${PREFIX}/share/doc/${PKGBASE}
 
 TEST_TARGET=   check
 

Index: pkgsrc/lang/chicken/Makefile
diff -u pkgsrc/lang/chicken/Makefile:1.57 pkgsrc/lang/chicken/Makefile:1.58
--- pkgsrc/lang/chicken/Makefile:1.57   Thu Jan 19 18:52:13 2017
+++ pkgsrc/lang/chicken/Makefile        Mon Jan  1 18:16:36 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2017/01/19 18:52:13 agc Exp $
+# $NetBSD: Makefile,v 1.58 2018/01/01 18:16:36 rillig Exp $
 
 DISTNAME=      chicken-4.11.0
 CATEGORIES=    lang
-MASTER_SITES=  http://code.call-cc.org/releases/$(PKGVERSION_NOREV)/
-MASTER_SITES+= http://code.call-cc.org/releases/$(PKGVERSION_NOREV:R)/
+MASTER_SITES=  http://code.call-cc.org/releases/${PKGVERSION_NOREV}/
+MASTER_SITES+= http://code.call-cc.org/releases/${PKGVERSION_NOREV:R}/
 
 MAINTAINER=    asau%inbox.ru@localhost #, airhead%users.sourceforge.net@localhost
 HOMEPAGE=      http://www.call-cc.org/
@@ -41,7 +41,7 @@ PKG_SKIP_REASON+=     "${OPSYS} is not suppo
 .endif
 
 MAKE_FILE=     GNUmakefile
-MAKE_ENV+=     C_COMPILER=$(CC:Q)
+MAKE_ENV+=     C_COMPILER=${CC:Q}
 MAKE_ENV+=     HOST=   # fix ${HOST} prepending ${CC}
 # Need to have these in MAKE_FLAGS, MAKE_ENV is not enough due to the
 # way the build system overrides them.

Index: pkgsrc/lang/clojure/Makefile
diff -u pkgsrc/lang/clojure/Makefile:1.4 pkgsrc/lang/clojure/Makefile:1.5
--- pkgsrc/lang/clojure/Makefile:1.4    Tue Aug  1 14:59:01 2017
+++ pkgsrc/lang/clojure/Makefile        Mon Jan  1 18:16:36 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2017/08/01 14:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/01/01 18:16:36 rillig Exp $
 
 DISTNAME=      clojure-1.5.1
 CATEGORIES=    lang
-MASTER_SITES=  http://repo1.maven.org/maven2/org/clojure/clojure/$(PKGVERSION_NOREV)/
+MASTER_SITES=  http://repo1.maven.org/maven2/org/clojure/clojure/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .zip
 
 MAINTAINER=    ryoon%NetBSD.org@localhost

Index: pkgsrc/lang/ecl/Makefile
diff -u pkgsrc/lang/ecl/Makefile:1.22 pkgsrc/lang/ecl/Makefile:1.23
--- pkgsrc/lang/ecl/Makefile:1.22       Fri Mar 11 20:32:30 2016
+++ pkgsrc/lang/ecl/Makefile    Mon Jan  1 18:16:36 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2016/03/11 20:32:30 asau Exp $
+# $NetBSD: Makefile,v 1.23 2018/01/01 18:16:36 rillig Exp $
 
 DISTNAME=              ecl-16.1.2
 CATEGORIES=            lang
-MASTER_SITES=          https://common-lisp.net/project/ecl/files/release/$(PKGVERSION_NOREV)/
+MASTER_SITES=          https://common-lisp.net/project/ecl/files/release/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=          .tgz
 
 MAINTAINER=            asau%inbox.ru@localhost

Index: pkgsrc/lang/gcc48-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc48-libs/buildlink3.mk:1.10 pkgsrc/lang/gcc48-libs/buildlink3.mk:1.11
--- pkgsrc/lang/gcc48-libs/buildlink3.mk:1.10   Wed Feb  4 14:16:24 2015
+++ pkgsrc/lang/gcc48-libs/buildlink3.mk        Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2015/02/04 14:16:24 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/01/01 18:16:37 rillig Exp $
 
 BUILDLINK_TREE+=       gcc48-libs
 
@@ -30,7 +30,7 @@ GCC_TARGET_MACHINE?=  ${MACHINE_GNU_PLATF
 # XXX: Using %M requires patched version of gcc (e.g. lang/gcc48)
 ${SPECS_LIBGCC}:
        @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
-       @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
+       @${ECHO} "%D ${LINKER_RPATH_FLAG}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
 
 _WRAP_EXTRA_ARGS.CC+=  -specs=${SPECS_LIBGCC}
 _WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}

Index: pkgsrc/lang/gcc49-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc49-libs/buildlink3.mk:1.2 pkgsrc/lang/gcc49-libs/buildlink3.mk:1.3
--- pkgsrc/lang/gcc49-libs/buildlink3.mk:1.2    Wed Feb  4 14:16:24 2015
+++ pkgsrc/lang/gcc49-libs/buildlink3.mk        Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/02/04 14:16:24 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/01 18:16:37 rillig Exp $
 
 BUILDLINK_TREE+=       gcc49-libs
 
@@ -29,7 +29,7 @@ GCC_TARGET_MACHINE?=  ${MACHINE_GNU_PLATF
 
 ${SPECS_LIBGCC}:
        @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
-       @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
+       @${ECHO} "%D ${LINKER_RPATH_FLAG}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
 
 _WRAP_EXTRA_ARGS.CC+=  -specs=${SPECS_LIBGCC}
 _WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}

Index: pkgsrc/lang/gcc5-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc5-libs/buildlink3.mk:1.1 pkgsrc/lang/gcc5-libs/buildlink3.mk:1.2
--- pkgsrc/lang/gcc5-libs/buildlink3.mk:1.1     Thu Jul 16 12:07:07 2015
+++ pkgsrc/lang/gcc5-libs/buildlink3.mk Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/07/16 12:07:07 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $
 
 BUILDLINK_TREE+=       gcc5-libs
 
@@ -29,7 +29,7 @@ GCC_TARGET_MACHINE?=  ${MACHINE_GNU_PLATF
 
 ${SPECS_LIBGCC}:
        @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
-       @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
+       @${ECHO} "%D ${LINKER_RPATH_FLAG}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
 
 _WRAP_EXTRA_ARGS.CC+=  -specs=${SPECS_LIBGCC}
 _WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}

Index: pkgsrc/lang/gcc6-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc6-libs/buildlink3.mk:1.1 pkgsrc/lang/gcc6-libs/buildlink3.mk:1.2
--- pkgsrc/lang/gcc6-libs/buildlink3.mk:1.1     Mon Sep 12 22:13:54 2016
+++ pkgsrc/lang/gcc6-libs/buildlink3.mk Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/09/12 22:13:54 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $
 
 BUILDLINK_TREE+=       gcc6-libs
 
@@ -29,7 +29,7 @@ GCC_TARGET_MACHINE?=  ${MACHINE_GNU_PLATF
 
 ${SPECS_LIBGCC}:
        @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
-       @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
+       @${ECHO} "%D ${LINKER_RPATH_FLAG}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
 
 _WRAP_EXTRA_ARGS.CC+=  -specs=${SPECS_LIBGCC}
 _WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}

Index: pkgsrc/lang/kali/Makefile
diff -u pkgsrc/lang/kali/Makefile:1.16 pkgsrc/lang/kali/Makefile:1.17
--- pkgsrc/lang/kali/Makefile:1.16      Mon Sep 19 05:52:45 2016
+++ pkgsrc/lang/kali/Makefile   Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/09/19 05:52:45 dholland Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/01 18:16:37 rillig Exp $
 
 DISTNAME=      kali-0.52.2
 CATEGORIES=    lang
@@ -10,8 +10,8 @@ COMMENT=      Distributed implementation of S
 
 GNU_CONFIGURE= yes
 BUILD_TARGET=  # empty
-MAKE_ENV=      mandir=$(PREFIX)/$(PKGMANDIR)/man1
-INSTALLATION_DIRS=     bin include lib $(PKGMANDIR)/man1
+MAKE_ENV=      mandir=${PREFIX}/${PKGMANDIR}/man1
+INSTALLATION_DIRS=     bin include lib ${PKGMANDIR}/man1
 
 # Thoroughly broken on 64-bit architectures.
 BROKEN_ON_PLATFORM=    ${LP64PLATFORMS}

Index: pkgsrc/lang/mercury/Makefile
diff -u pkgsrc/lang/mercury/Makefile:1.60 pkgsrc/lang/mercury/Makefile:1.61
--- pkgsrc/lang/mercury/Makefile:1.60   Thu Jan 19 18:52:14 2017
+++ pkgsrc/lang/mercury/Makefile        Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2017/01/19 18:52:14 agc Exp $
+# $NetBSD: Makefile,v 1.61 2018/01/01 18:16:37 rillig Exp $
 
 DISTNAME=              mercury-srcdist-14.01.1
 PKGNAME=               mercury-14.01.1
@@ -39,7 +39,7 @@ BUILD_MAKE_FLAGS+=    INSTALL_PREFIX=${INST
 BUILD_MAKE_FLAGS+=     INSTALL_INFO_DIR=${INSTALL_PREFIX:Q}/${PKGINFODIR:Q}
 BUILD_MAKE_FLAGS+=     INSTALL_MAN_DIR=${INSTALL_PREFIX:Q}/${PKGMANDIR:Q}
 BUILD_MAKE_FLAGS+=     MERCURY_COMPILER=${INSTALL_PREFIX:Q}/bin/mercury_compile
-BUILD_MAKE_FLAGS+=     PARALLEL=$(MAKE_JOBS:D-j$(MAKE_JOBS))
+BUILD_MAKE_FLAGS+=     PARALLEL=${MAKE_JOBS:D-j${MAKE_JOBS}}
 
 CHECK_PORTABILITY_SKIP+=       boehm_gc/configure
 CHECK_INTERPRETER_SKIP+=       lib/mercury/reconf/scripts/mtags.in

Index: pkgsrc/lang/openjdk7/builtin.mk
diff -u pkgsrc/lang/openjdk7/builtin.mk:1.1 pkgsrc/lang/openjdk7/builtin.mk:1.2
--- pkgsrc/lang/openjdk7/builtin.mk:1.1 Fri Dec 16 16:27:23 2016
+++ pkgsrc/lang/openjdk7/builtin.mk     Mon Jan  1 18:16:37 2018
@@ -1,3 +1,5 @@
+# $NetBSD: builtin.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $
+
 BUILTIN_PKG:=  openjdk7
 
 BUILTIN_FIND_FILES_VAR:=       OJDK7
@@ -26,7 +28,7 @@ MAKEVARS+=    IS_BUILTIN.openjdk7
 .if !defined(BUILTIN_PKG.openjdk7) && \
     !empty(IS_BUILTIN.openjdk7:M[yY][eE][sS])
 BUILTIN_VERSION.openjdk7!=     ${OJDK7} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/'
-BUILTIN_PKG.openjdk7=  openjdk7-$(BUILTIN_VERSION.openjdk7)
+BUILTIN_PKG.openjdk7=  openjdk7-${BUILTIN_VERSION.openjdk7}
 .endif
 MAKEVARS+=     BUILTIN_PKG.openjdk7
 

Index: pkgsrc/lang/pforth/Makefile
diff -u pkgsrc/lang/pforth/Makefile:1.26 pkgsrc/lang/pforth/Makefile:1.27
--- pkgsrc/lang/pforth/Makefile:1.26    Sun Sep 17 15:04:23 2017
+++ pkgsrc/lang/pforth/Makefile Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/09/17 15:04:23 asau Exp $
+# $NetBSD: Makefile,v 1.27 2018/01/01 18:16:37 rillig Exp $
 
 DISTNAME=              pforth_v27_20101121
 PKGNAME=               pforth-27
@@ -11,10 +11,10 @@ HOMEPAGE=           http://www.softsynth.com/pfor
 COMMENT=               Portable ANS-like Forth
 LICENSE=               mit
 
-WRKSRC=                        $(WRKDIR)/pforth_v27
+WRKSRC=                        ${WRKDIR}/pforth_v27
 MAKE_FILE=             build/unix/Makefile
 MAKE_FLAGS=            SRCDIR=.
-CPPFLAGS=              -DPF_DEFAULT_DICTIONARY='"$(PREFIX)/lib/pforth/pforth.dic"'
+CPPFLAGS=              -DPF_DEFAULT_DICTIONARY='"${PREFIX}/lib/pforth/pforth.dic"'
 
 INSTALLATION_DIRS=     bin lib/pforth share/doc/pforth share/pforth share/pforth/utils
 

Index: pkgsrc/lang/polyml/Makefile
diff -u pkgsrc/lang/polyml/Makefile:1.17 pkgsrc/lang/polyml/Makefile:1.18
--- pkgsrc/lang/polyml/Makefile:1.17    Sun Sep 17 15:04:23 2017
+++ pkgsrc/lang/polyml/Makefile Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/09/17 15:04:23 asau Exp $
+# $NetBSD: Makefile,v 1.18 2018/01/01 18:16:37 rillig Exp $
 
 DISTNAME=      polyml-5.7
 CATEGORIES=    lang
@@ -10,7 +10,7 @@ COMMENT=      Poly/ML is an implementation of
 
 # ONLY_FOR_PLATFORM=   *-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc
 
-WRKSRC=                $(WRKDIR)/$(PKGNAME_NOREV)
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
 GNU_CONFIGURE= yes
 CONFIGURE_ARGS=        --with-system-libffi

Index: pkgsrc/lang/sbcl/Makefile
diff -u pkgsrc/lang/sbcl/Makefile:1.75 pkgsrc/lang/sbcl/Makefile:1.76
--- pkgsrc/lang/sbcl/Makefile:1.75      Sun Sep 17 15:04:23 2017
+++ pkgsrc/lang/sbcl/Makefile   Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2017/09/17 15:04:23 asau Exp $
+# $NetBSD: Makefile,v 1.76 2018/01/01 18:16:37 rillig Exp $
 
 DISTNAME=              ${PKGNAME_NOREV}-source
 PKGNAME=               sbcl-1.3.21
@@ -86,9 +86,9 @@ post-build:
 
 do-install:
        cd ${WRKSRC} && BUILD_ROOT=${DESTDIR:Q} INSTALL_ROOT=${PREFIX:Q} MAN_DIR=${PREFIX:Q}/${PKGMANDIR} ${SH} install.sh
-       rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/sb-posix/test-output/write-test.txt
-       rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/sb-posix/test-output/read-test.txt
-       rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/asdf-install/installer.lisp.orig
+       rm -f ${DESTDIR}${PREFIX}/lib/sbcl/sb-posix/test-output/write-test.txt
+       rm -f ${DESTDIR}${PREFIX}/lib/sbcl/sb-posix/test-output/read-test.txt
+       rm -f ${DESTDIR}${PREFIX}/lib/sbcl/asdf-install/installer.lisp.orig
 
 do-test:
 #      for f in compiler.pure.lisp interface.pure.lisp compiler.impure.lisp debug.impure.lisp interface.impure.lisp; do mv ${WRKSRC}/tests/$$f ${WRKSRC}/tests/$$f.off || :; done

Index: pkgsrc/mail/deliver/Makefile
diff -u pkgsrc/mail/deliver/Makefile:1.16 pkgsrc/mail/deliver/Makefile:1.17
--- pkgsrc/mail/deliver/Makefile:1.16   Mon Oct  8 12:19:08 2012
+++ pkgsrc/mail/deliver/Makefile        Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/08 12:19:08 asau Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/01 18:16:37 rillig Exp $
 
 DISTNAME=      deliver-2.1.14
 PKGREVISION=   3
@@ -37,8 +37,8 @@ SUBST_CLASSES+=                       sources
 SUBST_STAGE.sources=           post-patch
 SUBST_MESSAGE.sources=         Fixing source code.
 SUBST_FILES.sources=           config.h deliver.8 conf/os-netbsd.h
-SUBST_SED.sources=             -e 's,@DELIVER_CONF_PREFIX@,$(PKG_SYSCONFDIR),g'
-SUBST_SED.sources+=            -e 's,@PREFIX@,$(PREFIX),g'
+SUBST_SED.sources=             -e 's,@DELIVER_CONF_PREFIX@,${PKG_SYSCONFDIR},g'
+SUBST_SED.sources+=            -e 's,@PREFIX@,${PREFIX},g'
 
 pre-configure:
        set -e; cd ${WRKSRC};                                                   \

Index: pkgsrc/math/mathomatic/Makefile
diff -u pkgsrc/math/mathomatic/Makefile:1.103 pkgsrc/math/mathomatic/Makefile:1.104
--- pkgsrc/math/mathomatic/Makefile:1.103       Tue Aug 18 07:31:12 2015
+++ pkgsrc/math/mathomatic/Makefile     Mon Jan  1 18:16:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2015/08/18 07:31:12 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2018/01/01 18:16:37 rillig Exp $
 #
 
 DISTNAME=              mathomatic-16.0.4
@@ -15,7 +15,7 @@ LICENSE=              gnu-lgpl-v2.1
 NO_CONFIGURE=          yes
 MAKE_FILE=             makefile
 USE_TOOLS+=            gmake
-INSTALL_ENV+=          prefix=$(PREFIX) mandir=$(DESTDIR)$(PREFIX)/$(PKGMANDIR)
+INSTALL_ENV+=          prefix=${PREFIX} mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 CFLAGS.SunOS+=         -DSOLARIS
 

Index: pkgsrc/math/minisat/Makefile
diff -u pkgsrc/math/minisat/Makefile:1.3 pkgsrc/math/minisat/Makefile:1.4
--- pkgsrc/math/minisat/Makefile:1.3    Mon Dec 15 12:31:09 2014
+++ pkgsrc/math/minisat/Makefile        Mon Jan  1 18:16:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/12/15 12:31:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2018/01/01 18:16:38 rillig Exp $
 
 DISTNAME=      minisat-2.2.0
 CATEGORIES=    math
@@ -9,20 +9,20 @@ HOMEPAGE=     http://minisat.se/
 COMMENT=       Minimalistic yet highly efficient SAT solver
 LICENSE=       mit
 
-WRKSRC=                $(WRKDIR)/minisat
+WRKSRC=                ${WRKDIR}/minisat
 USE_LANGUAGES= c++
 USE_TOOLS+=    gmake
 #BUILD_DIRS=   core simp
 BUILD_DIRS=    simp
-MAKE_ENV=      MROOT=$(WRKSRC)
+MAKE_ENV=      MROOT=${WRKSRC}
 MAKE_ENV+=     LFLAGS="-L${BUILDLINK_PREFIX.zlib}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib"
 BUILD_TARGET=  # empty
 
 INSTALLATION_DIRS+=    bin
 
 do-install:
-       $(INSTALL_PROGRAM) $(WRKSRC)/simp/minisat \
-               $(DESTDIR)$(PREFIX)/bin/minisat
+       ${INSTALL_PROGRAM} ${WRKSRC}/simp/minisat \
+               ${DESTDIR}${PREFIX}/bin/minisat
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/mtl/Makefile
diff -u pkgsrc/math/mtl/Makefile:1.13 pkgsrc/math/mtl/Makefile:1.14
--- pkgsrc/math/mtl/Makefile:1.13       Mon Apr  8 11:17:16 2013
+++ pkgsrc/math/mtl/Makefile    Mon Jan  1 18:16:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/04/08 11:17:16 rodent Exp $
+# $NetBSD: Makefile,v 1.14 2018/01/01 18:16:38 rillig Exp $
 
 DISTNAME=              mtl-2.1.2-22
 PKGNAME=               mtl-2.1.2.22
@@ -26,6 +26,6 @@ post-install:
            ${DESTDIR}${PREFIX}/share/doc/mtl
 
 do-test:
-       cd $(WRKSRC)/test && $(PERL5) ./bin/make_and_test.pl $(QUICK) -d ./src
+       cd ${WRKSRC}/test && ${PERL5} ./bin/make_and_test.pl ${QUICK} -d ./src
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/xfractint/Makefile
diff -u pkgsrc/math/xfractint/Makefile:1.13 pkgsrc/math/xfractint/Makefile:1.14
--- pkgsrc/math/xfractint/Makefile:1.13 Mon Nov  6 13:40:29 2017
+++ pkgsrc/math/xfractint/Makefile      Mon Jan  1 18:16:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/11/06 13:40:29 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/01/01 18:16:38 rillig Exp $
 
 DISTNAME=              xfrac310
 PKGNAME=               xfractint-3.10
@@ -19,7 +19,7 @@ MAKE_FLAGS+=          MANDIR=${PREFIX}/${PKGMAND
 MAKE_FLAGS+=           SRCDIR=${PREFIX}/share/xfractint
 BUILD_TARGET=          xfractint
 
-INSTALLATION_DIRS=     bin $(PKGMANDIR)/man1 share/xfractint
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/xfractint
 
 MAKE_ENV+=     X11_LDFLAGS=${X11_LDFLAGS:Q}
 

Index: pkgsrc/net/clisp-rawsock/Makefile
diff -u pkgsrc/net/clisp-rawsock/Makefile:1.2 pkgsrc/net/clisp-rawsock/Makefile:1.3
--- pkgsrc/net/clisp-rawsock/Makefile:1.2       Thu Dec 22 22:09:35 2011
+++ pkgsrc/net/clisp-rawsock/Makefile   Mon Jan  1 18:16:38 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2011/12/22 22:09:35 marino Exp $
+# $NetBSD: Makefile,v 1.3 2018/01/01 18:16:38 rillig Exp $
 #
 
 CLISP_MODULE=  rawsock
 
-PKGNAME=       clisp-$(CLISP_MODULE)-$(CLISP_VERSION)
+PKGNAME=       clisp-${CLISP_MODULE}-${CLISP_VERSION}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}
 

Index: pkgsrc/net/nicotine/Makefile
diff -u pkgsrc/net/nicotine/Makefile:1.48 pkgsrc/net/nicotine/Makefile:1.49
--- pkgsrc/net/nicotine/Makefile:1.48   Sun Sep  3 08:36:57 2017
+++ pkgsrc/net/nicotine/Makefile        Mon Jan  1 18:16:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2017/09/03 08:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2018/01/01 18:16:38 rillig Exp $
 
 DISTNAME=      nicotine-1.0.8
 PKGREVISION=   16
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR=     yes
 USE_LANGUAGES=         # empty
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # py-gtk2
 
-MAKE_ENV+=     PKGLOCALEDIR=$(PKGLOCALEDIR:Q)
+MAKE_ENV+=     PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/parallel/gridscheduler/Makefile
diff -u pkgsrc/parallel/gridscheduler/Makefile:1.21 pkgsrc/parallel/gridscheduler/Makefile:1.22
--- pkgsrc/parallel/gridscheduler/Makefile:1.21 Sat Jul  9 06:38:47 2016
+++ pkgsrc/parallel/gridscheduler/Makefile      Mon Jan  1 18:16:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/07/09 06:38:47 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2018/01/01 18:16:38 rillig Exp $
 
 PKGNAME=       gridscheduler-2011.11.1
 PKGREVISION=   2
@@ -87,7 +87,7 @@ PKG_FAIL_REASON+=     "SGE_ARCH and SGE_BUIL
 SGE_BUILDARCH?=                ${SGE_BUILDARCH_cmd:sh}
 
 # Some hacks to get it properly linked:
-MAKE_ENV+=     SGE_ARCH=$(SGE_ARCH) SGE_ROOT=$(SGE_ROOT)
+MAKE_ENV+=     SGE_ARCH=${SGE_ARCH} SGE_ROOT=${SGE_ROOT}
 
 LDFLAGS+=      -R${SGE_ROOT}/lib/${SGE_ARCH}
 BUILDLINK_PASSTHRU_RPATHDIRS+= ${SGE_ROOT}/lib/${SGE_ARCH}

Index: pkgsrc/parallel/openmpi/Makefile
diff -u pkgsrc/parallel/openmpi/Makefile:1.36 pkgsrc/parallel/openmpi/Makefile:1.37
--- pkgsrc/parallel/openmpi/Makefile:1.36       Sun Oct 23 14:02:28 2016
+++ pkgsrc/parallel/openmpi/Makefile    Mon Jan  1 18:16:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2016/10/23 14:02:28 asau Exp $
+# $NetBSD: Makefile,v 1.37 2018/01/01 18:16:38 rillig Exp $
 
 DISTNAME=      openmpi-1.10.4
 CATEGORIES=    parallel
@@ -20,8 +20,8 @@ SHLIBTOOL_OVERRIDE=   ${WRKSRC}/config/lib
 
 CONFIGURE_ARGS+=       --without-slurm
 CONFIGURE_ARGS+=       --enable-contrib-no-build=vt # in separate package
-CONFIGURE_ARGS+=       --with-libltdl=$(BUILDLINK_PREFIX.libltdl:Q) # use our libltdl
-CONFIGURE_ARGS+=       --with-hwloc=$(BUILDLINK_PREFIX.hwloc:Q) #external
+CONFIGURE_ARGS+=       --with-libltdl=${BUILDLINK_PREFIX.libltdl:Q} # use our libltdl
+CONFIGURE_ARGS+=       --with-hwloc=${BUILDLINK_PREFIX.hwloc:Q} #external
 CONFIGURE_ARGS+=       --with-wrapper-ldflags="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib"
 CONFIGURE_ENV+=                ompi_cv_f77_have_INTEGERp8=no   # no "INTEGER*8"??
 CONFIGURE_ARGS+=       OPAL_HAVE_LTDL_ADVISE=0

Index: pkgsrc/parallel/slurm/Makefile
diff -u pkgsrc/parallel/slurm/Makefile:1.22 pkgsrc/parallel/slurm/Makefile:1.23
--- pkgsrc/parallel/slurm/Makefile:1.22 Thu Jan 19 18:52:21 2017
+++ pkgsrc/parallel/slurm/Makefile      Mon Jan  1 18:16:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:21 agc Exp $
+# $NetBSD: Makefile,v 1.23 2018/01/01 18:16:38 rillig Exp $
 
 DISTNAME=      slurm-2.6.4
 PKGREVISION=   9
@@ -20,7 +20,7 @@ USE_LIBTOOL=  yes
 
 CONFIGURE_ARGS+=       --with-hdf5=no
 # Fix installation:
-CONFIGURE_ARGS+=       --htmldir=$(PREFIX)/share/doc/$(PKGNAME_NOREV)/html
+CONFIGURE_ARGS+=       --htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html
 
 REPLACE_PYTHON=        doc/html/shtml2html.py
 
@@ -28,18 +28,18 @@ PKG_GROUPS=         slurm
 PKG_USERS=             slurm:slurm
 
 PKG_GECOS.slurm=       SLURM user
-PKG_SHELL.slurm=       $(NOLOGIN)
+PKG_SHELL.slurm=       ${NOLOGIN}
 
 RCD_SCRIPTS+=  slurmd slurmctld
 
 post-install:
-       $(INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE)
-       $(INSTALL_DATA) $(WRKSRC)/etc/* $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE)/
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
+       ${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
 
 PYTHON_FOR_BUILD_ONLY= yes
 .include "../../lang/python/tool.mk"
 
-CONFIGURE_ARGS+=       --with-munge=$(BUILDLINK_PREFIX.munge:Q)
+CONFIGURE_ARGS+=       --with-munge=${BUILDLINK_PREFIX.munge:Q}
 .include "../../security/munge/buildlink3.mk" # optional
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/parallel/threadingbuildingblocks/Makefile
diff -u pkgsrc/parallel/threadingbuildingblocks/Makefile:1.7 pkgsrc/parallel/threadingbuildingblocks/Makefile:1.8
--- pkgsrc/parallel/threadingbuildingblocks/Makefile:1.7        Wed Sep  6 09:03:04 2017
+++ pkgsrc/parallel/threadingbuildingblocks/Makefile    Mon Jan  1 18:16:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/09/06 09:03:04 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/01/01 18:16:38 rillig Exp $
 
 DISTNAME=      tbb30_20110325oss_src
 PKGNAME=       threadingbuildingblocks-3.0.6 # for "3.0 update 6"
@@ -10,7 +10,7 @@ MAINTAINER=   asau%inbox.ru@localhost
 HOMEPAGE=      https://www.threadingbuildingblocks.org/
 COMMENT=       Threading Buildling Blocks
 
-WRKSRC=                $(WRKDIR)/$(DISTNAME:_src=) #tbb30_20101215oss
+WRKSRC=                ${WRKDIR}/${DISTNAME:_src=} #tbb30_20101215oss
 
 USE_LANGUAGES= c c++
 USE_TOOLS=     gmake pax
@@ -19,16 +19,16 @@ BUILD_TARGET=       default
 TEST_TARGET=   test
 
 pre-configure:
-       cd $(WRKSRC)/build/ && cp FreeBSD.gcc.inc NetBSD.gcc.inc && cp FreeBSD.inc NetBSD.inc
+       cd ${WRKSRC}/build/ && cp FreeBSD.gcc.inc NetBSD.gcc.inc && cp FreeBSD.inc NetBSD.inc
 
-INSTALLATION_DIRS=     include lib share/doc/$(PKGBASE)
+INSTALLATION_DIRS=     include lib share/doc/${PKGBASE}
 
 do-install:
-       $(INSTALL_LIB) $(WRKSRC)/build/build_release/libtbb.so $(DESTDIR)$(PREFIX)/lib/
-       $(INSTALL_LIB) $(WRKSRC)/build/build_release/libtbbmalloc.so $(DESTDIR)$(PREFIX)/lib/
-       $(INSTALL_LIB) $(WRKSRC)/build/build_debug/libtbb_debug.so $(DESTDIR)$(PREFIX)/lib/
-       $(INSTALL_LIB) $(WRKSRC)/build/build_debug/libtbbmalloc_debug.so $(DESTDIR)$(PREFIX)/lib/
-       (cd $(WRKSRC)/include && pax -rw tbb $(DESTDIR)$(PREFIX)/include/)
+       ${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbb.so ${DESTDIR}${PREFIX}/lib/
+       ${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbbmalloc.so ${DESTDIR}${PREFIX}/lib/
+       ${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbb_debug.so ${DESTDIR}${PREFIX}/lib/
+       ${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbbmalloc_debug.so ${DESTDIR}${PREFIX}/lib/
+       (cd ${WRKSRC}/include && pax -rw tbb ${DESTDIR}${PREFIX}/include/)
 # documentation:
 #      (cd $(WRKSRC)/doc/html && pax -rw . $(DESTDIR)$(PREFIX)/share/doc/html/$(PKGBASE)/)
 #      $(INSTALL_DATA) $(WRKSRC)/doc/Release_Notes.txt $(DESTDIR)$(PREFIX)/share/doc/$(PKGBASE)/

Index: pkgsrc/print/poppler-includes/Makefile
diff -u pkgsrc/print/poppler-includes/Makefile:1.20 pkgsrc/print/poppler-includes/Makefile:1.21
--- pkgsrc/print/poppler-includes/Makefile:1.20 Fri Dec  8 08:52:56 2017
+++ pkgsrc/print/poppler-includes/Makefile      Mon Jan  1 18:16:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/12/08 08:52:56 maya Exp $
+# $NetBSD: Makefile,v 1.21 2018/01/01 18:16:38 rillig Exp $
 
 PKGREVISION= 1
 .include "../../print/poppler/Makefile.common"
@@ -21,7 +21,7 @@ INCDIR=${DESTDIR}${PREFIX}/include
 do-install:
        ${INSTALL_DATA_DIR} ${INCDIR}
        ${INSTALL_DATA_DIR} ${INCDIR}/poppler
-       sed -n -f $(FILESDIR)/extract.sed ${WRKSRC}/CMakeLists.txt       \
+       sed -n -f ${FILESDIR}/extract.sed ${WRKSRC}/CMakeLists.txt       \
          | grep ^poppler/ | { while read f;                             \
        do                                                               \
            ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler;           \
@@ -29,12 +29,12 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/poppler/poppler-config.h ${INCDIR}/poppler
        for d in goo fofi splash; do                                     \
            ${INSTALL_DATA_DIR} ${INCDIR}/poppler/"$$d";                 \
-           sed -n -f $(FILESDIR)/extract.sed ${WRKSRC}/CMakeLists.txt   \
+           sed -n -f ${FILESDIR}/extract.sed ${WRKSRC}/CMakeLists.txt   \
              | grep "^$$d/" | { while read f;                           \
            do                                                           \
                ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler/"$$d"; \
            done };                                                      \
-       done                                                             
+       done
        # do these actually belong here?
        ${INSTALL_DATA} ${WRKSRC}/poppler/SignatureInfo.h ${INCDIR}/poppler
        ${INSTALL_DATA} ${WRKSRC}/goo/NetPBMWriter.h ${INCDIR}/poppler/goo

Index: pkgsrc/print/tex-blindtext/options.mk
diff -u pkgsrc/print/tex-blindtext/options.mk:1.1 pkgsrc/print/tex-blindtext/options.mk:1.2
--- pkgsrc/print/tex-blindtext/options.mk:1.1   Fri Jan 20 21:43:58 2017
+++ pkgsrc/print/tex-blindtext/options.mk       Mon Jan  1 18:16:38 2018
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.1 2017/01/20 21:43:58 markd Exp $
+# $NetBSD: options.mk,v 1.2 2018/01/01 18:16:38 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tex-blindtext
 BLINDTEXT_LANGUAGES=   catalan english french german latin
-PKG_SUPPORTED_OPTIONS+=        $(BLINDTEXT_LANGUAGES) polyglossia
+PKG_SUPPORTED_OPTIONS+=        ${BLINDTEXT_LANGUAGES} polyglossia
 PKG_SUGGESTED_OPTIONS+=        english
 
 .include "../../mk/bsd.options.mk"
 
 .for l in $(BLINDTEXT_LANGUAGES)
 .if !empty(PKG_OPTIONS:M$(l))
-DEPENDS+=      tex-babel-$(l)-[0-9]*:../../print/tex-babel-$(l)
+DEPENDS+=      tex-babel-${l}-[0-9]*:../../print/tex-babel-${l}
 .endif
 .endfor
 

Index: pkgsrc/security/munge/Makefile
diff -u pkgsrc/security/munge/Makefile:1.16 pkgsrc/security/munge/Makefile:1.17
--- pkgsrc/security/munge/Makefile:1.16 Sun Sep  3 09:22:58 2017
+++ pkgsrc/security/munge/Makefile      Mon Jan  1 18:16:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/09/03 09:22:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/01 18:16:39 rillig Exp $
 
 DISTNAME=      munge-0.5.11
 PKGREVISION=   7
@@ -13,10 +13,10 @@ COMMENT=    Authentication service for crea
 USE_TOOLS=     perl pkg-config
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-CONFIGURE_ARGS+=       --localstatedir=$(VARBASE)
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 INSTALLATION_DIRS+=    lib/pkgconfig
 
-OWN_DIRS=      $(VARBASE)/lib/munge $(VARBASE)/log/munge $(VARBASE)/run/munge
+OWN_DIRS=      ${VARBASE}/lib/munge ${VARBASE}/log/munge ${VARBASE}/run/munge
 
 RCD_SCRIPTS+=  munge
 

Index: pkgsrc/security/openpam/Makefile
diff -u pkgsrc/security/openpam/Makefile:1.25 pkgsrc/security/openpam/Makefile:1.26
--- pkgsrc/security/openpam/Makefile:1.25       Sun Sep  3 08:53:14 2017
+++ pkgsrc/security/openpam/Makefile    Mon Jan  1 18:16:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/09/03 08:53:14 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/01/01 18:16:39 rillig Exp $
 
 DISTNAME=      openpam-20140912
 PKGREVISION=   2
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=      --without-pam-su
 CONFIGURE_ARGS+=       --with-pam-unix
 CONFIGURE_ARGS+=       --with-modules-dir=${PREFIX}/lib/security
 
-CPPFLAGS+=             -DSYSCONFDIR=\"$(PKG_SYSCONFDIR)\"
+CPPFLAGS+=             -DSYSCONFDIR=\"${PKG_SYSCONFDIR}\"
 
 OWN_DIRS=              ${PKG_SYSCONFDIR}/pam.d
 

Index: pkgsrc/security/p5-Dancer-Plugin-Auth-RBAC/Makefile
diff -u pkgsrc/security/p5-Dancer-Plugin-Auth-RBAC/Makefile:1.7 pkgsrc/security/p5-Dancer-Plugin-Auth-RBAC/Makefile:1.8
--- pkgsrc/security/p5-Dancer-Plugin-Auth-RBAC/Makefile:1.7     Mon Jun  5 14:24:31 2017
+++ pkgsrc/security/p5-Dancer-Plugin-Auth-RBAC/Makefile Mon Jan  1 18:16:39 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2017/06/05 14:24:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2018/01/01 18:16:39 rillig Exp $
 #
 
 DISTNAME=              Dancer-Plugin-Auth-RBAC-1.110720
-PKGNAME=               p5-$(DISTNAME:S/110720/110.720/)
+PKGNAME=               p5-${DISTNAME:S/110720/110.720/}
 PKGREVISION=           4
 CATEGORIES=            security www perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Dancer/}

Index: pkgsrc/security/tacshell/Makefile
diff -u pkgsrc/security/tacshell/Makefile:1.6 pkgsrc/security/tacshell/Makefile:1.7
--- pkgsrc/security/tacshell/Makefile:1.6       Mon Sep  4 18:01:01 2017
+++ pkgsrc/security/tacshell/Makefile   Mon Jan  1 18:16:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/09/04 18:01:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/01/01 18:16:39 rillig Exp $
 
 DISTNAME=              tacshell-0.91
 PKGREVISION=           1
@@ -10,7 +10,7 @@ MAINTAINER=           sekiya%NetBSD.org@localhost
 COMMENT=               RSA ACE/Server sdshell workalike, using TACACS+
 
 GNU_CONFIGURE=         YES
-CONF_FILES+=           $(PREFIX)/share/examples/tacshell/tacshell.conf \
+CONF_FILES+=           ${PREFIX}/share/examples/tacshell/tacshell.conf \
                        ${PKG_SYSCONFDIR}/tacshell.conf
 
 INSTALLATION_DIRS+=    bin share/examples/tacshell

Index: pkgsrc/time/projectlibre/Makefile
diff -u pkgsrc/time/projectlibre/Makefile:1.3 pkgsrc/time/projectlibre/Makefile:1.4
--- pkgsrc/time/projectlibre/Makefile:1.3       Mon Dec 19 16:01:19 2016
+++ pkgsrc/time/projectlibre/Makefile   Mon Jan  1 18:16:39 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2016/12/19 16:01:19 asau Exp $
+# $NetBSD: Makefile,v 1.4 2018/01/01 18:16:39 rillig Exp $
 
 DISTNAME=      projectlibre-1.6.1
 CATEGORIES=    time
-MASTER_SITES=  $(MASTER_SITE_SOURCEFORGE:=projectlibre/)
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=projectlibre/}
 
 MAINTAINER=    asau%inbox.ru@localhost
 HOMEPAGE=      http://www.projectlibre.org/
@@ -18,20 +18,20 @@ SUBST_CLASSES+=                     set-java set-base
 SUBST_STAGE.set-java=          post-configure
 SUBST_MESSAGE.set-java=                Setting Java path.
 SUBST_FILES.set-java=          projectlibre.sh
-SUBST_SED.set-java=            -e '/^JAVA_EXE=/s,java,$(PKG_JAVA_HOME)/bin/java,'
+SUBST_SED.set-java=            -e '/^JAVA_EXE=/s,java,${PKG_JAVA_HOME}/bin/java,'
 
 SUBST_STAGE.set-base=          post-configure
 SUBST_MESSAGE.set-base=                Setting package base path.
 SUBST_FILES.set-base=          projectlibre.sh
-SUBST_SED.set-base=            -e '/^OPENPROJ_HOME0=/s,^.*$$,OPENPROJ_HOME0=$(PREFIX)/share/$(PKGBASE),'
+SUBST_SED.set-base=            -e '/^OPENPROJ_HOME0=/s,^.*$$,OPENPROJ_HOME0=${PREFIX}/share/${PKGBASE},'
 
 NO_BUILD=      yes
 
-INSTALLATION_DIRS=     bin share/$(PKGBASE)
+INSTALLATION_DIRS=     bin share/${PKGBASE}
 
 do-install:
-       cd $(WRKSRC) && pax -rwpm . $(DESTDIR)$(PREFIX)/share/$(PKGBASE)
-       $(LN) -sf $(PREFIX)/share/$(PKGBASE)/projectlibre.sh $(DESTDIR)$(PREFIX)/bin/projectlibre
+       cd ${WRKSRC} && pax -rwpm . ${DESTDIR}${PREFIX}/share/${PKGBASE}
+       ${LN} -sf ${PREFIX}/share/${PKGBASE}/projectlibre.sh ${DESTDIR}${PREFIX}/bin/projectlibre
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/clisp-fastcgi/Makefile
diff -u pkgsrc/www/clisp-fastcgi/Makefile:1.2 pkgsrc/www/clisp-fastcgi/Makefile:1.3
--- pkgsrc/www/clisp-fastcgi/Makefile:1.2       Sat Jan 28 11:32:09 2012
+++ pkgsrc/www/clisp-fastcgi/Makefile   Mon Jan  1 18:16:39 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/01/28 11:32:09 marino Exp $
+# $NetBSD: Makefile,v 1.3 2018/01/01 18:16:39 rillig Exp $
 #
 
 CLISP_MODULE=  fastcgi
 
-PKGNAME=       clisp-$(CLISP_MODULE)-$(CLISP_VERSION)
+PKGNAME=       clisp-${CLISP_MODULE}-${CLISP_VERSION}
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}
 

Index: pkgsrc/www/thttpd/Makefile
diff -u pkgsrc/www/thttpd/Makefile:1.46 pkgsrc/www/thttpd/Makefile:1.47
--- pkgsrc/www/thttpd/Makefile:1.46     Thu Mar 12 01:00:26 2015
+++ pkgsrc/www/thttpd/Makefile  Mon Jan  1 18:16:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2015/03/12 01:00:26 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.47 2018/01/01 18:16:39 rillig Exp $
 
 DISTNAME=      thttpd-2.26
 CATEGORIES=    www
@@ -29,7 +29,7 @@ EGDIR=                ${PREFIX}/share/examples
 CONF_FILES=    ${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf
 RCD_SCRIPTS=   thttpd
 
-INSTALLATION_DIRS=     $(PKGMANDIR)/man1 share/thttpd ${EGDIR}
+INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/thttpd ${EGDIR}
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     thttpd.conf

Prev by Date: CVS commit: pkgsrc/devel/lldb
Next by Date: CVS commit: [pkgsrc-2017Q4] pkgsrc/inputmethod/mozc-server
Previous by Thread: CVS commit: pkgsrc/devel/lldb
Next by Thread: CVS commit: [pkgsrc-2017Q4] pkgsrc/inputmethod/mozc-server
Indexes:

Home | Main Index | Thread Index | Old Index