summaryrefslogtreecommitdiff
path: root/print
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 /print
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 'print')
-rw-r--r--print/poppler-includes/Makefile8
-rw-r--r--print/tex-blindtext/options.mk6
2 files changed, 7 insertions, 7 deletions
diff --git a/print/poppler-includes/Makefile b/print/poppler-includes/Makefile
index 390c8bf2379..c347e2acbd3 100644
--- a/print/poppler-includes/Makefile
+++ b/print/poppler-includes/Makefile
@@ -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
diff --git a/print/tex-blindtext/options.mk b/print/tex-blindtext/options.mk
index 76f1e7e10eb..1d7854dcb39 100644
--- a/print/tex-blindtext/options.mk
+++ b/print/tex-blindtext/options.mk
@@ -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