diff options
author | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
commit | cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5 (patch) | |
tree | dfd45506cac9c8adb60a55d809ab0dbc4d5a750e /x11 | |
parent | afe0216c35d9e0e0b96fe80eb38badf368ef84a7 (diff) | |
download | pkgsrc-cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5.tar.gz |
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.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/alacarte/Makefile | 6 | ||||
-rw-r--r-- | x11/avant-window-navigator/Makefile | 4 | ||||
-rw-r--r-- | x11/gnome-screensaver/Makefile | 4 | ||||
-rw-r--r-- | x11/kde-runtime4/Makefile | 4 | ||||
-rw-r--r-- | x11/kde-workspace4/Makefile | 4 | ||||
-rw-r--r-- | x11/kdelibs4/Makefile | 4 | ||||
-rw-r--r-- | x11/py-qt5/Makefile | 4 | ||||
-rw-r--r-- | x11/py-sip/Makefile.common | 4 | ||||
-rw-r--r-- | x11/ruby-wxruby/Makefile | 4 | ||||
-rw-r--r-- | x11/slim/Makefile | 8 | ||||
-rw-r--r-- | x11/wxGTK28/Makefile.common | 4 | ||||
-rw-r--r-- | x11/wxGTK30/Makefile | 4 | ||||
-rw-r--r-- | x11/xcolorsel/Makefile | 6 | ||||
-rw-r--r-- | x11/xpns/Makefile | 4 | ||||
-rw-r--r-- | x11/xteddy2/Makefile | 4 | ||||
-rw-r--r-- | x11/xview-clients/Makefile | 6 | ||||
-rw-r--r-- | x11/xworld/Makefile | 4 |
17 files changed, 39 insertions, 39 deletions
diff --git a/x11/alacarte/Makefile b/x11/alacarte/Makefile index 1578d29fc62..2543d4163ad 100644 --- a/x11/alacarte/Makefile +++ b/x11/alacarte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.79 2019/04/26 14:12:49 maya Exp $ +# $NetBSD: Makefile,v 1.80 2019/05/23 19:23:22 rillig Exp $ DISTNAME= alacarte-0.13.1 PKGREVISION= 43 @@ -20,8 +20,8 @@ PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # py-ORBit via py-gnome2, py-gtk2 SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= Alacarte/util.py -SUBST_SED.paths= -e "s;@PREFIX@;${PREFIX};g" -SUBST_SED.paths+= -e "s;@PKG_SYSCONFBASE@;${PKG_SYSCONFBASE};g" +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PKG_SYSCONFBASE .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile index d222c3c7ec2..18fcc11b732 100644 --- a/x11/avant-window-navigator/Makefile +++ b/x11/avant-window-navigator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2019/04/26 13:14:23 maya Exp $ +# $NetBSD: Makefile,v 1.50 2019/05/23 19:23:22 rillig Exp $ DISTNAME= avant-window-navigator-0.4.0 PKGREVISION= 34 @@ -29,7 +29,7 @@ SUBST_CLASSES+= python SUBST_STAGE.python= pre-configure SUBST_MESSAGE.python= Fixing python path SUBST_FILES.python= applet-activation/main.c -SUBST_SED.python= -e "s,@PYTHONBIN@,${PYTHONBIN}," +SUBST_VARS.python= PYTHONBIN SUBST_CLASSES+= pathfix SUBST_STAGE.pathfix= pre-configure diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index ec1b5b8e6f2..0e4110003f9 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.79 2018/11/14 22:22:40 kleink Exp $ +# $NetBSD: Makefile,v 1.80 2019/05/23 19:23:22 rillig Exp $ # DISTNAME= gnome-screensaver-2.30.2 @@ -39,7 +39,7 @@ INSTALLATION_DIRS= ${EGDIR}/pam.d SUBST_CLASSES+= flavour SUBST_STAGE.flavour= pre-install SUBST_FILES.flavour= savers/netbsd-floaters.desktop.in -SUBST_SED.flavour= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.flavour= PREFIX SUBST_MESSAGE.flavour= Preparing NetBSD flavoured screensaver post-extract: diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile index 47ad556a89d..1c236bf4a26 100644 --- a/x11/kde-runtime4/Makefile +++ b/x11/kde-runtime4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2019/04/25 07:33:30 maya Exp $ +# $NetBSD: Makefile,v 1.97 2019/05/23 19:23:22 rillig Exp $ DISTNAME= kde-runtime-15.12.0 PKGNAME= ${DISTNAME:S/-1/4-1/} @@ -51,7 +51,7 @@ SUBST_SED.htdig= -e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin: SUBST_CLASSES+= paths SUBST_FILES.paths= kioslave/info/kde-info2html.conf -SUBST_SED.paths= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_VARS.paths= LOCALBASE SUBST_STAGE.paths= pre-configure REPLACE_PERL+= \ diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile index 947089a585b..77096a835af 100644 --- a/x11/kde-workspace4/Makefile +++ b/x11/kde-workspace4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2019/04/25 07:33:30 maya Exp $ +# $NetBSD: Makefile,v 1.74 2019/05/23 19:23:22 rillig Exp $ DISTNAME= kde-workspace-4.11.22 PKGNAME= ${DISTNAME:S/-4/4-4/} @@ -86,7 +86,7 @@ CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.powerdevil.backlighthel SUBST_CLASSES+= paths SUBST_FILES.paths= kdm/kcm/main.cpp -SUBST_SED.paths= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_VARS.paths= PKG_SYSCONFDIR SUBST_STAGE.paths= pre-configure SUBST_CLASSES+= qtpath diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index e8acb43c6b0..4e8a43781ac 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2018/12/13 19:51:39 adam Exp $ +# $NetBSD: Makefile,v 1.99 2019/05/23 19:23:23 rillig Exp $ DISTNAME= kdelibs-4.14.38 PKGNAME= ${DISTNAME:S/-4/4-4/} @@ -56,7 +56,7 @@ SUBST_STAGE.kdelibsfix= pre-configure SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths. SUBST_FILES.kdelibsfix= kde3support/kdeui/k3sconfig.cpp SUBST_FILES.kdelibsfix+= kio/kssl/kopenssl.cpp -SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' +SUBST_VARS.kdelibsfix= LOCALBASE # Avoid the WRKDIR path in the installed cmake file SUBST_CLASSES+= phononrelpath diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile index 1b35f65de6c..5401f3b855e 100644 --- a/x11/py-qt5/Makefile +++ b/x11/py-qt5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/04/03 00:33:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.44 2019/05/23 19:23:23 rillig Exp $ DISTNAME= PyQt5_gpl-5.11.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/PyQt5_gpl/qt5/} @@ -39,7 +39,7 @@ SUBST_FILES.x11lib+= configure.py SUBST_FILES.x11lib+= designer/designer.pro-in SUBST_FILES.x11lib+= qmlscene/qmlscene.pro-in SUBST_SED.x11lib+= -e 's,@X11LIB@,${X11BASE}/lib,' -SUBST_SED.x11lib+= -e 's,@PREFIX@,${PREFIX},' +SUBST_VARS.x11lib= PREFIX do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ diff --git a/x11/py-sip/Makefile.common b/x11/py-sip/Makefile.common index 1a60104d66c..292f7fefa64 100644 --- a/x11/py-sip/Makefile.common +++ b/x11/py-sip/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2018/11/22 02:25:11 markd Exp $ +# $NetBSD: Makefile.common,v 1.2 2019/05/23 19:23:23 rillig Exp $ # # used by x11/py-sip/Makefile # used by x11/py-sip-qt5/Makefile @@ -57,5 +57,5 @@ BUILDLINK_TRANSFORM+= rm:-O2 SUBST_CLASSES+= pyversfx SUBST_STAGE.pyversfx= pre-configure SUBST_FILES.pyversfx= sipgen/sipgen.sbf -SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g" +SUBST_VARS.pyversfx= PYVERSSUFFIX diff --git a/x11/ruby-wxruby/Makefile b/x11/ruby-wxruby/Makefile index 83d7a5ec32e..123c2187ab6 100644 --- a/x11/ruby-wxruby/Makefile +++ b/x11/ruby-wxruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2018/11/14 22:22:50 kleink Exp $ +# $NetBSD: Makefile,v 1.31 2019/05/23 19:23:23 rillig Exp $ # DISTNAME= wxruby-2.0.1 @@ -27,7 +27,7 @@ INSTALLATION_DIRS+= ${RUBY_DOC}/wxruby ${RUBY_EG}/wxruby \ SUBST_CLASSES+= path SUBST_STAGE.path= pre-configure SUBST_FILES.path= rake/rakenetbsd.rb -SUBST_SED.path= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.path= PREFIX SUBST_MESSAGE.path= Fixing include path. pre-configure: diff --git a/x11/slim/Makefile b/x11/slim/Makefile index cf9ff7ba1c0..719ef58aff2 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/10/15 00:48:47 maya Exp $ +# $NetBSD: Makefile,v 1.4 2019/05/23 19:23:23 rillig Exp $ DISTNAME= slim-1.3.6 PKGREVISION= 2 @@ -23,9 +23,9 @@ DEPENDS+= bash-[0-9]*:../../shells/bash SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= CMakeLists.txt slim.conf -SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},' -SUBST_SED.paths+= -e 's,@X11BASE@,${X11BASE},' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PKG_SYSCONFDIR +SUBST_VARS.paths+= X11BASE CONF_FILES+= share/examples/slim/slim.conf \ ${PKG_SYSCONFDIR}/slim.conf diff --git a/x11/wxGTK28/Makefile.common b/x11/wxGTK28/Makefile.common index f7182842d23..b8c3af1a254 100644 --- a/x11/wxGTK28/Makefile.common +++ b/x11/wxGTK28/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2016/01/19 03:48:06 dbj Exp $ +# $NetBSD: Makefile.common,v 1.18 2019/05/23 19:23:23 rillig Exp $ # # used by x11/wxGTK28/Makefile # used by x11/wxGTK28-contrib/Makefile @@ -50,7 +50,7 @@ SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. SUBST_FILES.fix-paths= configure SUBST_SED.fix-paths= -e 's,/usr/pkg/include,${PREFIX}/include,g' -SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.fix-paths= PREFIX SUBST_SED.fix-paths+= -e 's,/usr/X11/,${X11BASE}/,g' pre-configure: diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index 892fdae2949..a3c5e7bf223 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2018/12/13 21:21:55 adam Exp $ +# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:23 rillig Exp $ DISTNAME= wxWidgets-3.0.4 PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK30/} @@ -47,7 +47,7 @@ SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. SUBST_FILES.fix-paths= configure SUBST_SED.fix-paths= -e 's,/usr/pkg/include,${PREFIX}/include,g' -SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.fix-paths= PREFIX .include "../../mk/bsd.prefs.mk" diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index 5bb89edbe75..28141211e29 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2015/12/29 04:54:39 dholland Exp $ +# $NetBSD: Makefile,v 1.26 2019/05/23 19:23:23 rillig Exp $ DISTNAME= xcolorsel-1.1a-src PKGNAME= xcolorsel-1.1a @@ -12,11 +12,11 @@ COMMENT= Browse and select named X colors from rgb.txt WRKSRC= ${WRKDIR}/xcolorsel USE_IMAKE= yes -SUBST_CLASSES+= xcolorsel +SUBST_CLASSES+= xcolorsel SUBST_STAGE.xcolorsel= pre-configure SUBST_MESSAGE.xcolorsel= Fixing hard-coded paths. SUBST_FILES.xcolorsel= RgbText.c -SUBST_SED.xcolorsel+= -e "s,@X11BASE@,${X11BASE},g" +SUBST_VARS.xcolorsel= X11BASE #this requires Xaw3d XAW_TYPE= 3d diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile index 3e24221b1ca..2123e9c6fd8 100644 --- a/x11/xpns/Makefile +++ b/x11/xpns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/29 05:07:18 asau Exp $ +# $NetBSD: Makefile,v 1.29 2019/05/23 19:23:24 rillig Exp $ DISTNAME= pns_source PKGNAME= xpns-1.0 @@ -18,7 +18,7 @@ BUILD_TARGET= pns SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= xpns -SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},' +SUBST_VARS.paths= PREFIX INSTALLATION_DIRS= bin lib/xpns share/doc/xpns diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile index e91486104e8..8d9c8c1523a 100644 --- a/x11/xteddy2/Makefile +++ b/x11/xteddy2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2014/09/08 21:24:45 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2019/05/23 19:23:24 rillig Exp $ DISTNAME= xteddy-2.0.1 PKGREVISION= 23 @@ -20,7 +20,7 @@ REPLACE_KSH+= xtoys SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure SUBST_FILES.prefix= configure xteddy_test xtoys -SUBST_SED.prefix= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.prefix= PREFIX .include "../../graphics/imlib/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile index 06df65b4597..7a9a516f9e1 100644 --- a/x11/xview-clients/Makefile +++ b/x11/xview-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2012/11/18 01:51:04 joerg Exp $ +# $NetBSD: Makefile,v 1.39 2019/05/23 19:23:24 rillig Exp $ DISTNAME= xview3.2p1-X11R6 PKGNAME= xview-clients-3.2.1 @@ -25,8 +25,8 @@ SUBST_CLASSES+= xvc SUBST_STAGE.xvc= pre-configure SUBST_MESSAGE.xvc= Fixing hard-coded paths. SUBST_FILES.xvc= olwm/openwin-menu-programs -SUBST_SED.xvc= -e "s,@PREFIX@,${PREFIX},g" -SUBST_SED.xvc+= -e "s,@X11BASE@,${X11BASE},g" +SUBST_VARS.xvc= PREFIX +SUBST_VARS.xvc+= X11BASE .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile index 2a59fc752f5..a36fcb0f4ba 100644 --- a/x11/xworld/Makefile +++ b/x11/xworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/10/24 10:10:21 jperkin Exp $ +# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:24 rillig Exp $ # DISTNAME= xworld-2.0 @@ -22,7 +22,7 @@ SUBST_MESSAGE.x11= Fixing x11 options. SUBST_STAGE.x11= pre-configure SUBST_FILES.x11= defaults/NetBSD/set.csh SUBST_FILES.x11+= defaults/Solaris/set.csh -SUBST_SED.x11= -e 's,@X11BASE@,${X11BASE},g' +SUBST_VARS.x11= X11BASE .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |