Fixed pkglint warnings.

4 files changed, 38 insertions, 38 deletions

diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile
index b388c4eefb3..687b5acbb88 100644
--- a/lang/abcl/Makefile
+++ b/lang/abcl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2016/10/25 17:41:16 asau Exp $
+# $NetBSD: Makefile,v 1.9 2016/12/17 13:38:02 rillig Exp $
 
 DISTNAME=	abcl-src-1.4.0
-PKGNAME=	$(DISTNAME:C/-src//)
+PKGNAME=	${DISTNAME:C/-src//}
 CATEGORIES=	lang
-MASTER_SITES=	http://abcl.org/releases/$(PKGVERSION_NOREV)/
+MASTER_SITES=	http://abcl.org/releases/${PKGVERSION_NOREV}/
 
 MAINTAINER=	asau@NetBSD.org
 HOMEPAGE=	http://abcl.org/
@@ -14,20 +14,20 @@ BUILD_DEPENDS=	apache-ant>=1.7.1:../../devel/apache-ant
 INSTALLATION_DIRS=	bin lib/abcl
 
 do-build:
-	$(RUN)$(_ULIMIT_CMD) cd $(WRKSRC) && \
-	  $(PKGSRC_SETENV) $(MAKE_ENV) \
-	    ant -nouserlib -Dabcl.runtime.jar.path=$(PREFIX)/lib/abcl/abcl.jar
+	${RUN}${_ULIMIT_CMD} cd ${WRKSRC} && \
+	  ${PKGSRC_SETENV} ${MAKE_ENV} \
+	    ant -nouserlib -Dabcl.runtime.jar.path=${PREFIX}/lib/abcl/abcl.jar
 
 do-install:
-	$(INSTALL_SCRIPT) $(WRKSRC)/abcl $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL_DATA) $(WRKSRC)/dist/abcl.jar $(DESTDIR)$(PREFIX)/lib/abcl
-	$(INSTALL_DATA) $(WRKSRC)/dist/abcl-contrib.jar $(DESTDIR)$(PREFIX)/lib/abcl
+	${INSTALL_SCRIPT} ${WRKSRC}/abcl ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/dist/abcl.jar ${DESTDIR}${PREFIX}/lib/abcl
+	${INSTALL_DATA} ${WRKSRC}/dist/abcl-contrib.jar ${DESTDIR}${PREFIX}/lib/abcl
 
 # TODO: requires network connectivity to fetch dependencies (e.g. JUnit)
 do-test:
-	$(RUN)$(_ULIMIT_CMD) cd $(WRKSRC) && \
-	  $(PKGSRC_SETENV) $(MAKE_ENV) \
-	    ant -nouserlib -Dabcl.runtime.jar.path=$(PREFIX)/lib/abcl/abcl.jar abcl.test
+	${RUN}${_ULIMIT_CMD} cd ${WRKSRC} && \
+	  ${PKGSRC_SETENV} ${MAKE_ENV} \
+	    ant -nouserlib -Dabcl.runtime.jar.path=${PREFIX}/lib/abcl/abcl.jar abcl.test
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/maude/Makefile b/lang/maude/Makefile
index 454b9cd9b0e..9904d0d7342 100644
--- a/lang/maude/Makefile
+++ b/lang/maude/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/10/02 20:11:45 asau Exp $
+# $NetBSD: Makefile,v 1.26 2016/12/17 13:38:55 rillig Exp $
 #
 
 DISTNAME=	Maude-2.6
@@ -15,14 +15,14 @@ LICENSE=	gnu-gpl-v2
 MAKE_JOBS_SAFE=		no
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=$(PREFIX)/share/$(PKGBASE)
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share/${PKGBASE}
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	flex bison
 TEST_TARGET=	check
 
 post-install:
-	cd $(WRKSRC)/src/Main && $(INSTALL_DATA) *.maude \
-		$(DESTDIR)$(PREFIX)/share/$(PKGBASE)
+	cd ${WRKSRC}/src/Main && ${INSTALL_DATA} *.maude \
+		${DESTDIR}${PREFIX}/share/${PKGBASE}
 
 .include "../../devel/buddy/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index 2c47ddb5dd0..1de7be80be3 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.54 2016/12/12 12:08:57 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2016/12/17 13:39:41 rillig Exp $
 
 PKGNAME=	racket-6.7
-DISTNAME=	$(PKGNAME_NOREV)-src
+DISTNAME=	${PKGNAME_NOREV}-src
 CATEGORIES=	lang
-MASTER_SITES_PLT=	http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)/ \
-		http://www.eecs.northwestern.edu/racket/$(PKGVERSION_NOREV)/ \
-		http://www.cs.utah.edu/plt/installers/$(PKGVERSION_NOREV)/ \
-		http://mirror.informatik.uni-tuebingen.de/mirror/racket/$(PKGVERSION_NOREV)/ \
-		ftp://infogroep.be/pub/racket/installers/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT=	http://download.racket-lang.org/installers/${PKGVERSION_NOREV}/ \
+		http://www.eecs.northwestern.edu/racket/${PKGVERSION_NOREV}/ \
+		http://www.cs.utah.edu/plt/installers/${PKGVERSION_NOREV}/ \
+		http://mirror.informatik.uni-tuebingen.de/mirror/racket/${PKGVERSION_NOREV}/ \
+		ftp://infogroep.be/pub/racket/installers/${PKGVERSION_NOREV}/
 # Pre-release:
 #MASTER_SITES_PLT=	http://pre-release.racket-lang.org/installers/
