From cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5 Mon Sep 17 00:00:00 2001 From: rillig Date: Thu, 23 May 2019 19:22:54 +0000 Subject: 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. --- wm/awesome/Makefile | 4 ++-- wm/compiz/Makefile | 4 ++-- wm/enlightenment/Makefile | 8 ++++---- wm/fvwm-devel/Makefile | 4 ++-- wm/golem/Makefile | 4 ++-- wm/larswm/Makefile | 4 ++-- wm/mlvwm/Makefile | 4 ++-- wm/musca/Makefile | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'wm') diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile index 5084ecb45b9..246397e0b8a 100644 --- a/wm/awesome/Makefile +++ b/wm/awesome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2018/11/14 22:22:32 kleink Exp $ +# $NetBSD: Makefile,v 1.66 2019/05/23 19:23:18 rillig Exp $ DISTNAME= awesome-4.2 PKGREVISION= 5 @@ -44,7 +44,7 @@ SUBST_MESSAGE.lua= Fixing lua prefix SUBST_STAGE.lua= pre-configure SUBST_FILES.lua= CMakeLists.txt awesomeConfig.cmake build-utils/lgi-check.sh \ tests/examples/CMakeLists.txt -SUBST_SED.lua= -e "s,@LUA_INTERPRETER@,${LUA_INTERPRETER}," +SUBST_VARS.lua= LUA_INTERPRETER SUBST_CLASSES+= ldoc SUBST_MESSAGE.ldoc= Fixing ldoc executable diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile index f31bbe3118d..b672e0ca515 100644 --- a/wm/compiz/Makefile +++ b/wm/compiz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.116 2019/05/05 22:49:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.117 2019/05/23 19:23:18 rillig Exp $ # PKGVER= 0.8.8 @@ -58,7 +58,7 @@ PKGCONFIG_OVERRIDE+= libdecoration/libdecoration.pc.in SUBST_CLASSES+= paths SUBST_FILES.paths= metadata/decoration.xml.in -SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX SUBST_STAGE.paths= pre-configure .include "options.mk" diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index 04a774b9145..e2e9069169e 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2018/08/22 09:47:21 wiz Exp $ +# $NetBSD: Makefile,v 1.70 2019/05/23 19:23:19 rillig Exp $ DISTNAME= e16-0.16.8.8 PKGNAME= ${DISTNAME:S/e16/enlightenment/} @@ -32,9 +32,9 @@ REPLACE_PERL+= scripts/e_gen_menu SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= scripts/e_gen_menu -SUBST_SED.paths= -e 's,@LOCALBASE@,${LOCALBASE},g' -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@X11BASE@,${X11BASE},g' +SUBST_VARS.paths= LOCALBASE +SUBST_VARS.paths+= PREFIX +SUBST_VARS.paths+= X11BASE PLIST_VARS+= libhack diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile index 33e7807bcc7..c3af6c472d2 100644 --- a/wm/fvwm-devel/Makefile +++ b/wm/fvwm-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2018/08/22 09:47:21 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2019/05/23 19:23:19 rillig Exp $ DISTNAME= fvwm-${FVWM_VER} PKGREVISION= 13 @@ -51,7 +51,7 @@ SUBST_CLASSES+= mail SUBST_STAGE.mail= pre-configure SUBST_MESSAGE.mail= Fixing mail address SUBST_FILES.mail+= bin/fvwm-bug.in -SUBST_SED.mail= -e "s|@MAINTAINER@|${MAINTAINER}|" +SUBST_VARS.mail= MAINTAINER post-install: cd ${WRKSRC}/sample.fvwmrc && ${INSTALL_DATA} \ diff --git a/wm/golem/Makefile b/wm/golem/Makefile index 8702c430d40..8ed6edf549c 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:40 jperkin Exp $ +# $NetBSD: Makefile,v 1.34 2019/05/23 19:23:19 rillig Exp $ # DISTNAME= golem-0.0.5 @@ -41,7 +41,7 @@ CONF_FILES= ${EGDIR}/golemrc.default ${PKG_SYSCONFDIR}/golemrc SUBST_CLASSES+= paths SUBST_FILES.paths= sample.golem/golemrc -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX SUBST_STAGE.paths= pre-configure INSTALLATION_DIRS= ${EGDIR} diff --git a/wm/larswm/Makefile b/wm/larswm/Makefile index e566339565e..3a1a216d9d0 100644 --- a/wm/larswm/Makefile +++ b/wm/larswm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:40 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2019/05/23 19:23:19 rillig Exp $ # DISTNAME= larswm-7.5.3 @@ -26,7 +26,7 @@ CPPFLAGS+= -DPKG_SYSCONFDIR=\"${PKG_SYSCONFDIR:Q}\" SUBST_CLASSES+= paths SUBST_FILES.paths= larswm.man -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_VARS.paths= PKG_SYSCONFDIR SUBST_STAGE.paths= pre-configure INSTALLATION_DIRS= share/doc/larswm share/examples/larswm diff --git a/wm/mlvwm/Makefile b/wm/mlvwm/Makefile index 19123041e86..8ac02e894c2 100644 --- a/wm/mlvwm/Makefile +++ b/wm/mlvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 10:24:14 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/05/23 19:23:19 rillig Exp $ # DISTNAME= mlvwm091 @@ -28,7 +28,7 @@ post-install: SUBST_CLASSES+= xpm SUBST_STAGE.xpm= post-configure SUBST_FILES.xpm= sample_rc/Mlvwmrc -SUBST_SED.xpm= -e "s,@PREFIX@,${PREFIX}," +SUBST_VARS.xpm= PREFIX SUBST_MESSAGE.xpm= Fixing configuration file. .include "../../x11/libXext/buildlink3.mk" diff --git a/wm/musca/Makefile b/wm/musca/Makefile index acbe4f8e660..158b557e358 100644 --- a/wm/musca/Makefile +++ b/wm/musca/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:32 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/05/23 19:23:19 rillig Exp $ DISTNAME= musca-0.9.24 PKGREVISION= 2 @@ -19,7 +19,7 @@ SUBST_CLASSES+= makefile SUBST_STAGE.makefile= pre-build SUBST_MESSAGE.makefile= Fixing Makefile SUBST_FILES.makefile= Makefile -SUBST_SED.makefile+= -e 's,@X11BASE@,${X11BASE},g' +SUBST_VARS.makefile= X11BASE do-install: ${INSTALL_PROGRAM} ${WRKSRC}/apis ${DESTDIR}${PREFIX}/bin -- cgit v1.2.3