 @@ -1,36 +1,36 @@
-# $NetBSD: Makefile,v 1.23 2020/05/06 14:04:31 adam Exp $
+# $NetBSD: Makefile,v 1.24 2020/05/16 12:43:10 rillig Exp $
 DISTNAME=	bastet-0.43.2
 PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fph/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://fph.altervista.org/prog/bastet.html
 COMMENT=	Bastard Tetris
 LICENSE=	gnu-gpl-v3
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 BUILD_DEFS+=	VARBASE
 USE_GAMESGROUP=		yes
 SPECIAL_PERMS=		bin/bastet ${SETGID_GAMES_PERMS}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 SUBST_CLASSES+=		vardir
 SUBST_STAGE.vardir=	pre-configure
 SUBST_FILES.vardir=	Config.cpp
 SUBST_MESSAGE.vardir=	Fixing VARBASE.
-SUBST_SED.vardir=	-e "s|/var/games|${VARBASE}/games|1"
+SUBST_SED.vardir=	-e "s|/var/games|${VARBASE}/games|"
 REQD_FILES_PERMS+=	/dev/null ${VARBASE}/games/bastet.scores2 ${GAMEDATA_PERMS}
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bastet ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/bastet.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,15 +1,15 @@
 #! /usr/bin/awk -f
-# $NetBSD: subst-identity.awk,v 1.3 2020/05/11 19:52:14 rillig Exp $
+# $NetBSD: subst-identity.awk,v 1.4 2020/05/16 12:43:10 rillig Exp $
+#
 # Tests whether a sed(1) command line consists of only identity substitutions
 # like s,id,id,.
+#
 # See SUBST_NOOP_OK and regress/infra-unittests/subst.sh.
+#
 # Returns the first character of the given regular expression,
 # if it is a single-character regular expression.
 function identity_char(s, sep, i) {
 	if (s ~ /^[\t -~]/ && s !~ /^[$&*.\[\\\]^]/)
 		return substr(s, 1, 1);
 	if (s ~ /^\\[$*.\[\]^]/)
 @@ -35,26 +35,26 @@ function is_identity_subst(s,   len, i,
 	while (i < len && substr(s, i, 1) != sep) {
 		ch = identity_char(substr(s, i), sep, i);
 		if (ch == "")
 			break;
 		pat_to = pat_to substr(ch, 1, 1);
 		i += length(ch);
+	}
 	if (pat_to == "")
 		return 0; # only for GNU Awk 5.0.1 in -Lfatal mode
 	pat_from = substr(s, 3, i - 3);
 	subst = "s" sep pat_from sep pat_to sep;
-	return s == subst || s == subst "g";
+	return s == subst || s == subst "g" || s == subst "1";
+}
 function main(   i) {
 	for (i = 1; i + 1 < ARGC; i += 2)
 		if (ARGV[i] != "-e" || !is_identity_subst(ARGV[i + 1]))
 			return 0;
 	return i == ARGC && ARGC > 1;
+}
 BEGIN {
 	exit(main() ? 0 : 1);
+}

 @@ -1,15 +1,15 @@
 #! /bin/sh
-# $NetBSD: subst.sh,v 1.40 2020/05/12 05:34:04 rillig Exp $
+# $NetBSD: subst.sh,v 1.41 2020/05/16 12:43:10 rillig Exp $
+#
 # Tests for mk/subst.mk.
+#
 set -eu
 . './test.subr'
 test_case_set_up() {
 	wrkdir="$tmpdir/wrkdir"
 	mkdir "$wrkdir"
 	create_file 'prepare-subst.mk' <<-EOF
 @@ -1182,26 +1182,29 @@ if test_case_begin 'identity substitutio
 	# Since a regular expression with a subexpression must contain
 	# \( and \), it does not count as an identity substitution anyway,
 	# which makes the implementation simple.
 	assert_identity 'no'	-e 's,aaa\(aaa$\),aaa\(aaa$\),'
 	assert_identity 'yes'	-e 's,$a,$a,'
 	assert_identity 'no'	-e 's,a$,a$,'
 	# Same for the circumflex.
 	assert_identity 'yes'	-e 's,a^,a^,'
 	assert_identity 'no'	-e 's,^a,^a,'
 	assert_identity 'no'	-e 's,\(^aaa\)aaa,\(^aaa\)aaa,'
 	# Seen in games/bastet before 2020-05-16.
 	assert_identity 'yes'	-e 's,a,a,1'
 	test_case_end
 fi
 if test_case_begin 'identity substitution, found in file'; then
 	# There are many situations in which a fixed text is replaced
 	# with a dynamic value that may or may not be equal to the
 	# original text.
+	#
 	# Typical examples are s|man|${PKGMANDIR}|, s|/usr/pkg|${PREFIX}|,
 	# s|/dev/audio|${DEVOSSAUDIO}|.
+	#