Cleanup: replace curly braces with parentheses.

6 files changed, 36 insertions, 35 deletions

diff --git a/benchmarks/filebench/Makefile b/benchmarks/filebench/Makefile
index 1ae8846fc71..6abf58fae36 100644
--- a/benchmarks/filebench/Makefile
+++ b/benchmarks/filebench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/08/27 15:40:42 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2018/01/01 01:12:10 rillig Exp $
 
 DISTNAME=	filebench-1.4.9.1
 CATEGORIES=	benchmarks
@@ -14,10 +14,10 @@ USE_TOOLS=	lex
 USE_TOOLS+=	aclocal autoconf automake
 
 pre-configure:
-	cd $(WRKSRC) && aclocal && automake -a && autoconf
+	cd ${WRKSRC} && aclocal && automake -a && autoconf
 
 post-install:
-	cd $(WRKSRC) && $(INSTALL_DATA) README $(DESTDIR)$(PREFIX)/share/$(PKGBASE)/
+	cd ${WRKSRC} && ${INSTALL_DATA} README ${DESTDIR}${PREFIX}/share/${PKGBASE}/
 
 .include "../../devel/libtecla/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/biology/gabedit/Makefile b/biology/gabedit/Makefile
index 01931a3f202..bbffb7e3213 100644
--- a/biology/gabedit/Makefile
+++ b/biology/gabedit/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2017/02/12 06:25:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2018/01/01 01:15:25 rillig Exp $
 
 PKGNAME=	gabedit-2.4.8
 PKGREVISION=	3
 DISTNAME=	GabeditSrc248
 CATEGORIES=	biology
-MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=gabedit/)
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gabedit/}
 
 MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://gabedit.sourceforge.net/
-COMMENT=	A Graphical User Interface to computational chemistry packages
+COMMENT=	Graphical User Interface to computational chemistry packages
 
 USE_TOOLS=	gmake pkg-config
 
@@ -21,10 +21,10 @@ CHECK_PORTABILITY_SKIP=	utils/Dalton/SGE/submitDalton \
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
 do-configure:
-	cd $(WRKSRC) && cp platforms/CONFIG.unix CONFIG
+	cd ${WRKSRC} && cp platforms/CONFIG.unix CONFIG
 
 do-install:
-	$(INSTALL_PROGRAM) $(WRKSRC)/gabedit $(DESTDIR)$(PREFIX)/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/gabedit ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/gtkglext/buildlink3.mk"
diff --git a/biology/mpqc/Makefile b/biology/mpqc/Makefile
index 253827ce728..ab45735bb19 100644
--- a/biology/mpqc/Makefile
+++ b/biology/mpqc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/07/09 06:37:51 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2018/01/01 01:16:43 rillig Exp $
 
 DISTNAME=	mpqc-2.3.1
 PKGREVISION=	6
@@ -13,9 +13,9 @@ COMMENT=	The Massively Parallel Quantum Chemistry Program
 USE_LANGUAGES=	c c++ fortran77
 PKGSRC_FORTRAN=	f2c # XXX force f2c for now
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-libdirs="-L${PREFIX}/lib $(COMPILER_RPATH_FLAG)$(PREFIX)/lib"	# fixme
+CONFIGURE_ARGS+=	--with-libdirs="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib"	# fixme
 #CONFIGURE_ARGS=	-without-f77	# this doesn't work out of the box
-CONFIGURE_ENV=	ac_cv_prog_WISH=$(REPLACE.wish.new)
+CONFIGURE_ENV=	ac_cv_prog_WISH=${REPLACE.wish.new}
 USE_TOOLS+=	perl:run
 USE_LIBTOOL=	yes
 
@@ -23,7 +23,7 @@ USE_TOOLS+=	gmake
 BUILD_TARGET=	default
 
 # This is strange, yet...
-INSTALL_MAKE_FLAGS=	installroot=$(DESTDIR)
+INSTALL_MAKE_FLAGS=	installroot=${DESTDIR}
 
 REPLACE_PERL=	src/bin/mpqc/ccarun.in src/bin/mpqc/mpqcrun.in
 
diff --git a/biology/plink/Makefile b/biology/plink/Makefile
index 2e5a303721b..14969bd8c03 100644
--- a/biology/plink/Makefile
+++ b/biology/plink/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2017/09/03 08:36:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/01/01 01:18:03 rillig Exp $
 
 DISTNAME=	plink-1.07-src
-PKGNAME=	$(DISTNAME:-src=)
+PKGNAME=	${DISTNAME:-src=}
 CATEGORIES=	biology
 #MASTER_SITES=	http://pngu.mgh.harvard.edu/~purcell/plink/dist/
 EXTRACT_SUFX=	.zip
@@ -29,10 +29,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/plink ${DESTDIR}${PREFIX}/bin
 
 do-test:
-	cd $(WRKSRC) && ./plink --file test
-	cd $(WRKSRC) && ./plink --file test --freq
-	cd $(WRKSRC) && ./plink --file test --assoc
-	cd $(WRKSRC) && ./plink --file test --make-bed
+	cd ${WRKSRC} && ./plink --file test
+	cd ${WRKSRC} && ./plink --file test --freq
+	cd ${WRKSRC} && ./plink --file test --assoc
+	cd ${WRKSRC} && ./plink --file test --make-bed
 
 .include "../../devel/libf2c/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/squirrelsql/Makefile b/databases/squirrelsql/Makefile