-MASTER_SITES=	$(MASTER_SITES_PLT)
+MASTER_SITES=	${MASTER_SITES_PLT}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	asau@inbox.ru
@@ -20,7 +20,7 @@ LICENSE=	gnu-lgpl-v2
 
 CONFLICTS+=	drscheme-[0-9]* mzscheme-[0-9]* racket-textual-[0-9]*
 
-WRKSRC=		$(WRKDIR)/$(PKGNAME_NOREV)
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_DIRS=	src
@@ -47,8 +47,8 @@ REPLACE_RACKET+=	share/pkgs/racket-doc/ffi/examples/${f}
 
 REPLACE_INTERPRETER+=	racket
 REPLACE.racket.old=	.*racket
-REPLACE.racket.new=	$(LOCALBASE)/bin/racket
-REPLACE_FILES.racket=	$(REPLACE_RACKET)
+REPLACE.racket.new=	${LOCALBASE}/bin/racket
+REPLACE_FILES.racket=	${REPLACE_RACKET}
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 5d3d7ec02cd..a977bfdcc2c 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.49 2016/10/03 07:57:24 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2016/12/17 13:40:33 rillig Exp $
 
 SQUEAK_VERSION=	4.5
 IMAGE_VERSION=  13680
 SQUEAK_SOURCES=	SqueakV41.sources
 
-DISTNAME=	Squeak$(SQUEAK_VERSION)-$(IMAGE_VERSION)
-PKGNAME=	squeak-$(SQUEAK_VERSION)
+DISTNAME=	Squeak${SQUEAK_VERSION}-${IMAGE_VERSION}
+PKGNAME=	squeak-${SQUEAK_VERSION}
 CATEGORIES=	lang
-MASTER_SITES=	http://ftp.squeak.org/$(SQUEAK_VERSION)/
+MASTER_SITES=	http://ftp.squeak.org/${SQUEAK_VERSION}/
 EXTRACT_SUFX=	.zip
-DISTFILES=	${DEFAULT_DISTFILES} $(SQUEAK_SOURCES).gz
+DISTFILES=	${DEFAULT_DISTFILES} ${SQUEAK_SOURCES}.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://squeak.org/
@@ -21,16 +21,16 @@ DEPENDS=	squeak-vm-[0-9]*:../../lang/squeak-vm
 DIST_SUBDIR=	squeak
 USE_TOOLS+=	gzip unzip
 NO_BUILD=	yes
-PLIST_SUBST+=	IMAGE_VERSION=$(IMAGE_VERSION)
+PLIST_SUBST+=	IMAGE_VERSION=${IMAGE_VERSION}
 
-INSTALLATION_DIRS=	share/squeak/$(SQUEAK_VERSION)
+INSTALLATION_DIRS=	share/squeak/${SQUEAK_VERSION}
 
 post-extract:
-	$(GZIP_CMD) -dc $(DISTDIR)/$(DIST_SUBDIR)/$(SQUEAK_SOURCES).gz > $(WRKDIR)/$(SQUEAK_SOURCES)
+	${GZIP_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SOURCES}.gz > ${WRKDIR}/${SQUEAK_SOURCES}
 
 do-install:
-	$(INSTALL_DATA) $(WRKDIR)/$(DISTNAME:=.image) $(DESTDIR)$(PREFIX)/share/squeak/$(SQUEAK_VERSION)/
-	$(INSTALL_DATA) $(WRKDIR)/$(DISTNAME:=.changes) $(DESTDIR)$(PREFIX)/share/squeak/$(SQUEAK_VERSION)/
-	$(INSTALL_DATA) $(WRKDIR)/$(SQUEAK_SOURCES) $(DESTDIR)$(PREFIX)/share/squeak/$(SQUEAK_VERSION)/$(SQUEAK_SOURCES)
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME:=.image} ${DESTDIR}${PREFIX}/share/squeak/${SQUEAK_VERSION}/
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME:=.changes} ${DESTDIR}${PREFIX}/share/squeak/${SQUEAK_VERSION}/
+	${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SOURCES} ${DESTDIR}${PREFIX}/share/squeak/${SQUEAK_VERSION}/${SQUEAK_SOURCES}
 
 .include "../../mk/bsd.pkg.mk"