all: replace SUBST_SED with the simpler SUBST_VARS

pkglint -Wall -r --only "substitution command" -F

With manual review and indentation fixes since pkglint doesn't get that
part correct in every case.

5 files changed, 15 insertions, 15 deletions

diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index d57e3bbe075..73c47c29dfe 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2019/05/23 19:23:01 rillig Exp $
 
 DISTNAME=	0verkill-0.16
 PKGREVISION=	1
@@ -25,7 +25,7 @@ SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fix game configuration path prefix
 SUBST_FILES.prefix=	cfg.h
-SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.prefix=	PREFIX
 
 CFLAGS.SunOS+=		-Du_int32_t=uint32_t
 
diff --git a/games/et/Makefile b/games/et/Makefile
index f927830c44a..24fd2da764c 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:01 rillig Exp $
 #
 
 DISTNAME=	et-linux-2.56-2.x86
@@ -26,8 +26,8 @@ INSTALLATION_DIRS=	bin
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/et ${WRKDIR}/etded
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	SH
 SUBST_STAGE.paths=	pre-configure
 
 pre-extract:
diff --git a/games/onscripter/Makefile b/games/onscripter/Makefile
index d23a45a4d70..37f0fdb58c0 100644
--- a/games/onscripter/Makefile
+++ b/games/onscripter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2018/03/12 11:16:35 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2019/05/23 19:23:01 rillig Exp $
 #
 
 DISTNAME=		onscripter-20161102
@@ -26,11 +26,11 @@ USE_TOOLS+=	pkg-config
 SUBST_CLASSES+=		fix
 SUBST_STAGE.fix=	pre-configure
 SUBST_FILES.fix=	${MAKE_FILE}
-SUBST_SED.fix=		-e 's!@RM@!${RM}!g'
-SUBST_SED.fix+=		-e 's!@CXX@!${CXX:Q}!g'
-SUBST_SED.fix+=		-e 's!@LD@!${LD:Q}!g'
-SUBST_SED.fix+=		-e 's!@CXXFLAGS@!${CXXFLAGS:Q}!g'
-SUBST_SED.fix+=		-e 's!@PDA_DEFS@!${PDA_DEFS:Q}!g'
+SUBST_VARS.fix=		RM
+SUBST_VARS.fix+=	CXX
+SUBST_VARS.fix+=	LD
+SUBST_VARS.fix+=	CXXFLAGS
+SUBST_VARS.fix+=	PDA_DEFS
 
 do-install:
 .for f in nsaconv nsadec onscripter sarconv sardec
diff --git a/games/polyglot/Makefile b/games/polyglot/Makefile
index 25ef2a7e98a..570fb91d8a2 100644
--- a/games/polyglot/Makefile
+++ b/games/polyglot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/06 11:54:50 asau Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/23 19:23:01 rillig Exp $
 #
 
 DISTNAME=		polyglot_14
@@ -24,7 +24,7 @@ post-extract:
 SUBST_CLASSES+=		ini
 SUBST_STAGE.ini=	post-configure
 SUBST_FILES.ini=	fruit.ini
-SUBST_SED.ini=		-e 's,@LOCALBASE@,${LOCALBASE},g'
+SUBST_VARS.ini=		LOCALBASE
 
 SRCS=		adapter.cpp attack.cpp board.cpp book.cpp book_make.cpp \
 		book_merge.cpp colour.cpp engine.cpp epd.cpp fen.cpp	\
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index dc4be7610cf..e32aefaa267 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2018/07/18 00:06:17 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2019/05/23 19:23:01 rillig Exp $
 
 DISTNAME=	xevilsrc2.02r2
 PKGNAME=	xevil-2.02
@@ -32,7 +32,7 @@ do-install:
 SUBST_CLASSES+=		uname
 SUBST_STAGE.uname=	pre-configure
 SUBST_FILES.uname=	cmn/utils.cpp
-SUBST_SED.uname=	-e 's,@UNAME@,${UNAME},g'
+SUBST_VARS.uname=	UNAME
 
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"