summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2018-01-01 18:16:35 +0000
committerrillig <rillig@pkgsrc.org>2018-01-01 18:16:35 +0000
commitb18c532e6ecd247c16c309db2b6ebfb2d9d9b929 (patch)
tree7a8380c1b05f2a6cfadde7f15fc8cafd97355633 /lang
parent102f0b322dc649972205d0be0d0fc29afdf59f22 (diff)
downloadpkgsrc-b18c532e6ecd247c16c309db2b6ebfb2d9d9b929.tar.gz
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.
Diffstat (limited to 'lang')
-rw-r--r--lang/algol68g/Makefile4
-rw-r--r--lang/chicken/Makefile8
-rw-r--r--lang/clojure/Makefile4
-rw-r--r--lang/ecl/Makefile4
-rw-r--r--lang/gcc48-libs/buildlink3.mk4
-rw-r--r--lang/gcc49-libs/buildlink3.mk4
-rw-r--r--lang/gcc5-libs/buildlink3.mk4
-rw-r--r--lang/gcc6-libs/buildlink3.mk4
-rw-r--r--lang/kali/Makefile6
-rw-r--r--lang/mercury/Makefile4
-rw-r--r--lang/openjdk7/builtin.mk4
-rw-r--r--lang/pforth/Makefile6
-rw-r--r--lang/polyml/Makefile4
-rw-r--r--lang/sbcl/Makefile8
14 files changed, 35 insertions, 33 deletions
diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index a56531e4381..6e7ab7e4864 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -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
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 5c9b25897d0..03917227fc9 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -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 #, airhead@users.sourceforge.net
HOMEPAGE= http://www.call-cc.org/
@@ -41,7 +41,7 @@ PKG_SKIP_REASON+= "${OPSYS} is not supported"
.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.
diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile
index 33775c49036..d02f60291d0 100644
--- a/lang/clojure/Makefile
+++ b/lang/clojure/Makefile
@@ -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
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 748d6b94252..d9ece773832 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -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
diff --git a/lang/gcc48-libs/buildlink3.mk b/lang/gcc48-libs/buildlink3.mk
index bee4b2c12b8..2294a8a53fd 100644
--- a/lang/gcc48-libs/buildlink3.mk
+++ b/lang/gcc48-libs/buildlink3.mk
@@ -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_PLATFORM}
# 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}
diff --git a/lang/gcc49-libs/buildlink3.mk b/lang/gcc49-libs/buildlink3.mk
index c7a7c7199c4..a8ea452b36c 100644
--- a/lang/gcc49-libs/buildlink3.mk
+++ b/lang/gcc49-libs/buildlink3.mk
@@ -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_PLATFORM}
${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}
diff --git a/lang/gcc5-libs/buildlink3.mk b/lang/gcc5-libs/buildlink3.mk
index 369626ac469..7efa8209053 100644
--- a/lang/gcc5-libs/buildlink3.mk
+++ b/lang/gcc5-libs/buildlink3.mk
@@ -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_PLATFORM}
${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}
diff --git a/lang/gcc6-libs/buildlink3.mk b/lang/gcc6-libs/buildlink3.mk
index b314145c9f0..f7808b8b772 100644
--- a/lang/gcc6-libs/buildlink3.mk
+++ b/lang/gcc6-libs/buildlink3.mk
@@ -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_PLATFORM}
${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}
diff --git a/lang/kali/Makefile b/lang/kali/Makefile
index c89bb6cd0ff..70f7d1a7de2 100644
--- a/lang/kali/Makefile
+++ b/lang/kali/Makefile
@@ -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 Scheme
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}
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 44d8f096c71..20b69636615 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -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=${INSTALL_PREFIX:Q}
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
diff --git a/lang/openjdk7/builtin.mk b/lang/openjdk7/builtin.mk
index e65f39b4097..9dfa641e569 100644
--- a/lang/openjdk7/builtin.mk
+++ b/lang/openjdk7/builtin.mk
@@ -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
diff --git a/lang/pforth/Makefile b/lang/pforth/Makefile
index 76593e41c03..056f374c096 100644
--- a/lang/pforth/Makefile
+++ b/lang/pforth/Makefile
@@ -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/pforth/
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
diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile
index 97a472ef975..39a98ac6e03 100644
--- a/lang/polyml/Makefile
+++ b/lang/polyml/Makefile
@@ -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 Standard ML
# ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc
-WRKSRC= $(WRKDIR)/$(PKGNAME_NOREV)
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-system-libffi
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index f1054632548..70635ff05b9 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 06:17:57 +0000