index d6e05e830af..348ad045252 100644
--- a/databases/squirrelsql/Makefile
+++ b/databases/squirrelsql/Makefile
@@ -1,37 +1,38 @@
-# $NetBSD: Makefile,v 1.5 2016/12/19 15:57:11 asau Exp $
+# $NetBSD: Makefile,v 1.6 2018/01/01 01:20:05 rillig Exp $
 
 DISTNAME=	squirrelsql-3.7-standard
 PKGNAME=	squirrelsql-3.7
 CATEGORIES=	databases
-MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=squirrel-sql/)
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrel-sql/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://www.squirrelsql.org/
-COMMENT=	A Java SQL client for any JDBC compliant database
+COMMENT=	Java SQL client for any JDBC compliant database
 
 SUBST_CLASSES+=			set-java set-base
 SUBST_STAGE.set-java=		pre-configure
 SUBST_MESSAGE.set-java=		Setting JAVA_HOME path.
 SUBST_FILES.set-java=		squirrel-sql.sh
-SUBST_SED.set-java=		-e 's,%JAVA_HOME,$(PKG_JAVA_HOME),g'
+SUBST_SED.set-java=		-e 's,%JAVA_HOME,${PKG_JAVA_HOME},g'
 
 SUBST_STAGE.set-base=		pre-configure
 SUBST_MESSAGE.set-base=		Setting package base path.
 SUBST_FILES.set-base=		squirrel-sql.sh
-SUBST_SED.set-base=		-e 's,@SQUIRREL_SQL_HOME@,$(PREFIX)/share/$(PKGBASE),g'
+SUBST_SED.set-base=		-e 's,@SQUIRREL_SQL_HOME@,${PREFIX}/share/${PKGBASE},g'
 
 USE_JAVA=	run
 USE_JAVA2=	6
 NO_BUILD=	yes
+USE_TOOLS+=	pax
 
-INSTALLATION_DIRS=	bin share/$(PKGBASE)
+INSTALLATION_DIRS=	bin share/${PKGBASE}
 
 do-install:
-	cd $(WRKSRC) && pax -rwpm . $(DESTDIR)$(PREFIX)/share/$(PKGBASE)
-	$(RM) -f $(DESTDIR)$(PREFIX)/share/$(PKGBASE)/squirrel-sql.sh.orig
-	$(CHMOD) +x $(DESTDIR)$(PREFIX)/share/$(PKGBASE)/squirrel-sql.sh
-	$(LN) -sf $(PREFIX)/share/$(PKGBASE)/squirrel-sql.sh $(DESTDIR)$(PREFIX)/bin/squirrel-sql
+	cd ${WRKSRC} && pax -rwpm . ${DESTDIR}${PREFIX}/share/${PKGBASE}
+	${RM} -f ${DESTDIR}${PREFIX}/share/${PKGBASE}/squirrel-sql.sh.orig
+	${CHMOD} +x ${DESTDIR}${PREFIX}/share/${PKGBASE}/squirrel-sql.sh
+	${LN} -sf ${PREFIX}/share/${PKGBASE}/squirrel-sql.sh ${DESTDIR}${PREFIX}/bin/squirrel-sql
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clisp/module.mk b/lang/clisp/module.mk
index 1f928617be5..8d613061d99 100644
--- a/lang/clisp/module.mk
+++ b/lang/clisp/module.mk
@@ -1,26 +1,26 @@
-# $NetBSD: module.mk,v 1.10 2016/07/16 11:48:01 asau Exp $
+# $NetBSD: module.mk,v 1.11 2018/01/01 01:10:13 rillig Exp $
 
 # Used variables:
 # CLISP_MODULE - name of module and subdirectory in "modules"
 
 CLISP_VERSION=		2.49
-DISTNAME=		clisp-$(CLISP_VERSION)
+DISTNAME=		clisp-${CLISP_VERSION}
 
-CONFIGURE_DIRS=		modules/$(CLISP_MODULE)
+CONFIGURE_DIRS=		modules/${CLISP_MODULE}
 GNU_CONFIGURE=		YES
 BUILD_TARGET=		clisp-module	# converting to "all"
 
 CONFIGURE_ENV+=		ac_install_sh="install -c"
-CONFIGURE_ENV+=		ac_aux_dir=$(PREFIX)/lib/clisp/build-aux/
+CONFIGURE_ENV+=		ac_aux_dir=${PREFIX}/lib/clisp/build-aux/
 #TEST_TARGET=		check mod-check
 
 INSTALLATION_DIRS=	lib/clisp
 
 .if !target(do-install)
 do-install:
-	$(INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/lib/clisp/dynmod
-	cd $(WRKSRC)/modules;	\
-	${SETENV} ${MAKE_ENV} ${INSTALL_ENV} sh $(LOCALBASE)/bin/clisp-link install $(CLISP_MODULE)
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/clisp/dynmod
+	cd ${WRKSRC}/modules;	\
+	${SETENV} ${MAKE_ENV} ${INSTALL_ENV} sh ${LOCALBASE}/bin/clisp-link install ${CLISP_MODULE}
 .endif
 
 .include "../../lang/clisp/buildlink3.mk"