pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Replaced $(ROUND) with ${CURLY} variable references.
details: https://anonhg.NetBSD.org/pkgsrc/rev/077ba78a9c4d
branches: trunk
changeset: 373416:077ba78a9c4d
user: rillig <rillig%pkgsrc.org@localhost>
date: Mon Jan 01 18:16:35 2018 +0000
description:
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:
audio/rio/Makefile | 4 ++--
benchmarks/skampi/Makefile | 4 ++--
biology/gabedit/DESCR | 2 +-
databases/clisp-bdb/Makefile | 4 ++--
databases/clisp-gdbm/Makefile | 4 ++--
databases/clisp-pgsql/Makefile | 4 ++--
devel/clisp-pcre/Makefile | 4 ++--
devel/clisp-syscalls/Makefile | 4 ++--
devel/clisp-wildcard/Makefile | 4 ++--
devel/libftdi1/Makefile | 4 ++--
devel/tcl-tclcl/Makefile | 6 +++---
graphics/gif2png/Makefile | 4 ++--
graphics/tuxpaint/Makefile | 6 +++---
lang/algol68g/Makefile | 4 ++--
lang/chicken/Makefile | 8 ++++----
lang/clojure/Makefile | 4 ++--
lang/ecl/Makefile | 4 ++--
lang/gcc48-libs/buildlink3.mk | 4 ++--
lang/gcc49-libs/buildlink3.mk | 4 ++--
lang/gcc5-libs/buildlink3.mk | 4 ++--
lang/gcc6-libs/buildlink3.mk | 4 ++--
lang/kali/Makefile | 6 +++---
lang/mercury/Makefile | 4 ++--
lang/openjdk7/builtin.mk | 4 +++-
lang/pforth/Makefile | 6 +++---
lang/polyml/Makefile | 4 ++--
lang/sbcl/Makefile | 8 ++++----
mail/deliver/Makefile | 6 +++---
math/mathomatic/Makefile | 4 ++--
math/minisat/Makefile | 10 +++++-----
math/mtl/Makefile | 4 ++--
math/xfractint/Makefile | 4 ++--
net/clisp-rawsock/Makefile | 4 ++--
net/nicotine/Makefile | 4 ++--
parallel/gridscheduler/Makefile | 4 ++--
parallel/openmpi/Makefile | 6 +++---
parallel/slurm/Makefile | 12 ++++++------
parallel/threadingbuildingblocks/Makefile | 18 +++++++++---------
print/poppler-includes/Makefile | 8 ++++----
print/tex-blindtext/options.mk | 6 +++---
security/munge/Makefile | 6 +++---
security/openpam/Makefile | 4 ++--
security/p5-Dancer-Plugin-Auth-RBAC/Makefile | 4 ++--
security/tacshell/Makefile | 4 ++--
time/projectlibre/Makefile | 14 +++++++-------
www/clisp-fastcgi/Makefile | 4 ++--
www/thttpd/Makefile | 4 ++--
47 files changed, 127 insertions(+), 125 deletions(-)
diffs (truncated from 936 to 300 lines):
diff -r 9d4d71afc7fc -r 077ba78a9c4d audio/rio/Makefile
--- a/audio/rio/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/audio/rio/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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 @@
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}
diff -r 9d4d71afc7fc -r 077ba78a9c4d benchmarks/skampi/Makefile
--- a/benchmarks/skampi/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/benchmarks/skampi/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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 @@
# Force file regeneration:
post-extract:
- rm $(WRKSRC)/Makefile.dep
+ rm ${WRKSRC}/Makefile.dep
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/skampi ${DESTDIR}${PREFIX}/bin/skampi
diff -r 9d4d71afc7fc -r 077ba78a9c4d biology/gabedit/DESCR
--- a/biology/gabedit/DESCR Mon Jan 01 18:14:44 2018 +0000
+++ b/biology/gabedit/DESCR Mon Jan 01 18:16:35 2018 +0000
@@ -24,7 +24,7 @@
+ 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.
diff -r 9d4d71afc7fc -r 077ba78a9c4d databases/clisp-bdb/Makefile
--- a/databases/clisp-bdb/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/databases/clisp-bdb/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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/}
diff -r 9d4d71afc7fc -r 077ba78a9c4d databases/clisp-gdbm/Makefile
--- a/databases/clisp-gdbm/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/databases/clisp-gdbm/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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/}
diff -r 9d4d71afc7fc -r 077ba78a9c4d databases/clisp-pgsql/Makefile
--- a/databases/clisp-pgsql/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/databases/clisp-pgsql/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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/}
diff -r 9d4d71afc7fc -r 077ba78a9c4d devel/clisp-pcre/Makefile
--- a/devel/clisp-pcre/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/devel/clisp-pcre/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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/}
diff -r 9d4d71afc7fc -r 077ba78a9c4d devel/clisp-syscalls/Makefile
--- a/devel/clisp-syscalls/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/devel/clisp-syscalls/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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/}
diff -r 9d4d71afc7fc -r 077ba78a9c4d devel/clisp-wildcard/Makefile
--- a/devel/clisp-wildcard/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/devel/clisp-wildcard/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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/}
diff -r 9d4d71afc7fc -r 077ba78a9c4d devel/libftdi1/Makefile
--- a/devel/libftdi1/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/devel/libftdi1/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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 @@
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
do-configure:
- (cd $(WRKSRC) ; \
+ (cd ${WRKSRC} ; \
cmake \
-DEXAMPLES:BOOL=off \
-DDOCUMENTATION:BOOL=off \
diff -r 9d4d71afc7fc -r 077ba78a9c4d devel/tcl-tclcl/Makefile
--- a/devel/tcl-tclcl/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/devel/tcl-tclcl/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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 @@
.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"
diff -r 9d4d71afc7fc -r 077ba78a9c4d graphics/gif2png/Makefile
--- a/graphics/gif2png/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/graphics/gif2png/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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 @@
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"
diff -r 9d4d71afc7fc -r 077ba78a9c4d graphics/tuxpaint/Makefile
--- a/graphics/tuxpaint/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/graphics/tuxpaint/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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+= 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
diff -r 9d4d71afc7fc -r 077ba78a9c4d lang/algol68g/Makefile
--- a/lang/algol68g/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/lang/algol68g/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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 @@
USE_LANGUAGES= c
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --docdir=$(PREFIX)/share/doc/$(PKGBASE)
+CONFIGURE_ARGS= --docdir=${PREFIX}/share/doc/${PKGBASE}
TEST_TARGET= check
diff -r 9d4d71afc7fc -r 077ba78a9c4d lang/chicken/Makefile
--- a/lang/chicken/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/lang/chicken/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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 @@
.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 -r 9d4d71afc7fc -r 077ba78a9c4d lang/clojure/Makefile
--- a/lang/clojure/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/lang/clojure/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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
diff -r 9d4d71afc7fc -r 077ba78a9c4d lang/ecl/Makefile
--- a/lang/ecl/Makefile Mon Jan 01 18:14:44 2018 +0000
+++ b/lang/ecl/Makefile Mon Jan 01 18:16:35 2018 +0000
@@ -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
diff -r 9d4d71afc7fc -r 077ba78a9c4d lang/gcc48-libs/buildlink3.mk
--- a/lang/gcc48-libs/buildlink3.mk Mon Jan 01 18:14:44 2018 +0000
+++ b/lang/gcc48-libs/buildlink3.mk Mon Jan 01 18:16:35 2018 +0000
@@ -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 @@
# 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}
Home |
Main Index |
Thread Index |
Old Index