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 | |
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.
242 files changed, 728 insertions, 728 deletions
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile index 758976d368e..0ceb094cb9d 100644 --- a/archivers/freeze/Makefile +++ b/archivers/freeze/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2018/07/04 13:40:07 jperkin Exp $ +# $NetBSD: Makefile,v 1.28 2019/05/23 19:22:54 rillig Exp $ DISTNAME= freeze-2.5 PKGREVISION= 3 @@ -21,6 +21,6 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 SUBST_CLASSES+= freeze SUBST_STAGE.freeze= pre-configure SUBST_FILES.freeze= *.1 -SUBST_SED.freeze= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.freeze= PREFIX .include "../../mk/bsd.pkg.mk" diff --git a/archivers/ruby-xz/Makefile b/archivers/ruby-xz/Makefile index b777ddc7030..f68b1ec048c 100644 --- a/archivers/ruby-xz/Makefile +++ b/archivers/ruby-xz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/04/15 06:11:32 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/05/23 19:22:55 rillig Exp $ DISTNAME= ruby-xz-1.0.0 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//} @@ -16,7 +16,7 @@ RUBY_VERSIONS_ACCEPTED= 24 25 26 SUBST_CLASSES+= path SUBST_STAGE.path= pre-configure SUBST_FILES.path= lib/xz/lib_lzma.rb -SUBST_SED.path+= -e "s,@LOCALBASE@,${LOCALBASE},g" +SUBST_VARS.path= LOCALBASE SUBST_SED.path+= -e "s,@SHLIB_EXT@,${RUBY_SLEXT},g" .include "../../lang/ruby/gem.mk" diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile index 1a7e44a1337..d90825e4462 100644 --- a/audio/ampache/Makefile +++ b/audio/ampache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2017/03/12 07:20:51 maya Exp $ +# $NetBSD: Makefile,v 1.16 2019/05/23 19:22:55 rillig Exp $ # DISTNAME= ampache-3.5.3 @@ -32,7 +32,7 @@ FILES_SUBST+= INSTDIR=${INSTDIR:Q} SUBST_CLASSES+= files SUBST_STAGE.files= do-configure SUBST_FILES.files= ampache.conf -SUBST_SED.files= -e "s|@INSTDIR@|${INSTDIR}|g" +SUBST_VARS.files= INSTDIR SUBST_MESSAGE.files= Substituting paths into apache config fragment CONF_FILES= ${EGDIR}/ampache.conf \ diff --git a/audio/juke/Makefile b/audio/juke/Makefile index 523474257ea..ad971e28b1e 100644 --- a/audio/juke/Makefile +++ b/audio/juke/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/23 19:22:55 rillig Exp $ # DISTNAME= juke-0.7 @@ -21,7 +21,7 @@ CONF_FILES= ${EGDIR}/juke.conf.default ${PKG_SYSCONFDIR}/juke.conf SUBST_CLASSES+= paths SUBST_FILES.paths= doc/juke.1 MANUAL src/conf.c SUBST_STAGE.paths= pre-configure -SUBST_SED.paths= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},' +SUBST_VARS.paths= PKG_SYSCONFDIR INSTALLATION_DIRS= ${EGDIR} share/doc/juke diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile index f008bcee04e..2b4ef34f0ae 100644 --- a/audio/mt-daapd/Makefile +++ b/audio/mt-daapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:09 jperkin Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/23 19:22:55 rillig Exp $ DISTNAME= mt-daapd-0.2.4.2 PKGREVISION= 5 @@ -41,10 +41,10 @@ OWN_DIRS_PERMS= ${VARBASE}/cache/mt-daapd \ SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure SUBST_FILES.conf= contrib/mt-daapd.conf -SUBST_SED.conf= -e "s,@PREFIX@,${PREFIX}," -SUBST_SED.conf+= -e "s,@VARBASE@,${VARBASE},g" -SUBST_SED.conf+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR}," -SUBST_SED.conf+= -e "s,@MTDAAPD_USER@,${MTDAAPD_USER}," +SUBST_VARS.conf= PREFIX +SUBST_VARS.conf+= VARBASE +SUBST_VARS.conf+= PKG_SYSCONFDIR +SUBST_VARS.conf+= MTDAAPD_USER SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing hardcoded paths. diff --git a/audio/nas/Makefile b/audio/nas/Makefile index 9ef313ec8f6..ec10e4ae666 100644 --- a/audio/nas/Makefile +++ b/audio/nas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2017/11/13 12:23:36 khorben Exp $ +# $NetBSD: Makefile,v 1.98 2019/05/23 19:22:55 rillig Exp $ DISTNAME= nas-1.9.4.src PKGNAME= ${DISTNAME:S/.src//} @@ -27,12 +27,12 @@ PKG_SYSCONFSUBDIR= nas SUBST_CLASSES+= sysconf SUBST_STAGE.sysconf= pre-configure SUBST_FILES.sysconf= config/NetAudio.def -SUBST_SED.sysconf= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.sysconf= PKG_SYSCONFDIR SUBST_CLASSES+= ossaudio SUBST_STAGE.ossaudio= pre-configure SUBST_FILES.ossaudio= server/nasd.conf.eg server/dda/voxware/auvoxware.c -SUBST_SED.ossaudio= -e "s|@DEVOSSAUDIO@|${DEVOSSAUDIO}|g" +SUBST_VARS.ossaudio= DEVOSSAUDIO SUBST_CLASSES+= mungeman SUBST_STAGE.mungeman= pre-configure diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile index a85694308d8..8d72ccc86d3 100644 --- a/audio/solfege/Makefile +++ b/audio/solfege/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2019/04/26 13:13:43 maya Exp $ +# $NetBSD: Makefile,v 1.67 2019/05/23 19:22:55 rillig Exp $ DISTNAME= solfege-3.14.1 PKGREVISION= 32 @@ -32,10 +32,10 @@ PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # py-gtk2 SUBST_CLASSES+= sound SUBST_STAGE.sound= do-configure SUBST_FILES.sound= default.config -SUBST_SED.sound= -e 's|@WAVPLAYER@|${WAVPLAYER}|g' -SUBST_SED.sound+= -e 's|@MIDIPLAYER@|${MIDIPLAYER}|g' -SUBST_SED.sound+= -e 's|@MP3PLAYER@|${MP3PLAYER}|g' -SUBST_SED.sound+= -e 's|@OGGPLAYER@|${OGGPLAYER}|g' +SUBST_VARS.sound= WAVPLAYER +SUBST_VARS.sound+= MIDIPLAYER +SUBST_VARS.sound+= MP3PLAYER +SUBST_VARS.sound+= OGGPLAYER SUBST_MESSAGE.sound= Setting default audio player. EGDIR= ${PREFIX}/share/examples/solfege diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile index 079234d4305..9fa3937a9cc 100644 --- a/benchmarks/hbench/Makefile +++ b/benchmarks/hbench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2018/08/22 09:42:58 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2019/05/23 19:22:55 rillig Exp $ DISTNAME= hbench-OS-1.1 PKGNAME= hbench-1.1 @@ -43,8 +43,8 @@ SUBST_MESSAGE.hb= Replacing bin with libexec. SUBST_FILES.hb= do-install SUBST_FILES.hb+= scripts/* SUBST_FILES.hb+= Results/Makefile -SUBST_SED.hb= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.hb+= -e 's,/bin/hbench,/libexec/hbench,g' +SUBST_VARS.hb= PREFIX +SUBST_SED.hb= -e 's,/bin/hbench,/libexec/hbench,g' INSTALLATION_DIRS= bin diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 63f3d281a75..f2c6574771b 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2018/07/27 14:12:41 plunky Exp $ +# $NetBSD: Makefile,v 1.73 2019/05/23 19:22:55 rillig Exp $ # DISTNAME= qcad-3.21.2.3 @@ -27,7 +27,7 @@ SUBST_MESSAGE.paths= Attending to hard-coded paths. SUBST_FILES.paths+= shared.pri src/core/RS.cpp src/core/RSettings.cpp SUBST_FILES.paths+= scripts/Help/ShowReadme/ShowReadme.js SUBST_FILES.paths+= scripts/Widgets/LibraryBrowser/LibraryBrowser.js -SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX AUTO_MKDIRS= yes diff --git a/chat/anope/Makefile b/chat/anope/Makefile index 6b2476a584d..abbaa30b396 100644 --- a/chat/anope/Makefile +++ b/chat/anope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/05/03 11:05:10 nia Exp $ +# $NetBSD: Makefile,v 1.26 2019/05/23 19:22:55 rillig Exp $ DISTNAME= anope-2.0.6-source PKGNAME= ${DISTNAME:S/-source//} @@ -48,9 +48,9 @@ SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure SUBST_MESSAGE.conf= Set variables in configuration file. SUBST_FILES.conf+= data/example.conf -SUBST_SED.conf+= -e "s,@PREFIX@,${PREFIX},g" -SUBST_SED.conf+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g" -SUBST_SED.conf+= -e "s,@PKGLOCALEDIR@,${PKGLOCALEDIR},g" +SUBST_VARS.conf= PREFIX +SUBST_VARS.conf+= PKG_SYSCONFDIR +SUBST_VARS.conf+= PKGLOCALEDIR RCD_SCRIPTS= anope diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile index b725410f8c6..25709ae533b 100644 --- a/chat/bitchx/Makefile +++ b/chat/bitchx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2018/07/04 13:40:10 jperkin Exp $ +# $NetBSD: Makefile,v 1.60 2019/05/23 19:22:56 rillig Exp $ DISTNAME= bitchx-1.2.1 PKGREVISION= 1 @@ -22,7 +22,7 @@ CFLAGS.Darwin+= -DBIND_8_COMPAT SUBST_CLASSES+= manpage SUBST_STAGE.manpage= pre-configure SUBST_FILES.manpage+= doc/BitchX.1 -SUBST_SED.manpage+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.manpage= PREFIX .include "../../archivers/bzip2/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/chat/inspircd/Makefile b/chat/inspircd/Makefile index 0b258a13309..29b499105ee 100644 --- a/chat/inspircd/Makefile +++ b/chat/inspircd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2019/04/03 00:32:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.64 2019/05/23 19:22:56 rillig Exp $ DISTNAME= inspircd-2.0.27 PKGREVISION= 2 @@ -60,8 +60,8 @@ SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure SUBST_MESSAGE.conf= Set variables in configuration file. SUBST_FILES.conf+= conf/inspircd.conf -SUBST_SED.conf+= -e "s,@PREFIX@,${PREFIX},g" -SUBST_SED.conf+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g" +SUBST_VARS.conf= PREFIX +SUBST_VARS.conf+= PKG_SYSCONFDIR INSTALLATION_DIRS+= ${EGDIR} diff --git a/chat/psybnc/Makefile b/chat/psybnc/Makefile index e521dab2932..e160fe4f980 100644 --- a/chat/psybnc/Makefile +++ b/chat/psybnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:10 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2019/05/23 19:22:56 rillig Exp $ # DISTNAME= psyBNC-2.4BETA2 @@ -27,7 +27,7 @@ CONF_FILES= share/examples/psybnc/psybnc.conf \ SUBST_CLASSES+= prefix SUBST_FILES.prefix= tools/autoconf.c -SUBST_SED.prefix= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.prefix= PREFIX SUBST_STAGE.prefix= pre-configure SUBST_CLASSES+= openssl diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index b2526b2c69b..60779672cb8 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2018/07/04 13:40:11 jperkin Exp $ +# $NetBSD: Makefile,v 1.70 2019/05/23 19:22:56 rillig Exp $ DISTNAME= silc-server-1.1.18 PKGREVISION= 2 @@ -66,7 +66,7 @@ OWN_DIRS_PERMS+= ${VARBASE}/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700 SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= motd.txt -SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},' +SUBST_VARS.paths= PREFIX post-extract: ${CP} ${FILESDIR}/motd.txt ${WRKSRC} diff --git a/chat/spectrum/Makefile b/chat/spectrum/Makefile index 0afd9b1de4e..2cafc04555d 100644 --- a/chat/spectrum/Makefile +++ b/chat/spectrum/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2019/05/05 22:49:46 ryoon Exp $ +# $NetBSD: Makefile,v 1.81 2019/05/23 19:22:56 rillig Exp $ DISTNAME= spectrum-1.4.8 PKGREVISION= 53 @@ -68,7 +68,7 @@ SUBST_CLASSES+= manpath SUBST_STAGE.manpath= pre-configure SUBST_FILES.manpath= CMakeLists.txt SUBST_MESSAGE.manpath= Correcting man page directory -SUBST_SED.manpath+= -e 's,@PKGMANDIR@,${PKGMANDIR},g' +SUBST_VARS.manpath= PKGMANDIR SUBST_CLASSES+= users SUBST_STAGE.users= pre-configure diff --git a/comms/asterisk/options.mk b/comms/asterisk/options.mk index 7b9bd65c349..4e7dec4f1ee 100644 --- a/comms/asterisk/options.mk +++ b/comms/asterisk/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2018/07/04 13:40:11 jperkin Exp $ +# $NetBSD: options.mk,v 1.10 2019/05/23 19:22:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp @@ -80,8 +80,8 @@ DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI SUBST_CLASSES+= webvmail SUBST_STAGE.webvmail= pre-configure SUBST_FILES.webvmail= contrib/scripts/vmail.cgi -SUBST_SED.webvmail+= -e 's|@ASTETCDIR@|${ASTETCDIR}|' -SUBST_SED.webvmail+= -e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|" +SUBST_VARS.webvmail= ASTETCDIR +SUBST_VARS.webvmail+= ASTSPOOLDIR INSTALLATION_DIRS+= ${PREFIX}/libexec/cgi-bin ${PREFIX}/share/httpd/htdocs SPECIAL_PERMS+= ${PREFIX}/libexec/cgi-bin/vmail ${ASTERISK_USER} ${ASTERISK_GROUP} 04555 INSTALL_TARGET+= webvmail diff --git a/comms/asterisk13/options.mk b/comms/asterisk13/options.mk index fcd716bb551..c3943016ee4 100644 --- a/comms/asterisk13/options.mk +++ b/comms/asterisk13/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2018/07/04 13:40:11 jperkin Exp $ +# $NetBSD: options.mk,v 1.4 2019/05/23 19:22:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp @@ -80,8 +80,8 @@ DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI SUBST_CLASSES+= webvmail SUBST_STAGE.webvmail= pre-configure SUBST_FILES.webvmail= contrib/scripts/vmail.cgi -SUBST_SED.webvmail+= -e 's|@ASTETCDIR@|${ASTETCDIR}|' -SUBST_SED.webvmail+= -e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|" +SUBST_VARS.webvmail= ASTETCDIR +SUBST_VARS.webvmail+= ASTSPOOLDIR INSTALLATION_DIRS+= ${PREFIX}/libexec/cgi-bin ${PREFIX}/share/httpd/htdocs SPECIAL_PERMS+= ${PREFIX}/libexec/cgi-bin/vmail ${ASTERISK_USER} ${ASTERISK_GROUP} 04555 INSTALL_TARGET+= webvmail diff --git a/comms/asterisk14/options.mk b/comms/asterisk14/options.mk index 8a15366a48e..564c770c254 100644 --- a/comms/asterisk14/options.mk +++ b/comms/asterisk14/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:11 jperkin Exp $ +# $NetBSD: options.mk,v 1.3 2019/05/23 19:22:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp @@ -80,8 +80,8 @@ DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI SUBST_CLASSES+= webvmail SUBST_STAGE.webvmail= pre-configure SUBST_FILES.webvmail= contrib/scripts/vmail.cgi -SUBST_SED.webvmail+= -e 's|@ASTETCDIR@|${ASTETCDIR}|' -SUBST_SED.webvmail+= -e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|" +SUBST_VARS.webvmail= ASTETCDIR +SUBST_VARS.webvmail+= ASTSPOOLDIR INSTALLATION_DIRS+= ${PREFIX}/libexec/cgi-bin ${PREFIX}/share/httpd/htdocs SPECIAL_PERMS+= ${PREFIX}/libexec/cgi-bin/vmail ${ASTERISK_USER} ${ASTERISK_GROUP} 04555 INSTALL_TARGET+= webvmail diff --git a/comms/asterisk15/options.mk b/comms/asterisk15/options.mk index 649a308686b..6092df2be02 100644 --- a/comms/asterisk15/options.mk +++ b/comms/asterisk15/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2018/07/16 21:53:04 joerg Exp $ +# $NetBSD: options.mk,v 1.2 2019/05/23 19:22:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= x11 unixodbc ilbc webvmail ldap spandsp @@ -80,8 +80,8 @@ DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI SUBST_CLASSES+= webvmail SUBST_STAGE.webvmail= post-patch SUBST_FILES.webvmail= contrib/scripts/vmail.cgi -SUBST_SED.webvmail+= -e 's|@ASTETCDIR@|${ASTETCDIR}|' -SUBST_SED.webvmail+= -e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|" +SUBST_VARS.webvmail= ASTETCDIR +SUBST_VARS.webvmail+= ASTSPOOLDIR INSTALLATION_DIRS+= ${PREFIX}/libexec/cgi-bin ${PREFIX}/share/httpd/htdocs SPECIAL_PERMS+= ${PREFIX}/libexec/cgi-bin/vmail ${ASTERISK_USER} ${ASTERISK_GROUP} 04555 INSTALL_TARGET+= webvmail diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile index 2865aba6b10..7159f368ca2 100644 --- a/comms/fidogate/Makefile +++ b/comms/fidogate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2018/08/22 09:43:03 wiz Exp $ +# $NetBSD: Makefile,v 1.76 2019/05/23 19:22:57 rillig Exp $ DISTNAME= fidogate-4.4.10 PKGREVISION= 11 @@ -29,9 +29,9 @@ NO_CONFIGURE= yes SUBST_CLASSES+= paths SUBST_FILES.paths= config.make -SUBST_SED.paths= -e "s,@PREFIX@,${PREFIX},g" -SUBST_SED.paths+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g" -SUBST_SED.paths+= -e "s,@PKGINFODIR@,${PKGINFODIR},g" +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PKG_SYSCONFDIR +SUBST_VARS.paths+= PKGINFODIR SUBST_SED.paths+= -e "s,@PERL@,${TOOLS_PATH.perl},g" SUBST_STAGE.paths= pre-build diff --git a/comms/op_panel/Makefile b/comms/op_panel/Makefile index 9c45395b27c..5797c86b72f 100644 --- a/comms/op_panel/Makefile +++ b/comms/op_panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2018/08/22 09:43:04 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/05/23 19:22:57 rillig Exp $ # DISTNAME= op_panel-0.29 @@ -50,10 +50,10 @@ CONF_FILES+= ${EGDIR}/op_panel.conf ${PKG_SYSCONFDIR}/op_panel.conf SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/${FOP}.conf.dist -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@SMDIR@,${SMDIR},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' -SUBST_SED.paths+= -e 's,@PERL5@,${PERL5},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= SMDIR +SUBST_VARS.paths+= PKG_SYSCONFDIR +SUBST_VARS.paths+= PERL5 SUBST_STAGE.paths= pre-configure INSTALLATION_DIRS+= share/examples/${FOP} diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile index 62ea8f6e920..522f8d9a297 100644 --- a/converters/wkhtmltopdf/Makefile +++ b/converters/wkhtmltopdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/04/25 07:32:40 maya Exp $ +# $NetBSD: Makefile,v 1.6 2019/05/23 19:22:57 rillig Exp $ DISTNAME= wkhtmltox-0.12.4 PKGNAME= wkhtmltopdf-0.12.4 @@ -24,7 +24,7 @@ SUBST_CLASSES+= x11 SUBST_MESSAGE.x11= Fixing x11 options. SUBST_STAGE.x11= pre-configure SUBST_FILES.x11+= qt/mkspecs/netbsd-g++/qmake.conf -SUBST_SED.x11= -e 's,@X11BASE@,${X11BASE},g' +SUBST_VARS.x11= X11BASE do-configure: diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index d8f9ab509f7..dfdd970abb4 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.156 2018/12/13 08:22:42 tm Exp $ +# $NetBSD: Makefile,v 1.157 2019/05/23 19:22:57 rillig Exp $ DISTNAME= phpMyAdmin-4.8.4-all-languages PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/-all-languages//:tl} @@ -75,8 +75,8 @@ NO_BUILD= yes SUBST_CLASSES+= paths SUBST_FILES.paths+= ${WRKDIR}/phpmyadmin.conf SUBST_FILES.paths+= ${WRKSRC}/libraries/vendor_config.php -SUBST_SED.paths+= -e "s|@PMDIR@|${PMDIR}|g" -SUBST_SED.paths+= -e "s|@PMVARDIR@|${PMVARDIR}|g" +SUBST_VARS.paths= PMDIR +SUBST_VARS.paths+= PMVARDIR SUBST_SED.paths+= -e "s|@PMCONFDIR@|${PMCONFDIR}/|g" SUBST_STAGE.paths= post-configure diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index 4317df0dbb3..914c4ae8e97 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2018/08/14 13:04:24 adam Exp $ +# $NetBSD: Makefile,v 1.41 2019/05/23 19:22:57 rillig Exp $ DISTNAME= unixODBC-2.3.7 PKGNAME= ${DISTNAME:S/ODBC/odbc/} @@ -54,8 +54,8 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/ODBCDataSources SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= ${WRKDIR}/odbc.ini -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@UNIXODBC_DRIVERS_DIR@,${UNIXODBC_DRIVERS_DIR},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= UNIXODBC_DRIVERS_DIR SUBST_CLASSES+= mutex SUBST_STAGE.mutex= pre-configure diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index f37425ce22e..9f81383dc0a 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2019/05/20 14:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.48 2019/05/23 19:22:57 rillig Exp $ DISTNAME= apache-ant-1.10.6-bin PKGNAME= ${DISTNAME:S/-bin//} @@ -25,7 +25,7 @@ SUBST_CLASSES+= ant SUBST_FILES.ant= bin/ant SUBST_STAGE.ant= pre-configure SUBST_SED.ant= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' -SUBST_SED.ant+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.ant= PREFIX INSTALLATION_DIRS= bin lib/java/ant share/doc/java/ant diff --git a/devel/apache-ant19/Makefile b/devel/apache-ant19/Makefile index e0597317d7f..13a6991b400 100644 --- a/devel/apache-ant19/Makefile +++ b/devel/apache-ant19/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/07/24 16:24:50 jperkin Exp $ +# $NetBSD: Makefile,v 1.2 2019/05/23 19:22:57 rillig Exp $ DISTNAME= apache-ant-1.9.13-bin PKGNAME= ${DISTNAME:S/-bin//} @@ -27,7 +27,7 @@ SUBST_CLASSES+= ant SUBST_FILES.ant= bin/ant SUBST_STAGE.ant= pre-configure SUBST_SED.ant= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' -SUBST_SED.ant+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.ant= PREFIX INSTALLATION_DIRS= bin lib/java/ant share/doc/java/ant diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile index 0cda5447331..066b7be5441 100644 --- a/devel/bugzilla/Makefile +++ b/devel/bugzilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2018/08/22 09:43:28 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2019/05/23 19:22:57 rillig Exp $ DISTNAME= bugzilla-5.0.3 PKGREVISION= 1 @@ -95,11 +95,11 @@ SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install SUBST_MESSAGE.conf= Fixing configuration files. SUBST_FILES.conf= bugzilla.conf localconfig Bugzilla/BugMail.pm -SUBST_SED.conf= -e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g" -SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.conf+= -e "s|@BZDIR@|${BZDIR}|g" -SUBST_SED.conf+= -e "s|@CVS@|${CVS}|g" -SUBST_SED.conf+= -e "s|@DBDRIVER@|${DBDRIVER}|g" +SUBST_VARS.conf= BZ_WEB_GROUP +SUBST_VARS.conf+= PREFIX +SUBST_VARS.conf+= BZDIR +SUBST_VARS.conf+= CVS +SUBST_VARS.conf+= DBDRIVER SUBST_SED.conf+= -e "s|/usr/lib/sendmail|${SENDMAIL}|g" SUBST_CLASSES+= diff diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile index 7dab05f9930..83d8f864aed 100644 --- a/devel/bugzilla3/Makefile +++ b/devel/bugzilla3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2018/08/22 09:43:28 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2019/05/23 19:22:57 rillig Exp $ DISTNAME= bugzilla-3.6.8 PKGREVISION= 1 @@ -49,11 +49,11 @@ SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install SUBST_MESSAGE.conf= Fixing configuration files. SUBST_FILES.conf= bugzilla.conf localconfig Bugzilla/BugMail.pm -SUBST_SED.conf= -e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g" -SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.conf+= -e "s|@BZDIR@|${BZDIR}|g" -SUBST_SED.conf+= -e "s|@CVS@|${CVS}|g" -SUBST_SED.conf+= -e "s|@DBDRIVER@|${DBDRIVER}|g" +SUBST_VARS.conf= BZ_WEB_GROUP +SUBST_VARS.conf+= PREFIX +SUBST_VARS.conf+= BZDIR +SUBST_VARS.conf+= CVS +SUBST_VARS.conf+= DBDRIVER SUBST_SED.conf+= -e "s|/usr/lib/sendmail|${SENDMAIL}|g" INSTALLATION_DIRS+= ${DOCDIR} ${DOCDIR}/en ${EGDIR} ${BZDIR} ${BZDIR}/Bugzilla diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 90a792ec9fa..c829c4f156f 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2017/08/01 14:58:56 wiz Exp $ +# $NetBSD: Makefile,v 1.95 2019/05/23 19:22:58 rillig Exp $ DISTNAME= glib-1.2.10 PKGREVISION= 11 @@ -48,7 +48,7 @@ SUBST_MESSAGE.shlib1= Fixing shared library versions (part 1) SUBST_STAGE.shlib1= pre-configure SUBST_FILES.shlib1= glib-config.in docs/glib-config.1.in glib.pc.in \ gmodule.pc.in gthread.pc.in -SUBST_SED.shlib1= -e "s|@GLIB_VERSION@|${GLIB_VERSION}|g" +SUBST_VARS.shlib1= GLIB_VERSION SUBST_SED.shlib1+= -e "s|@VERSION@|${GLIB_VERSION}|g" SUBST_CLASSES+= shlib2 diff --git a/devel/gps/Makefile b/devel/gps/Makefile index 406a838bce7..f63010a6cf3 100644 --- a/devel/gps/Makefile +++ b/devel/gps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2019/04/25 07:32:46 maya Exp $ +# $NetBSD: Makefile,v 1.59 2019/05/23 19:22:58 rillig Exp $ DISTNAME= gps-${GPS_VERSION} PKGREVISION= 22 @@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --disable-shared --with-gmp=${PREFIX} SUBST_CLASSES+= coll python SUBST_STAGE.coll= pre-configure SUBST_FILES.coll= gnatlib/src/gnatcoll_readline.gpr.in -SUBST_SED.coll= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.coll= PREFIX SUBST_SED.coll+= -e "s|-rpath|${LINKER_RPATH_FLAG}|g" SUBST_STAGE.python= pre-configure SUBST_FILES.python= share/plug-ins/gps_utils/console_process.py diff --git a/devel/gradle/Makefile b/devel/gradle/Makefile index 481a556a454..cfff0b6974e 100644 --- a/devel/gradle/Makefile +++ b/devel/gradle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/11/20 21:26:39 schmonz Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/23 19:22:58 rillig Exp $ DISTNAME= gradle-4.10.2-bin PKGNAME= ${DISTNAME:S/-bin//} @@ -27,7 +27,7 @@ SUBST_CLASSES+= launcher SUBST_FILES.launcher= gradle-launcher SUBST_STAGE.launcher= post-configure SUBST_SED.launcher= -e 's,@APP_HOME@,${PREFIX}/lib/java/gradle,g' -SUBST_SED.launcher+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.launcher= PREFIX SUBST_SED.launcher+= -e 's,@APP_LAUNCHER@,lib/gradle-launcher-${PKGVERSION_NOREV}\.jar,g' SUBST_SED.launcher+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' diff --git a/devel/libnet10/Makefile b/devel/libnet10/Makefile index e096f006e64..dc7485d1c55 100644 --- a/devel/libnet10/Makefile +++ b/devel/libnet10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2017/08/16 20:45:35 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2019/05/23 19:22:58 rillig Exp $ # DISTNAME= libnet-1.0.2a @@ -25,7 +25,7 @@ SUBST_CLASSES+= vars SUBST_STAGE.vars= pre-configure SUBST_FILES.vars= Makefile.in libnet-config.in SUBST_SED.vars= -e 's,@MAN_PREFIX@,${PREFIX}/${PKGMANDIR}/man3,g' -SUBST_SED.vars+= -e 's!@COMPILER_RPATH_FLAG@!${COMPILER_RPATH_FLAG}!g' +SUBST_VARS.vars= COMPILER_RPATH_FLAG INSTALLATION_DIRS= bin lib share/examples ${PKGMANDIR}/man3 diff --git a/devel/mantis/Makefile b/devel/mantis/Makefile index 8bf486311ad..31dce336c61 100644 --- a/devel/mantis/Makefile +++ b/devel/mantis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2017/05/21 07:16:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2019/05/23 19:22:58 rillig Exp $ DISTNAME= mantisbt-2.4.1 PKGNAME= ${DISTNAME:S/mantisbt/mantis/} @@ -35,7 +35,7 @@ MANTIS_EG= config_inc.php mantis.conf mantis_offline.php.sample SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install SUBST_FILES.conf= mantis.conf -SUBST_SED.conf= -e "s|@MANTIS_HOME@|${MANTIS_HOME}|g" +SUBST_VARS.conf= MANTIS_HOME SUBST_MESSAGE.conf= Fixing configuration files. REPLACE_BASH+= scripts/travis_before_script.sh diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile index 8415aa1cbfd..8a5c6c5edf5 100644 --- a/devel/monotone-server/Makefile +++ b/devel/monotone-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2013/07/12 10:44:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.61 2019/05/23 19:22:58 rillig Exp $ # DISTNAME= monotone-1.0 @@ -59,12 +59,12 @@ SUBST_CLASSES+= vars SUBST_STAGE.vars= do-configure SUBST_MESSAGE.vars= Configuring sources. SUBST_FILES.vars= ${WRKDIR}/monotone-server.7 -SUBST_SED.vars+= -e 's|@MONOTONE_HOME@|${MONOTONE_HOME}|g' -SUBST_SED.vars+= -e 's|@MONOTONE_LOGFILE@|${MONOTONE_LOGFILE}|g' -SUBST_SED.vars+= -e 's|@MONOTONE_USER@|${MONOTONE_USER}|g' -SUBST_SED.vars+= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' -SUBST_SED.vars+= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.vars+= -e 's|@RCD_SCRIPTS_DIR@|${RCD_SCRIPTS_DIR}|g' +SUBST_VARS.vars= MONOTONE_HOME +SUBST_VARS.vars+= MONOTONE_LOGFILE +SUBST_VARS.vars+= MONOTONE_USER +SUBST_VARS.vars+= PKG_SYSCONFDIR +SUBST_VARS.vars+= PREFIX +SUBST_VARS.vars+= RCD_SCRIPTS_DIR FILES_SUBST+= DIGEST=${PREFIX:Q}/bin/digest FILES_SUBST+= MONOTONE=${PREFIX:Q}/bin/mtn diff --git a/devel/ncc/Makefile b/devel/ncc/Makefile index 4afdb569349..c93e581a900 100644 --- a/devel/ncc/Makefile +++ b/devel/ncc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/04/25 07:32:48 maya Exp $ +# $NetBSD: Makefile,v 1.14 2019/05/23 19:22:58 rillig Exp $ # DISTNAME= ncc-2.8 @@ -19,7 +19,7 @@ SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure SUBST_MESSAGE.prefix= Fixing hardcoded paths SUBST_FILES.prefix= config.h -SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.prefix= PREFIX REPLACE_PYTHON+= scripts/nccstrip2.py diff --git a/devel/nss/Makefile b/devel/nss/Makefile index 61a2e62a44e..0713f38bd6f 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.166 2019/05/16 14:08:16 ryoon Exp $ +# $NetBSD: Makefile,v 1.167 2019/05/23 19:22:58 rillig Exp $ DISTNAME= nss-${NSS_RELEASE:S/.0$//} NSS_RELEASE= 3.44.0 @@ -95,11 +95,11 @@ NSS_DIST_DIR_VERSION= ${NSS_MAJOR_VERSION}_${NSS_MINOR_VERSION}_${NSS_PATCH_VERS SUBST_CLASSES+= config -SUBST_SED.config+= -e "s,@PREFIX@,${PREFIX},g" -SUBST_SED.config+= -e "s,@NSS_MAJOR_VERSION@,${NSS_MAJOR_VERSION}," -SUBST_SED.config+= -e "s,@NSS_MINOR_VERSION@,${NSS_MINOR_VERSION}," -SUBST_SED.config+= -e "s,@NSS_PATCH_VERSION@,${NSS_PATCH_VERSION}," -SUBST_SED.config+= -e "s!@COMPILER_RPATH_FLAG@!${COMPILER_RPATH_FLAG}!" +SUBST_VARS.config= PREFIX +SUBST_VARS.config+= NSS_MAJOR_VERSION +SUBST_VARS.config+= NSS_MINOR_VERSION +SUBST_VARS.config+= NSS_PATCH_VERSION +SUBST_VARS.config+= COMPILER_RPATH_FLAG SUBST_SED.config+= -e "s,@PTHREAD@,${BUILDLINK_LIBS.pthread:Q}," SUBST_STAGE.config= pre-build SUBST_MESSAGE.config= Preparing *-config files. diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index 0c17aead681..87c9f53efb5 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/05/14 15:55:44 jaapb Exp $ +# $NetBSD: Makefile,v 1.44 2019/05/23 19:22:58 rillig Exp $ DISTNAME= findlib-1.8.0 PKGNAME= ocaml-${DISTNAME} @@ -51,9 +51,9 @@ FILES_SUBST+= OCAML_FINDLIB_DIRS="${OCAML_FINDLIB_DIRS}" OCAML_SITELIBDIR="${OC SUBST_CLASSES+= ofr SUBST_STAGE.ofr= pre-configure SUBST_FILES.ofr= ocaml-findlib-register.sh -SUBST_SED.ofr= -e 's,@SH@,'${SH:Q}',' -SUBST_SED.ofr+= -e 's,@PREFIX@,${PREFIX},' -SUBST_SED.ofr+= -e 's,@FGREP@,'${FGREP:Q}',' +SUBST_VARS.ofr= SH +SUBST_VARS.ofr+= PREFIX +SUBST_VARS.ofr+= FGREP SUBST_CLASSES+= pathes SUBST_STAGE.pathes= post-install diff --git a/devel/p5-File-BaseDir/Makefile b/devel/p5-File-BaseDir/Makefile index 8bda1a202f2..14f6f0d9e82 100644 --- a/devel/p5-File-BaseDir/Makefile +++ b/devel/p5-File-BaseDir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2018/08/22 09:43:59 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2019/05/23 19:22:59 rillig Exp $ DISTNAME= File-BaseDir-0.08 PKGNAME= p5-${DISTNAME} @@ -21,7 +21,7 @@ SHAREDIR_SPLIT= ${SHAREDIR:S/\// /g} SUBST_CLASSES+= paths SUBST_STAGE.paths= post-configure SUBST_FILES.paths= lib/File/BaseDir.pm t/01_vars.t t/03_OO.t -SUBST_SED.paths= -e 's|@SHAREDIR_SPLIT@|${SHAREDIR_SPLIT}|g' +SUBST_VARS.paths= SHAREDIR_SPLIT PERL5_MODULE_TYPE= Module::Build PERL5_PACKLIST= auto/File/BaseDir/.packlist diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index 256753743d8..9da05f9b12f 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2018/07/04 13:40:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.71 2019/05/23 19:22:59 rillig Exp $ DISTNAME= pwlib-v1_8_3-src PKGNAME= pwlib-1.8.3 @@ -32,12 +32,12 @@ MAKE_ENV+= PWLIBDIR=${WRKSRC:Q} CC=${CC:Q} CPLUS=${CXX:Q} SUBST_CLASSES+= paths SUBST_FILES.paths= make/unix.mak make/lib.mak make/common.mak make/pwlib.mak -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@LIBTOOL@,${LIBTOOL},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= LIBTOOL SUBST_SED.paths+= -e 's,@BSD_INSTALL_LIB@,${INSTALL_LIB},g' SUBST_SED.paths+= -e 's,@BSD_INSTALL_PROGRAM@,${INSTALL_PROGRAM},g' SUBST_SED.paths+= -e 's,@PTHREAD_FLAGS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g' -SUBST_SED.paths+= -e 's,@LIBOSSAUDIO@,${LIBOSSAUDIO},g' +SUBST_VARS.paths+= LIBOSSAUDIO SUBST_STAGE.paths= pre-configure post-extract: diff --git a/devel/py-jupyter_core/Makefile b/devel/py-jupyter_core/Makefile index 229b7d71840..bd136bcbfd3 100644 --- a/devel/py-jupyter_core/Makefile +++ b/devel/py-jupyter_core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/02/06 01:40:48 minskim Exp $ +# $NetBSD: Makefile,v 1.4 2019/05/23 19:22:59 rillig Exp $ DISTNAME= jupyter_core-4.4.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,7 @@ SUBST_CLASSES+= fix-prefix SUBST_STAGE.fix-prefix= pre-configure SUBST_MESSAGE.fix-prefix= Fixing prefix. SUBST_FILES.fix-prefix= jupyter_core/paths.py -SUBST_SED.fix-prefix= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.fix-prefix= PREFIX post-install: cd ${DESTDIR}${PREFIX}/bin && \ diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile index 7e7ef7f7215..2b46a064863 100644 --- a/devel/quilt/Makefile +++ b/devel/quilt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2018/08/22 09:44:59 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/05/23 19:22:59 rillig Exp $ # DISTNAME= quilt-0.64 @@ -54,7 +54,7 @@ REPLACE_FILES.conf-bash=*.in */*.in */*/*.in SUBST_CLASSES+= bash SUBST_MESSAGE.bash= Fixing non-shellbang references to bash. SUBST_STAGE.bash= pre-configure -SUBST_SED.bash= -e 's,@BASH@,${BASH},g' +SUBST_VARS.bash= BASH SUBST_FILES.bash= quilt/scripts/inspect.in SUBST_CLASSES+= etc diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install index 53273c5e73d..691ab63cdea 100644 --- a/devel/rt3/Makefile.install +++ b/devel/rt3/Makefile.install @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.install,v 1.22 2018/07/04 13:40:15 jperkin Exp $ +# $NetBSD: Makefile.install,v 1.23 2019/05/23 19:22:59 rillig Exp $ .include "dirs.mk" @@ -18,7 +18,7 @@ OWN_DIRS_PERMS+= ${RT_VAR_DIR}/session_data ${APACHE_USER} ${APACHE_GROUP} 0770 SUBST_CLASSES+= prefix SUBST_FILES.prefix= config.layout -SUBST_SED.prefix= -e s,@PREFIX@,${PREFIX}, +SUBST_VARS.prefix= PREFIX SUBST_SED.prefix+= -e s,@PKGSYSCONFDIR@,${PKG_SYSCONFDIR}, SUBST_SED.prefix+= -e s,@RTLIBDIR@,${RT_LIB_DIR}, SUBST_SED.prefix+= -e s,@RTSHAREDIR@,${RT_SHARE_DIR}, diff --git a/devel/ruby-mkrf/Makefile b/devel/ruby-mkrf/Makefile index 9b643a1ab6d..c2404110c06 100644 --- a/devel/ruby-mkrf/Makefile +++ b/devel/ruby-mkrf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2017/09/04 18:00:53 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2019/05/23 19:22:59 rillig Exp $ DISTNAME= mkrf-0.2.3 PKGREVISION= 1 @@ -14,7 +14,7 @@ USE_RAKE= RUN SUBST_CLASSES+= rake SUBST_STAGE.rake= pre-configure SUBST_FILES.rake= lib/mkrf/rakehelper.rb -SUBST_SED.rake= -e "s|@RAKE@|${RAKE}|" +SUBST_VARS.rake= RAKE SUBST_MESSAGE.rake= Fixate rake's path. .include "../../lang/ruby/gem.mk" diff --git a/devel/ruby-redmine/Makefile b/devel/ruby-redmine/Makefile index 307f1f08cb0..2326c516c75 100644 --- a/devel/ruby-redmine/Makefile +++ b/devel/ruby-redmine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/04/03 00:32:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.39 2019/05/23 19:22:59 rillig Exp $ DISTNAME= redmine-3.3.2 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -136,9 +136,9 @@ SUBST_SED.rake= -e "s|/usr/bin/env rake|${PREFIX}/${RM_DIR}/gems/bin/rake|g" SUBST_CLASSES+= shell SUBST_FILES.shell= ${DESTDIR}${PREFIX}/bin/redmine_*${RUBY_SUFFIX}.sh SUBST_MESSAGE.shell= Fixing paths in helper shell scripts. -SUBST_SED.shell= -e "s|@PREFIX@|${PREFIX}|g;s|@GEM@|${GEM}|g" -SUBST_SED.shell+= -e "s|@RUBY@|${RUBY}|g" -SUBST_SED.shell+= -e "s|@RUBY_PKGPREFIX@|${RUBY_PKGPREFIX}|g" +SUBST_VARS.shell= PREFIX +SUBST_VARS.shell+= RUBY +SUBST_VARS.shell+= RUBY_PKGPREFIX SUBST_STAGE.shell= post-install REPLACE_BASH+= nokogiri-1.6.7.2/build_all nokogiri-1.6.7.2/test_all diff --git a/devel/ruby-redmine/options.mk b/devel/ruby-redmine/options.mk index ced14cca3bc..da9b461fc71 100644 --- a/devel/ruby-redmine/options.mk +++ b/devel/ruby-redmine/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2017/01/04 23:05:12 rodent Exp $ +# $NetBSD: options.mk,v 1.6 2019/05/23 19:22:59 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.redmine @@ -52,7 +52,7 @@ SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure SUBST_MESSAGE.prefix= Setting PREFIX and RUBY_PKGPREFIX. SUBST_FILES.prefix= ${WRKDIR}/unicorn.rb -SUBST_SED.prefix+= -e "s|@RUBY_PKGPREFIX@|${RUBY_PKGPREFIX}|g" +SUBST_VARS.prefix= RUBY_PKGPREFIX SUBST_VARS.prefix+= PREFIX RCD_SCRIPTS+= redmine_unicorn${RUBY_SUFFIX} diff --git a/devel/sgb/Makefile b/devel/sgb/Makefile index be45cb0ec48..a883a3eb659 100644 --- a/devel/sgb/Makefile +++ b/devel/sgb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/11/24 02:53:46 dholland Exp $ +# $NetBSD: Makefile,v 1.8 2019/05/23 19:22:59 rillig Exp $ DISTNAME= sgb-2007-03.28 PKGNAME= sgb-20070328 @@ -24,7 +24,7 @@ SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing hardcoded paths. SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= Makefile -SUBST_SED.paths= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_VARS.paths= LOCALBASE SUBST_SED.paths+= -e 's,@PREFIX@,$${DESTDIR}${PREFIX},g' post-install: diff --git a/devel/sloccount/Makefile b/devel/sloccount/Makefile index c1d3528b3ed..61eba1120a5 100644 --- a/devel/sloccount/Makefile +++ b/devel/sloccount/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/08/22 09:45:00 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2019/05/23 19:22:59 rillig Exp $ DISTNAME= sloccount-2.26 @@ -59,7 +59,7 @@ SUBST_FILES.generic= ada_count awk_count csh_count exp_count lisp_count \ SUBST_CLASSES+= prefix SUBST_MESSAGE.prefix= Fixing path to internal binaries. SUBST_STAGE.prefix= pre-configure -SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.prefix= PREFIX SUBST_FILES.prefix= compute_all compute_sloc_lang lex_count sloccount post-install: diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile index caf199db9fc..b6895ff7be5 100644 --- a/devel/tmake/Makefile +++ b/devel/tmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2018/08/22 09:45:00 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/05/23 19:23:00 rillig Exp $ # DISTNAME= tmake-1.13 @@ -20,14 +20,14 @@ INSTALLATION_DIRS= bin SUBST_CLASSES+= tmake SUBST_STAGE.tmake= do-build SUBST_FILES.tmake= bin/tmake -SUBST_SED.tmake+= -e 's;@TMAKEPATH@;'${TMAKEPATH:Q}';g' +SUBST_VARS.tmake= TMAKEPATH SUBST_CLASSES+= tmakeconf SUBST_STAGE.tmakeconf= do-build SUBST_FILES.tmakeconf= lib/netbsd-g++/tmake.conf -SUBST_SED.tmakeconf= -e 's;@LOCALBASE@;${LOCALBASE};g' -SUBST_SED.tmakeconf+= -e 's;@X11BASE@;${X11BASE};g' -SUBST_SED.tmakeconf+= -e 's;@GLBASE@;${GLBASE};g' +SUBST_VARS.tmakeconf= LOCALBASE +SUBST_VARS.tmakeconf+= X11BASE +SUBST_VARS.tmakeconf+= GLBASE REPLACE_PERL+= bin/tmake bin/progen diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile index 9f5392ad46b..d4593ad9598 100644 --- a/editors/TeXmacs/Makefile +++ b/editors/TeXmacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.124 2019/04/25 07:32:51 maya Exp $ +# $NetBSD: Makefile,v 1.125 2019/05/23 19:23:00 rillig Exp $ # # changelog at http://www.texmacs.org/tmweb/about/changes.en.html @@ -37,7 +37,7 @@ REPLACE_PYTHON+= plugins/mathematica/bin/realpath.py SUBST_CLASSES+= init SUBST_STAGE.init= pre-configure SUBST_FILES.init= plugins/python/progs/init-python.scm -SUBST_SED.init= -e 's,@PYTHONBIN@,${PYTHONBIN},g' +SUBST_VARS.init= PYTHONBIN REPLACE_SH+= plugins/asymptote/bin/tm_asy REPLACE_SH+= plugins/dratex/bin/tm_dratex diff --git a/editors/ce-doc/Makefile b/editors/ce-doc/Makefile index 56aa8513959..88b8213dffd 100644 --- a/editors/ce-doc/Makefile +++ b/editors/ce-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/10/09 14:06:32 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/05/23 19:23:00 rillig Exp $ # .include "../../editors/ce/Makefile.common" @@ -17,7 +17,7 @@ INSTALLATION_DIRS= bin share/doc/ce SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= teach-ce.in -SUBST_SED.paths= -e 's|@LN@|${LN}|g' +SUBST_VARS.paths= LN SUBST_SED.paths+= -e '1s,/bin/bash,'${SH:Q}',' .include "../../mk/bsd.pkg.mk" diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile index ad903a0d0fb..c4bc7ae5463 100644 --- a/editors/lpe/Makefile +++ b/editors/lpe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.27 2019/05/23 19:23:00 rillig Exp $ # DISTNAME= lpe-1.2.6 @@ -28,7 +28,7 @@ CFLAGS= -DPREFIX="\"${PREFIX}\"" SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= man/lpe.1.cs man/lpe.1.de man/lpe.1.en man/lpe.1.es -SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},' +SUBST_VARS.paths= PREFIX .include "../../devel/libslang/buildlink3.mk" diff --git a/emulators/b-em/Makefile b/emulators/b-em/Makefile index 3950e6bc2bb..1ba4f1bfbc2 100644 --- a/emulators/b-em/Makefile +++ b/emulators/b-em/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2016/07/16 00:20:27 markd Exp $ +# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:00 rillig Exp $ DISTNAME= B-emv2.2Linux PKGNAME= b-em-2.2 @@ -23,7 +23,7 @@ SUBST_CLASSES+= paths d2u SUBST_MESSAGE.paths= Fixing non-existing paths. SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= src/linux.c src/win.c -SUBST_SED.paths= -e 's,@BEMDATADIR@,${BEMDATADIR},g' +SUBST_VARS.paths= BEMDATADIR SUBST_MESSAGE.d2u= Removing CR end-of-line markers SUBST_STAGE.d2u= post-extract diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile index 0147015d6ea..b7b9d159f8d 100644 --- a/emulators/dynagen/Makefile +++ b/emulators/dynagen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/04/25 07:32:52 maya Exp $ +# $NetBSD: Makefile,v 1.10 2019/05/23 19:23:00 rillig Exp $ DISTNAME= dynagen-0.11.0 PKGREVISION= 5 @@ -21,7 +21,7 @@ SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= dynagen SUBST_SED.paths= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|" -SUBST_SED.paths+= -e "s|@PREFIX@|${PREFIX}|" +SUBST_VARS.paths= PREFIX CONF_FILES+= share/examples/dynagen/dynagen.ini ${PKG_SYSCONFDIR}/dynagen.ini diff --git a/filesystems/fuse-gmailfs/Makefile b/filesystems/fuse-gmailfs/Makefile index b6cac007a65..3a819505f56 100644 --- a/filesystems/fuse-gmailfs/Makefile +++ b/filesystems/fuse-gmailfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/04/26 13:13:56 maya Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:00 rillig Exp $ DISTNAME= gmailfs-0.7.2 PKGREVISION= 4 @@ -20,8 +20,8 @@ CONF_FILES= ${PREFIX}/share/examples/gmailfs/gmailfs.conf \ SUBST_CLASSES+= config SUBST_STAGE.config= pre-configure SUBST_FILES.config= gmailfs.py mount.gmailfs -SUBST_SED.config= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" -SUBST_SED.config+= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.config= PKG_SYSCONFDIR +SUBST_VARS.config+= PREFIX SUBST_SED.config+= -e "s|@PYSITELIB@|${PREFIX}/${PYSITELIB}|g" SUBST_MESSAGE.config= Fixing paths. diff --git a/finance/tclticker/Makefile b/finance/tclticker/Makefile index 3506a28dc1c..af0d5c58fc8 100644 --- a/finance/tclticker/Makefile +++ b/finance/tclticker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:18 jperkin Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:00 rillig Exp $ # DISTNAME= tclticker-1.1 @@ -20,7 +20,7 @@ SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing hardcoded paths and command names. SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= tclticker mailquote -SUBST_SED.paths= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.paths= PREFIX INSTALLATION_DIRS= bin diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile index 7bf45434996..51697b313d9 100644 --- a/fonts/t1lib/Makefile +++ b/fonts/t1lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2018/07/04 13:40:18 jperkin Exp $ +# $NetBSD: Makefile,v 1.53 2019/05/23 19:23:01 rillig Exp $ DISTNAME= t1lib-5.1.2 PKGREVISION= 6 @@ -36,8 +36,8 @@ CONFIGURE_ARGS+= --without-x SUBST_CLASSES+= paths SUBST_FILES.paths= t1lib.config.sample -SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= LOCALBASE SUBST_STAGE.paths= pre-configure post-extract: 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" diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index ffbad9fdd97..31bb25ce644 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.117 2019/05/05 22:49:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.118 2019/05/23 19:23:01 rillig Exp $ VERSION= 4.0.1 PKGNAME= camlimages-${VERSION} @@ -23,9 +23,9 @@ WRKSRC= ${WRKDIR}/camlspotter-camlimages-v${VERSION} SUBST_CLASSES+= omf SUBST_STAGE.omf= pre-configure SUBST_FILES.omf= OMakefile -SUBST_SED.omf= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.omf+= -e 's,@X11BASE@,${X11BASE},g' -SUBST_SED.omf+= -e s%@LDFLAGS@%${LDFLAGS:Q}%g +SUBST_VARS.omf= PREFIX +SUBST_VARS.omf+= X11BASE +SUBST_VARS.omf+= LDFLAGS SUBST_SED.omf+= -e 's,@OCAMLFIND_DESTDIR@,${DESTDIR}${PREFIX}/lib/ocaml/site-lib,g' SUBST_SED.omf+= -e 's,@OCAMLFIND_LDCONF@,/dev/null,g' SUBST_MESSAGE.omf= Fixing vars in OMakefile diff --git a/graphics/circos/Makefile b/graphics/circos/Makefile index 4c3e396a8c1..365d59d9942 100644 --- a/graphics/circos/Makefile +++ b/graphics/circos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2018/08/22 09:45:11 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/05/23 19:23:01 rillig Exp $ # DISTNAME= circos-0.49 @@ -37,7 +37,7 @@ SUBST_CLASSES+= paths SUBST_STAGE.paths= do-configure SUBST_FILES.paths= */*/*/circos*.conf bin/circos SUBST_SED.paths+= -e 's|<<include etc/\(.*\)>>|<<include ${PKG_SYSCONFDIR}/\1>>|g' -SUBST_SED.paths+= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.paths= PREFIX REPLACE_PERL+= data/3/make_random_highlights data/6/hist.random.make REPLACE_PERL+= svg/textrotation.svg diff --git a/graphics/frameworks/Makefile b/graphics/frameworks/Makefile index 916009cfb7e..1bd8408a521 100644 --- a/graphics/frameworks/Makefile +++ b/graphics/frameworks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2018/11/14 22:21:37 kleink Exp $ +# $NetBSD: Makefile,v 1.37 2019/05/23 19:23:01 rillig Exp $ # DISTNAME= frameworks-0.3.7 @@ -20,7 +20,7 @@ SUBST_CLASSES= xdg SUBST_STAGE.xdg= pre-configure SUBST_MESSAGE.xdg= Fixing paths in xdg menu entries. SUBST_FILES.xdg= frameworks.desktop -SUBST_SED.xdg= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.xdg= PREFIX INSTALLATION_DIRS= share/applications share/icons/hicolor/48x48/apps diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile index 191b7d8bf20..2f62fa85a06 100644 --- a/graphics/libbpg/Makefile +++ b/graphics/libbpg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2017/08/16 20:21:09 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/05/23 19:23:02 rillig Exp $ DISTNAME= libbpg-0.9.2 CATEGORIES= graphics @@ -18,7 +18,7 @@ SUBST_CLASSES+= config SUBST_MESSAGE.config= config.h file substitutions SUBST_STAGE.config= pre-configure SUBST_FILES.config= config.h -SUBST_SED.config= -e "s,@PREFIX@,${PREFIX},g" +SUBST_VARS.config= PREFIX .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile index 959fb6b2408..e89533dfce7 100644 --- a/graphics/magicpoint/Makefile +++ b/graphics/magicpoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.100 2018/08/22 09:45:14 wiz Exp $ +# $NetBSD: Makefile,v 1.101 2019/05/23 19:23:02 rillig Exp $ DISTNAME= magicpoint-1.13a PKGREVISION= 30 @@ -54,9 +54,9 @@ MGP_PRE_STAGE= ctlwords.h grammar.c scanner.c tokdefs.h \ SUBST_CLASSES+= conf SUBST_FILES.conf+= sample/default.mgp -SUBST_SED.conf+= -e 's|@MGP_TFONT@|${MGP_TFONT}|g' -SUBST_SED.conf+= -e 's|@MGP_VFONT@|${MGP_VFONT}|g' -SUBST_SED.conf+= -e 's|@MGP_XFONT@|${MGP_XFONT}|g' +SUBST_VARS.conf= MGP_TFONT +SUBST_VARS.conf+= MGP_VFONT +SUBST_VARS.conf+= MGP_XFONT SUBST_STAGE.conf= post-configure post-configure: diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index da2a232b9bb..5006071de30 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2015/10/14 20:17:27 wiz Exp $ +# $NetBSD: Makefile,v 1.77 2019/05/23 19:23:02 rillig Exp $ DISTNAME= xpaint-2.7.8.1 PKGREVISION= 11 @@ -17,8 +17,8 @@ MAKE_JOBS_SAFE= NO SUBST_CLASSES+= foo SUBST_STAGE.foo= pre-configure SUBST_FILES.foo= Local.config configure -SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" -SUBST_SED.foo+= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.foo= LOCALBASE +SUBST_VARS.foo+= PREFIX SUBST_SED.foo+= -e "s|@XAWDIR@|${BUILDLINK_PREFIX.libXaw3d}|g" SUBST_SED.foo+= -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g" diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index bfae66b74af..a2b58d76955 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2019/02/21 01:37:14 tsutsui Exp $ +# $NetBSD: Makefile,v 1.94 2019/05/23 19:23:02 rillig Exp $ DISTNAME= xv-3.10a PKGREVISION= 25 @@ -38,7 +38,7 @@ BUILD_TARGET= depend all SUBST_CLASSES+= gspath SUBST_FILES.gspath= config.h -SUBST_SED.gspath= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.gspath= PREFIX SUBST_STAGE.gspath= post-configure SUBST_MESSAGE.gspath= Fixing path to ghostscript interpreter. diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile index d02f60291d0..939faa6a3f9 100644 --- a/lang/clojure/Makefile +++ b/lang/clojure/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2018/01/01 18:16:36 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2019/05/23 19:23:02 rillig Exp $ DISTNAME= clojure-1.5.1 CATEGORIES= lang @@ -30,7 +30,7 @@ SUBST_STAGE.java= pre-install SUBST_MESSAGE.java= Set Java SUBST_FILES.java= clj.sh SUBST_SED.java= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' -SUBST_SED.java+= -e 's,@SH@,${SH},' +SUBST_VARS.java= SH pre-patch: ${INSTALL_DATA} ${FILESDIR}/clj.sh ${WRKSRC} diff --git a/lang/ghc-bootstrap/Makefile b/lang/ghc-bootstrap/Makefile index 9eb7859e33a..29d2a3b7b3a 100644 --- a/lang/ghc-bootstrap/Makefile +++ b/lang/ghc-bootstrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2018/08/22 09:45:20 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/05/23 19:23:02 rillig Exp $ DISTNAME= ghc-6.8.3 PKGNAME= ghc-bootstrap-6.8.3 @@ -37,7 +37,7 @@ SUBST_FILES.prefix+= mk/bootstrap.mk SUBST_FILES.prefix+= libraries/readline/configure SUBST_FILES.prefix+= libraries/readline/readline.cabal SUBST_FILES.prefix+= rts/package.conf.in -SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.prefix= PREFIX # # Build system settings. diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 680a6e172ce..c5e0278d406 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2018/08/22 09:45:20 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2019/05/23 19:23:02 rillig Exp $ DISTNAME= ghc-6.8.3 PKGREVISION= 8 @@ -37,7 +37,7 @@ SUBST_FILES.prefix+= ../ghc-6.4.2/libraries/readline/package.conf.in SUBST_FILES.prefix+= libraries/readline/configure SUBST_FILES.prefix+= libraries/readline/readline.cabal SUBST_FILES.prefix+= rts/package.conf.in -SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.prefix= PREFIX pre-configure: cd ${WRKDIR}/ghc-6.4.2 && \ diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 119734402f8..afb7a825ab5 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.184 2019/04/25 07:33:03 maya Exp $ +# $NetBSD: Makefile,v 1.185 2019/05/23 19:23:02 rillig Exp $ DISTNAME= mono-4.0.4.1 PKGREVISION= 16 @@ -134,7 +134,7 @@ SUBST_CLASSES+= fix-libx11 SUBST_STAGE.fix-libx11= pre-configure SUBST_MESSAGE.fix-libx11= Fixing libX11 search path configuration SUBST_FILES.fix-libx11= configure -SUBST_SED.fix-libx11= -e 's,@X11BASE@,${X11BASE},g' +SUBST_VARS.fix-libx11= X11BASE PLIST_VARS= libgc monodoc diff --git a/lang/mono2/Makefile b/lang/mono2/Makefile index c47be6c6e3b..14233634f7a 100644 --- a/lang/mono2/Makefile +++ b/lang/mono2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/04/25 07:33:03 maya Exp $ +# $NetBSD: Makefile,v 1.35 2019/05/23 19:23:02 rillig Exp $ DISTNAME= mono-2.10.9 PKGREVISION= 28 @@ -143,7 +143,7 @@ SUBST_CLASSES+= fix-libx11 SUBST_STAGE.fix-libx11= pre-configure SUBST_MESSAGE.fix-libx11= Fixing libX11 search path configuration SUBST_FILES.fix-libx11= configure -SUBST_SED.fix-libx11= -e 's,@X11BASE@,${X11BASE},g' +SUBST_VARS.fix-libx11= X11BASE .include "../../mk/bsd.prefs.mk" diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 67b8e8ca024..90a7c596714 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.133 2019/03/20 11:55:11 wiz Exp $ +# $NetBSD: Makefile,v 1.134 2019/05/23 19:23:03 rillig Exp $ JDK_MICRO= 141 DISTNAME= openjdk-1.7.${JDK_MICRO}-20170813 @@ -194,8 +194,8 @@ SUBST_STAGE.fontpaths= pre-build SUBST_MESSAGE.fontpaths= fixing font paths SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c -SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g' +SUBST_VARS.fontpaths= PREFIX +SUBST_VARS.fontpaths+= BUILDLINK_PREFIX.fontconfig PLIST_VARS+= i386 .if ${MACHINE_ARCH} == "i386" diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index cca266c75c1..759c53dac34 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2019/03/20 11:10:25 wiz Exp $ +# $NetBSD: Makefile,v 1.78 2019/05/23 19:23:03 rillig Exp $ DISTNAME= openjdk-1.8.202-20190219 PKGNAME= openjdk8-1.8.202 @@ -159,8 +159,8 @@ SUBST_STAGE.fontpaths= pre-build SUBST_MESSAGE.fontpaths= fixing font paths SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c -SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g' +SUBST_VARS.fontpaths= PREFIX +SUBST_VARS.fontpaths+= BUILDLINK_PREFIX.fontconfig SUBST_CLASSES+= zlibpath SUBST_STAGE.zlibpath= pre-build diff --git a/lang/pear/Makefile b/lang/pear/Makefile index c6e98ba6ecf..684706c8938 100644 --- a/lang/pear/Makefile +++ b/lang/pear/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2019/04/30 03:29:07 taca Exp $ +# $NetBSD: Makefile,v 1.48 2019/05/23 19:23:03 rillig Exp $ # DISTNAME= PEAR-1.10.9 @@ -55,8 +55,8 @@ DISTFILES+= ${XMLUTIL_SRCS} SUBST_CLASSES+= config SUBST_STAGE.config= pre-configure SUBST_FILES.config= install/go-pear.php -SUBST_SED.config= -e "s|@WRKSRC@|${WRKSRC}|g" -SUBST_SED.config+= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.config= WRKSRC +SUBST_VARS.config+= PREFIX SUBST_MESSAGE.config= Fixing configuration files. REPLACE_SH+= script/pear.sh diff --git a/lang/php56/Makefile b/lang/php56/Makefile index f1432ce046a..281bf5263cd 100644 --- a/lang/php56/Makefile +++ b/lang/php56/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/03/31 20:48:40 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/05/23 19:23:03 rillig Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -37,8 +37,8 @@ SUBST_STAGE.path= pre-configure SUBST_FILES.path= ext/phar/phar/phar.php SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php SUBST_FILES.path+= sapi/cgi/Makefile.frag -SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' -SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.path= CGIDIR +SUBST_VARS.path+= PREFIX INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php diff --git a/lang/php71/Makefile b/lang/php71/Makefile index b5837301b42..228903a679a 100644 --- a/lang/php71/Makefile +++ b/lang/php71/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/01/12 14:56:47 taca Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:03 rillig Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -36,8 +36,8 @@ SUBST_STAGE.path= pre-configure SUBST_FILES.path= ext/phar/phar/phar.php SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php SUBST_FILES.path+= sapi/cgi/Makefile.frag -SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' -SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.path= CGIDIR +SUBST_VARS.path+= PREFIX INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php diff --git a/lang/php72/Makefile b/lang/php72/Makefile index 246fee22dc5..50e3fdc9c1c 100644 --- a/lang/php72/Makefile +++ b/lang/php72/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/03/12 04:13:42 taca Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:03 rillig Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -35,8 +35,8 @@ SUBST_STAGE.path= pre-configure SUBST_FILES.path= ext/phar/phar/phar.php SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php SUBST_FILES.path+= sapi/cgi/Makefile.frag -SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' -SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.path= CGIDIR +SUBST_VARS.path+= PREFIX INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php diff --git a/lang/php73/Makefile b/lang/php73/Makefile index 499791e0e5f..41d2e9013ea 100644 --- a/lang/php73/Makefile +++ b/lang/php73/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/03/12 04:15:03 taca Exp $ +# $NetBSD: Makefile,v 1.4 2019/05/23 19:23:03 rillig Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -35,8 +35,8 @@ SUBST_STAGE.path= pre-configure SUBST_FILES.path= ext/phar/phar/phar.php SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php SUBST_FILES.path+= sapi/cgi/Makefile.frag -SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' -SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.path= CGIDIR +SUBST_VARS.path+= PREFIX INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php diff --git a/lang/ruby/platform.mk b/lang/ruby/platform.mk index 460ed961d03..e1dffc16553 100644 --- a/lang/ruby/platform.mk +++ b/lang/ruby/platform.mk @@ -1,4 +1,4 @@ -# $NetBSD: platform.mk,v 1.4 2017/08/29 14:47:35 jmcneill Exp $ +# $NetBSD: platform.mk,v 1.5 2019/05/23 19:23:03 rillig Exp $ # # @@ -23,7 +23,7 @@ REQD_DIRS+= ${GEM_HOME}/doc SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install SUBST_FILES.conf= lib/rubygems/config_file.rb -SUBST_SED.conf= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.conf= PKG_SYSCONFDIR SUBST_MESSAGE.conf= Fixing configuration files. # diff --git a/lang/sather/Makefile b/lang/sather/Makefile index 23cd58846ff..2f92c7886f9 100644 --- a/lang/sather/Makefile +++ b/lang/sather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2018/08/22 09:45:22 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2019/05/23 19:23:03 rillig Exp $ DISTNAME= sather-1.2.3 PKGREVISION= 14 @@ -39,16 +39,16 @@ SUBST_FILES.sather-configure= \ Browser/Web/gen_mml_sa_files \ Browser/Web/gen_mml_shortflat \ Browser/Web/graph2dot -SUBST_SED.sather-configure= -e s:@CC@:${CC:Q}:g -SUBST_SED.sather-configure+= -e s:@CFLAGS@:${CFLAGS:Q}:g -SUBST_SED.sather-configure+= -e s:@GMAKE@:${GMAKE:Q}:g -SUBST_SED.sather-configure+= -e s:@PREFIX@:${PREFIX}:g -SUBST_SED.sather-configure+= -e s:@X11BASE@:${X11BASE}:g +SUBST_VARS.sather-configure= CC +SUBST_VARS.sather-configure+= CFLAGS +SUBST_VARS.sather-configure+= GMAKE +SUBST_VARS.sather-configure+= PREFIX +SUBST_VARS.sather-configure+= X11BASE SUBST_SED.sather-configure+= -e s:@GC_PREFIX@:${BUILDLINK_PREFIX.boehm-gc}:g SUBST_SED.sather-configure+= -e s:@TCL_PREFIX@:${BUILDLINK_PREFIX.tcl}:g SUBST_SED.sather-configure+= -e s:@TK_PREFIX@:${BUILDLINK_PREFIX.tk}:g -SUBST_SED.sather-configure+= -e s:@LINKER_RPATH_FLAG@:${LINKER_RPATH_FLAG}:g -SUBST_SED.sather-configure+= -e s:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g +SUBST_VARS.sather-configure+= LINKER_RPATH_FLAG +SUBST_VARS.sather-configure+= COMPILER_RPATH_FLAG INSTALLATION_DIRS= bin ${PKGINFODIR} ${PKGMANDIR}/man1 share/doc/sather \ lib/sather lib/sather/Bin share/emacs/site-lisp diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index 6e97ff1d2e9..4107f2296e1 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2018/10/17 12:59:49 leot Exp $ +# $NetBSD: Makefile,v 1.79 2019/05/23 19:23:04 rillig Exp $ DISTNAME= ${PKGNAME_NOREV}-source PKGNAME= sbcl-1.4.3 @@ -57,14 +57,14 @@ SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. SUBST_FILES.fix-paths= install.sh src/runtime/runtime.c doc/sbcl.1 -SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.fix-paths= PREFIX SUBST_SED.fix-paths+= -e 's,/var/log,${VARBASE}/log,g' SUBST_CLASSES+= fix-gtar SUBST_STAGE.fix-gtar= pre-configure SUBST_MESSAGE.fix-gtar= Fixing GNU tar references. SUBST_FILES.fix-gtar= contrib/asdf-install/installer.lisp -SUBST_SED.fix-gtar= -e 's,@GTAR@,${GTAR},' +SUBST_VARS.fix-gtar= GTAR SUBST_CLASSES+= fix-bins SUBST_STAGE.fix-bins= pre-configure diff --git a/lang/scala/Makefile b/lang/scala/Makefile index 8bd06463e1f..19475b3255e 100644 --- a/lang/scala/Makefile +++ b/lang/scala/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/12/16 10:07:11 ryoon Exp $ +# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:04 rillig Exp $ DISTNAME= scala-2.12.8 CATEGORIES= lang @@ -23,9 +23,9 @@ SCALA_HOME= ${PREFIX}/share/${DISTNAME} SUBST_CLASSES+= scala SUBST_FILES.scala= bin/fsc bin/scala bin/scalac bin/scaladoc bin/scalap SUBST_STAGE.scala= pre-configure -SUBST_SED.scala= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.scala= PREFIX SUBST_SED.scala+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' -SUBST_SED.scala+= -e 's,@SCALA_HOME@,${SCALA_HOME},g' +SUBST_VARS.scala+= SCALA_HOME PLIST_SUBST+= DISTNAME=${DISTNAME} diff --git a/lang/tinyscheme/Makefile b/lang/tinyscheme/Makefile index 280cd5409ad..906980f0cca 100644 --- a/lang/tinyscheme/Makefile +++ b/lang/tinyscheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2014/04/29 19:18:16 agc Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:04 rillig Exp $ DISTNAME= tinyscheme-1.40 CATEGORIES= lang @@ -24,7 +24,7 @@ SUBST_CLASSES+= initpath SUBST_STAGE.initpath= pre-configure SUBST_MESSAGE.initpath= Fix location of init.scm file SUBST_FILES.initpath= scheme.c -SUBST_SED.initpath= -e 's|@PREFIX@|${PREFIX}|' +SUBST_VARS.initpath= PREFIX .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile index 1f36c5e61db..8c7c47e6f14 100644 --- a/mail/amavisd-new/Makefile +++ b/mail/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2018/12/09 21:05:33 adam Exp $ +# $NetBSD: Makefile,v 1.25 2019/05/23 19:23:04 rillig Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -84,12 +84,12 @@ SUBST_CLASSES+= amavisd SUBST_STAGE.amavisd= pre-build SUBST_FILES.amavisd= amavisd amavisd.conf SUBST_SED.amavisd= -e "s|/etc/amavisd.conf|${PKG_SYSCONFDIR}/amavisd.conf|" -SUBST_SED.amavisd+= -e "s|@AMAVIS_DIR@|${AMAVIS_DIR}|g" -SUBST_SED.amavisd+= -e "s|@AMAVIS_USER@|${AMAVIS_USER}|g" -SUBST_SED.amavisd+= -e "s|@AMAVIS_GROUP@|${AMAVIS_GROUP}|g" -SUBST_SED.amavisd+= -e "s|@AMAVIS_QUARANTINE@|${AMAVIS_QUARANTINE}|g" -SUBST_SED.amavisd+= -e "s|@LOCALBASE@|${LOCALBASE}|g" -SUBST_SED.amavisd+= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.amavisd= AMAVIS_DIR +SUBST_VARS.amavisd+= AMAVIS_USER +SUBST_VARS.amavisd+= AMAVIS_GROUP +SUBST_VARS.amavisd+= AMAVIS_QUARANTINE +SUBST_VARS.amavisd+= LOCALBASE +SUBST_VARS.amavisd+= PREFIX INSTALLATION_DIRS+= sbin ${DOCDIR} ${EGDIR} diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile index f5b54c8fe82..e79cebbe9d2 100644 --- a/mail/courier-maildir/Makefile +++ b/mail/courier-maildir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2018/08/22 09:45:24 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2019/05/23 19:23:04 rillig Exp $ DISTNAME= courier-${COURIER_VERSION} PKGNAME= ${DISTNAME:S/-/-maildir-/} @@ -57,12 +57,12 @@ CONF_FILES_PERMS+= ${EGDIR}/sharedindexupdate \ SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/sharedindexupdate.sh -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' -SUBST_SED.paths+= -e 's,@MKDIR@,${MKDIR},g' -SUBST_SED.paths+= -e 's,@RM@,${RM},g' -SUBST_SED.paths+= -e 's,@SH@,${SH},g' -SUBST_SED.paths+= -e 's,@TEST@,${TEST},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PKG_SYSCONFDIR +SUBST_VARS.paths+= MKDIR +SUBST_VARS.paths+= RM +SUBST_VARS.paths+= SH +SUBST_VARS.paths+= TEST SUBST_STAGE.paths= pre-configure post-extract: diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile index 8e378bbcdde..5465ad25c5e 100644 --- a/mail/courier-mta/Makefile +++ b/mail/courier-mta/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2018/08/22 09:45:24 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2019/05/23 19:23:04 rillig Exp $ DISTNAME= courier-${COURIER_VERSION} PKGNAME= ${DISTNAME:S/-/-mta-/} @@ -81,7 +81,7 @@ SUBST_STAGE.perms= pre-configure SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/mailer.conf -SUBST_SED.paths+= -e "s,@PREFIX@,${PREFIX},g" +SUBST_VARS.paths= PREFIX SUBST_STAGE.paths= pre-configure REPLACE_PERL+= courier/webadmin/*.pl courier/webadmin/*.pl.in webadmin/*.pl diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile index 75e62289faa..34270d58b23 100644 --- a/mail/deliver/Makefile +++ b/mail/deliver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:23 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:04 rillig Exp $ DISTNAME= deliver-2.1.14 PKGREVISION= 3 @@ -38,7 +38,7 @@ SUBST_STAGE.sources= pre-configure SUBST_MESSAGE.sources= Fixing source code. SUBST_FILES.sources= config.h deliver.8 conf/os-netbsd.h SUBST_SED.sources= -e 's,@DELIVER_CONF_PREFIX@,${PKG_SYSCONFDIR},g' -SUBST_SED.sources+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.sources= PREFIX pre-configure: set -e; cd ${WRKSRC}; \ diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile index 9973183d11b..b2e3a78e2ae 100644 --- a/mail/dkim-milter/Makefile +++ b/mail/dkim-milter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2017/08/01 14:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:05 rillig Exp $ DISTNAME= dkim-milter-2.8.3 PKGREVISION= 5 @@ -40,8 +40,8 @@ SUBST_SED.libs+= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' SUBST_SED.libs+= -e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g' SUBST_SED.libs+= -e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g' SUBST_SED.libs+= -e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g' -SUBST_SED.libs+= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.libs+= -e 's|@PKGMANDIR@|${PKGMANDIR}|g' +SUBST_VARS.libs= PREFIX +SUBST_VARS.libs+= PKGMANDIR SUBST_SED.libs+= -e 's|/etc/mail|${PKG_SYSCONFDIR}|g' SUBST_SED.libs+= -e 's|.I /etc/dkim-filter.conf|.I ${PKG_SYSCONFDIR}/dkim-filter.conf|g' SUBST_MESSAGE.libs= Fixing Makefile references and man pages. diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile index fa09d25b58d..e5c93177e67 100644 --- a/mail/dot-forward/Makefile +++ b/mail/dot-forward/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2017/09/01 04:02:11 schmonz Exp $ +# $NetBSD: Makefile,v 1.27 2019/05/23 19:23:05 rillig Exp $ # DISTNAME= dot-forward-0.71 @@ -22,7 +22,7 @@ INSTALLATION_DIRS= ${PKGMANDIR} SUBST_CLASSES+= paths SUBST_STAGE.paths= do-configure SUBST_FILES.paths= hier.c -SUBST_SED.paths= -e 's,@PKGMANDIR@,${PKGMANDIR},g' +SUBST_VARS.paths= PKGMANDIR .include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 7aa3f3efc8d..66bd901cb8b 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.193 2019/04/03 00:32:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.194 2019/05/23 19:23:05 rillig Exp $ DOVECOT_VERSION= 1.2 DOVECOT_SUBVERSION= .17 @@ -52,7 +52,7 @@ INSTALLATION_DIRS+= libexec/dovecot sbin share/doc/dovecot \ SUBST_CLASSES+= paths SUBST_FILES.paths= dovecot-example.conf -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX SUBST_STAGE.paths= pre-configure BUILD_DEFS+= VARBASE diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 4fbbe5b95c9..83e87c2a062 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2019/04/03 00:32:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.98 2019/05/23 19:23:05 rillig Exp $ DISTNAME= dspam-3.10.2 PKGREVISION= 25 @@ -117,9 +117,9 @@ SUBST_STAGE.conf= pre-install SUBST_FILES.conf= src/dspam.conf.in SUBST_SED.conf= -e "s|@dspam_home@|${DSPAM_HOME}|g" SUBST_SED.conf+= -e "s|@delivery_agent@|${DSPAM_DELIVERY_AGENT_BIN}|g" -SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.conf+= -e "s|@VARBASE@|${VARBASE}|g" -SUBST_SED.conf+= -e "s|@DSPAM_PIDDIR@|${DSPAM_PIDDIR}|g" +SUBST_VARS.conf= PREFIX +SUBST_VARS.conf+= VARBASE +SUBST_VARS.conf+= DSPAM_PIDDIR SUBST_MESSAGE.conf= Fixing configuration file. post-extract: diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index 315e6d6277b..51e5df96517 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2018/08/22 09:45:25 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2019/05/23 19:23:05 rillig Exp $ DISTNAME= exim-3.36 PKGREVISION= 19 @@ -73,12 +73,12 @@ MAKE_ENV+= LOOKUP_LIBS=${LOOKUP_LIBS:Q} SUBST_CLASSES+= paths SUBST_FILES.paths= Local/Makefile.pkgsrc ${WRKDIR}/mailer.conf SUBST_FILES.paths+= ${WRKDIR}/exim_newaliases -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' -SUBST_SED.paths+= -e 's,@GZIP_CMD@,${GZIP_CMD},g' -SUBST_SED.paths+= -e 's,@GZCAT@,${GZCAT},g' -SUBST_SED.paths+= -e 's,@PERL5@,${PERL5},g' -SUBST_SED.paths+= -e 's,@SH@,${SH},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PKG_SYSCONFDIR +SUBST_VARS.paths+= GZIP_CMD +SUBST_VARS.paths+= GZCAT +SUBST_VARS.paths+= PERL5 +SUBST_VARS.paths+= SH SUBST_STAGE.paths= pre-configure INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/examples/exim diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile index abbe39017a1..274863fe5fa 100644 --- a/mail/fastforward/Makefile +++ b/mail/fastforward/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2017/09/01 03:58:45 schmonz Exp $ +# $NetBSD: Makefile,v 1.26 2019/05/23 19:23:05 rillig Exp $ # DISTNAME= fastforward-0.51 @@ -24,7 +24,7 @@ SUBST_FILES.djbware+= cdb_seek.c SUBST_CLASSES+= paths SUBST_STAGE.paths= do-configure SUBST_FILES.paths= hier.c -SUBST_SED.paths= -e 's,@PKGMANDIR@,${PKGMANDIR},g' +SUBST_VARS.paths= PKGMANDIR .include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/fml4/Makefile b/mail/fml4/Makefile index 2b320bfeee9..1cafb5b818b 100644 --- a/mail/fml4/Makefile +++ b/mail/fml4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/04/30 03:38:59 taca Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:05 rillig Exp $ # DISTNAME= fml-4.0-stable-20040215 @@ -35,8 +35,8 @@ REPLACE_PERL= databases/examples/ldap-toymodel/dump.pl \ SUBST_CLASSES+= paths SUBST_FILES.paths+= sbin/makefml -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX:Q},g' -SUBST_SED.paths+= -e 's,@FML_DATADIR@,${FML_DATADIR:Q},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= FML_DATADIR SUBST_STAGE.paths= pre-configure MAKE_ENV+= _PATH_PERL=${PERL5} HOSTNAME="fml.example.net" diff --git a/mail/freepops/Makefile b/mail/freepops/Makefile index c87bb3db81d..c1ccbbcb89d 100644 --- a/mail/freepops/Makefile +++ b/mail/freepops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2018/12/13 19:52:07 adam Exp $ +# $NetBSD: Makefile,v 1.39 2019/05/23 19:23:05 rillig Exp $ # DISTNAME= freepops-0.2.9 @@ -42,9 +42,9 @@ SUBST_CLASSES+= paths SUBST_STAGE.paths= do-configure SUBST_FILES.paths= config.h doc/freepopsd.1 src/freepops.h SUBST_FILES.paths+= src/lua/freepops.lua -SUBST_SED.paths= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.paths+= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' -SUBST_SED.paths+= -e 's|@VARBASE@|${VARBASE}|g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PKG_SYSCONFDIR +SUBST_VARS.paths+= VARBASE SUBST_MESSAGE.paths= Adjusting paths. BUILD_DEFS+= VARBASE diff --git a/mail/imp/Makefile b/mail/imp/Makefile index 16e98f2edaf..406175d9944 100644 --- a/mail/imp/Makefile +++ b/mail/imp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2017/08/16 20:21:10 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2019/05/23 19:23:06 rillig Exp $ DISTNAME= imp-h3-${IMPVER} PKGNAME= imp-${IMPVER} @@ -74,7 +74,7 @@ CONF_FILES_PERMS+= ${IMPDIR}/config/trailer.txt.dist \ SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= imp.conf.dist -SUBST_SED.files= -e "s|@IMPDIR@|${IMPDIR}|g" +SUBST_VARS.files= IMPDIR SUBST_MESSAGE.files= Fixing configuration files. REPLACE_INTERPRETER+= php diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile index f0d566b66ea..074126d44b6 100644 --- a/mail/ingo/Makefile +++ b/mail/ingo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2017/08/16 20:21:10 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2019/05/23 19:23:06 rillig Exp $ DISTNAME= ingo-h3-${INGOVER} PKGNAME= ingo-${INGOVER} @@ -37,7 +37,7 @@ USE_PKGINSTALL= yes SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= ingo.conf.dist -SUBST_SED.files= -e "s|@INGODIR@|${INGODIR}|g" +SUBST_VARS.files= INGODIR SUBST_MESSAGE.files= Fixing configuration files. REPLACE_INTERPRETER+= php diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 4f9c666455a..aeb7d4547d9 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2019/04/26 14:12:41 maya Exp $ +# $NetBSD: Makefile,v 1.87 2019/05/23 19:23:06 rillig Exp $ DISTNAME= mailman-2.1.29 PKGNAME= mailman-2.1.29 @@ -94,8 +94,8 @@ BUILD_DEFS+= MAILMAN_CGIEXT SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/mailman.conf.dist -SUBST_SED.paths+= -e 's,@EXECDIR@,${EXECDIR},g' -SUBST_SED.paths+= -e 's,@MAILMAN_DATADIR@,${MAILMAN_DATADIR},g' +SUBST_VARS.paths= EXECDIR +SUBST_VARS.paths+= MAILMAN_DATADIR SUBST_STAGE.paths= pre-configure DOCFILELIST= ACKNOWLEDGMENTS BUGS FAQ INSTALL NEWS README \ diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile index 10f3ab39f1d..6387d50dea4 100644 --- a/mail/mailsync/Makefile +++ b/mail/mailsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2016/03/05 11:28:49 jperkin Exp $ +# $NetBSD: Makefile,v 1.37 2019/05/23 19:23:06 rillig Exp $ # DISTNAME= mailsync_5.2.1.orig @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --without-krb5 SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure SUBST_FILES.conf= configure doc/examples/mailsync doc/mailsync.1 -SUBST_SED.conf= -e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g" +SUBST_VARS.conf= BUILDLINK_DIR SUBST_SED.conf+= -e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" SUBST_SED.conf+= -e "s|/usr/share|${PREFIX}/share|g" SUBST_MESSAGE.conf= Fixing configure script. diff --git a/mail/mimp/Makefile b/mail/mimp/Makefile index fedf95b53cb..86ff9c83f62 100644 --- a/mail/mimp/Makefile +++ b/mail/mimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/08/16 20:21:10 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/05/23 19:23:06 rillig Exp $ DISTNAME= mimp-h3-${MIMPVER} PKGNAME= mimp-${MIMPVER} @@ -53,7 +53,7 @@ CONF_FILES_PERMS+= ${MIMPDIR}/config/prefs.php.dist \ SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= mimp.conf.dist -SUBST_SED.files= -e "s|@MIMPDIR@|${MIMPDIR}|g" +SUBST_VARS.files= MIMPDIR SUBST_MESSAGE.files= Fixing configuration files. REPLACE_INTERPRETER+= php diff --git a/mail/mush/Makefile b/mail/mush/Makefile index 6ccf3825d14..3adbc2278aa 100644 --- a/mail/mush/Makefile +++ b/mail/mush/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:24 jperkin Exp $ +# $NetBSD: Makefile,v 1.31 2019/05/23 19:23:06 rillig Exp $ DISTNAME= mush-7.2.5 PKGNAME= mush-7.2.6.b4.pl1 @@ -38,7 +38,7 @@ PLAT_MAKEFILE.*= makefile.${LOWER_OPSYS} SUBST_CLASSES+= paths SUBST_FILES.paths= config.h-dist ${PLAT_MAKEFILE} -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX SUBST_SED.paths+= -e 's,@MANDIR@,${PREFIX}/${PKGMANDIR},g' SUBST_STAGE.paths= pre-configure diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile index b0af4b9e26f..f81dc399a47 100644 --- a/mail/newspipe/Makefile +++ b/mail/newspipe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/04/25 07:33:04 maya Exp $ +# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:06 rillig Exp $ # DISTNAME= newspipe.1.1.9 @@ -24,9 +24,9 @@ REPLACE_PYTHON= *.py SUBST_CLASSES+= bin SUBST_STAGE.bin= do-configure SUBST_FILES.bin= newspipe.py newspipe -SUBST_SED.bin= -e 's|@LOCALBASE@|${LOCALBASE}|g' -SUBST_SED.bin+= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.bin+= -e 's|@PYTHONBIN@|${PYTHONBIN}|g' +SUBST_VARS.bin= LOCALBASE +SUBST_VARS.bin+= PREFIX +SUBST_VARS.bin+= PYTHONBIN INSTALLATION_DIRS= bin share/newspipe share/doc/newspipe INSTALLATION_DIRS+= share/examples/newspipe diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile index ac9f2834d17..95d4cf07ea1 100644 --- a/mail/opensmtpd/Makefile +++ b/mail/opensmtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:24 jperkin Exp $ +# $NetBSD: Makefile,v 1.12 2019/05/23 19:23:06 rillig Exp $ VERSION= 5.7.3p2 DISTNAME= opensmtpd-${VERSION} @@ -47,7 +47,7 @@ RCD_SCRIPTS= opensmtpd SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/mailer.conf -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX SUBST_STAGE.paths= pre-configure SUBST_CLASSES+= exampledir diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile index 2bfbc085d64..a71004b0572 100644 --- a/mail/p5-Mail-Ezmlm/Makefile +++ b/mail/p5-Mail-Ezmlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/08/22 09:45:31 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:07 rillig Exp $ # DISTNAME= Ezmlm-0.08.2 @@ -19,8 +19,8 @@ MAKE_ENV+= BSD_BATCH_INSTALL=1 # skip interactive config stage SUBST_CLASSES+= paths SUBST_STAGE.paths= do-configure SUBST_FILES.paths= Ezmlm.pm -SUBST_SED.paths= -e 's|@LOCALBASE@|${LOCALBASE}|g' -SUBST_SED.paths+= -e 's|@QMAILDIR@|${QMAILDIR}|g' +SUBST_VARS.paths= LOCALBASE +SUBST_VARS.paths+= QMAILDIR SUBST_MESSAGE.paths= Configuring paths. PERL5_PACKLIST= auto/Mail/Ezmlm/.packlist diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile index 6bbcd2388e7..3b558a2a134 100644 --- a/mail/pfqueue/Makefile +++ b/mail/pfqueue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:24 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2019/05/23 19:23:07 rillig Exp $ # DISTNAME= pfqueue-0.5.6 @@ -34,7 +34,7 @@ SUBST_CLASSES+= conf SUBST_MESSAGE.conf= Fixing path to config file SUBST_STAGE.conf= pre-configure SUBST_FILES.conf= pfqconfig.c pfqueue.conf.5 -SUBST_SED.conf= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' +SUBST_VARS.conf= PKG_SYSCONFDIR post-install: ${INSTALL_DATA} ${FILESDIR}/pfqueue.conf ${DESTDIR}${PREFIX}/share/examples/pfqueue diff --git a/mail/pfqueue/options.mk b/mail/pfqueue/options.mk index a08a21048a5..670a4caacd4 100644 --- a/mail/pfqueue/options.mk +++ b/mail/pfqueue/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:24 jperkin Exp $ +# $NetBSD: options.mk,v 1.3 2019/05/23 19:23:07 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pfqueue @@ -37,4 +37,4 @@ SUBST_CLASSES+= backends SUBST_STAGE.backends= pre-configure SUBST_MESSAGE.backends= Enabling backends SUBST_FILES.backends= backends/Makefile.in -SUBST_SED.backends= -e 's|@PFQ_BACKENDS@|${PFQ_BACKENDS:Q}|' +SUBST_VARS.backends= PFQ_BACKENDS diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile index 3b536467220..0c83b44a55f 100644 --- a/mail/poppassd/Makefile +++ b/mail/poppassd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/08 12:19:27 asau Exp $ +# $NetBSD: Makefile,v 1.29 2019/05/23 19:23:07 rillig Exp $ # DISTNAME= qpopper${VERSION} @@ -17,7 +17,7 @@ COMMENT= Qualcomm's password change server mainly for Eudora SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure SUBST_FILES.prefix= man/poppassd.8 password/poppassd.c -SUBST_SED.prefix= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.prefix= PREFIX .include "../../mail/qpopper/Makefile.common" diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 6960ff8793f..5b5d638f85f 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.309 2019/04/30 03:41:51 taca Exp $ +# $NetBSD: Makefile,v 1.310 2019/05/23 19:23:07 rillig Exp $ .include "../../mail/postfix/Makefile.common" @@ -48,7 +48,7 @@ CONF_FILES_PERMS= # empty SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/mailer.conf -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX SUBST_STAGE.paths= pre-configure INSTALLATION_DIRS+= ${LIBEXECDIR} ${METADIR} ${SHLIBDIR} ${EXAMPLEDIR} ${DOCDIR} diff --git a/mail/qmqtool/Makefile b/mail/qmqtool/Makefile index 5d26a3acf9a..f9b110b5332 100644 --- a/mail/qmqtool/Makefile +++ b/mail/qmqtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2018/08/22 09:45:34 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:07 rillig Exp $ # DISTNAME= qmqtool-1.15 @@ -25,15 +25,15 @@ BUILD_TARGET= qmqtool SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= src/qmqtool -SUBST_SED.paths+= -e 's,@PS@,${PS},g' -SUBST_SED.paths+= -e 's,@GREP@,${GREP},g' -SUBST_SED.paths+= -e 's,@RCD_SCRIPTS_DIR@,${RCD_SCRIPTS_DIR},g' +SUBST_VARS.paths= PS +SUBST_VARS.paths+= GREP +SUBST_VARS.paths+= RCD_SCRIPTS_DIR SUBST_CLASSES+= users SUBST_STAGE.users= pre-configure SUBST_FILES.users= src/qmqtool -SUBST_SED.users= -e 's,@QMAIL_SEND_USER@,${QMAIL_SEND_USER:Q},g' -SUBST_SED.users+= -e 's,@QMAIL_QUEUE_USER@,${QMAIL_QUEUE_USER:Q},g' +SUBST_VARS.users= QMAIL_SEND_USER +SUBST_VARS.users+= QMAIL_QUEUE_USER INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin INSTALLATION_DIRS+= share/doc/qmqtool share/examples/qmqtool diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index 3bafa670c6d..cf75a42f73a 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2016/03/26 23:52:37 joerg Exp $ +# $NetBSD: Makefile,v 1.70 2019/05/23 19:23:07 rillig Exp $ # DISTNAME= qpopper${VERSION} @@ -44,12 +44,12 @@ PKG_USERS= ${QPOPPER_USER}:${QPOPPER_GROUP} SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure SUBST_FILES.prefix= man/popper.8 -SUBST_SED.prefix= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.prefix= PREFIX SUBST_CLASSES+= sysconf SUBST_STAGE.sysconf= pre-configure SUBST_FILES.sysconf= man/popauth.8 -SUBST_SED.sysconf= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.sysconf= PKG_SYSCONFDIR SUBST_CLASSES+= varbase SUBST_STAGE.varbase= pre-configure diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile index 4a3e7c59c79..606b8b3295c 100644 --- a/mail/queue-fix/Makefile +++ b/mail/queue-fix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2017/04/04 07:46:14 schmonz Exp $ +# $NetBSD: Makefile,v 1.11 2019/05/23 19:23:07 rillig Exp $ # DISTNAME= queue-fix-1.4 @@ -17,14 +17,14 @@ DJB_RESTRICTED= NO SUBST_CLASSES+= groups SUBST_STAGE.groups= do-configure SUBST_FILES.groups= queue-fix.c -SUBST_SED.groups= -e 's,@QMAIL_QMAIL_GROUP@,${QMAIL_QMAIL_GROUP:Q},g' +SUBST_VARS.groups= QMAIL_QMAIL_GROUP SUBST_CLASSES+= users SUBST_STAGE.users= do-configure SUBST_FILES.users= queue-fix.c -SUBST_SED.users+= -e 's,@QMAIL_QUEUE_USER@,${QMAIL_QUEUE_USER:Q},g' -SUBST_SED.users+= -e 's,@QMAIL_REMOTE_USER@,${QMAIL_REMOTE_USER:Q},g' -SUBST_SED.users+= -e 's,@QMAIL_SEND_USER@,${QMAIL_SEND_USER:Q},g' +SUBST_VARS.users= QMAIL_QUEUE_USER +SUBST_VARS.users+= QMAIL_REMOTE_USER +SUBST_VARS.users+= QMAIL_SEND_USER BUILD_DEFS+= QMAIL_QUEUE_USER QMAIL_REMOTE_USER QMAIL_SEND_USER BUILD_DEFS+= QMAIL_QMAIL_GROUP diff --git a/mail/relay-ctrl/Makefile b/mail/relay-ctrl/Makefile index 140d146bfcf..7b20388c9bf 100644 --- a/mail/relay-ctrl/Makefile +++ b/mail/relay-ctrl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/04/27 20:41:26 schmonz Exp $ +# $NetBSD: Makefile,v 1.7 2019/05/23 19:23:08 rillig Exp $ # DISTNAME= relay-ctrl-3.2 @@ -24,11 +24,11 @@ ADDON_SCRIPTS= dovecot-settcpremoteip ifrelayclient SUBST_CLASSES+= paths SUBST_FILES.paths= ${ADDON_SCRIPTS} -SUBST_SED.paths= -e 's,@ECHO@,${ECHO},g' -SUBST_SED.paths+= -e 's,@GREP@,${GREP},g' -SUBST_SED.paths+= -e 's,@SED@,${SED},g' -SUBST_SED.paths+= -e 's,@SETENV@,${SETENV},g' -SUBST_SED.paths+= -e 's,@SH@,${SH},g' +SUBST_VARS.paths= ECHO +SUBST_VARS.paths+= GREP +SUBST_VARS.paths+= SED +SUBST_VARS.paths+= SETENV +SUBST_VARS.paths+= SH SUBST_STAGE.paths= do-configure CFLAGS.SunOS+= -DSOL_TCP=SOL_SOCKET diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile index d57c4d32303..75ae2334e84 100644 --- a/mail/roundcube/Makefile +++ b/mail/roundcube/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2018/05/16 08:14:40 triaxx Exp $ +# $NetBSD: Makefile,v 1.90 2019/05/23 19:23:08 rillig Exp $ DISTNAME= roundcubemail-${RC_VERS} PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/} @@ -72,11 +72,11 @@ SUBST_FILES.files+= config/config.inc.php.sample SUBST_FILES.files+= program/include/iniset.php SUBST_FILES.files+= program/lib/Roundcube/rcube_mime.php SUBST_VARS.files= RCDIR VARBASE PKG_EXAMPLES PKG_SYSCONFBASE PKG_SYSCONFDIR -SUBST_SED.files= -e "s|@RCDIR@|${RCDIR}|g" -SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g" +SUBST_VARS.files+= RCDIR +SUBST_VARS.files+= VARBASE SUBST_SED.files+= -e "s|@PKG_EXAMPLES@|${PREFIX}/share/examples/roundcube|g" -SUBST_SED.files+= -e "s|@PKG_SYSCONFBASE@|${PKG_SYSCONFBASE}|g" -SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.files+= PKG_SYSCONFBASE +SUBST_VARS.files+= PKG_SYSCONFDIR REPLACE_INTERPRETER+= php REPLACE.php.old= /usr/bin/env php diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile index aaaed927434..e72b36e0d6c 100644 --- a/mail/serialmail/Makefile +++ b/mail/serialmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2017/04/08 17:50:33 schmonz Exp $ +# $NetBSD: Makefile,v 1.11 2019/05/23 19:23:08 rillig Exp $ # DISTNAME= serialmail-0.75 @@ -23,7 +23,7 @@ SUBST_FILES.djbware+= leapsecs_read.c SUBST_CLASSES+= paths SUBST_STAGE.paths= do-configure SUBST_FILES.paths= hier.c -SUBST_SED.paths= -e 's,@PKGMANDIR@,${PKGMANDIR},g' +SUBST_VARS.paths= PKGMANDIR .include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 99caa06010e..bc47496abfb 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.133 2019/01/26 18:23:05 abs Exp $ +# $NetBSD: Makefile,v 1.134 2019/05/23 19:23:08 rillig Exp $ DISTNAME= Mail-SpamAssassin-3.4.2 PKGNAME= spamassassin-3.4.2 @@ -132,8 +132,8 @@ SUBST_MESSAGE.sa2= Setting correct paths for pkgsrc (part 1) SUBST_STAGE.sa2= pre-configure SUBST_FILES.sa2= README spamd/spamd.raw SUBST_SED.sa2= -e s!@@PREFIX@@!${PREFIX}!g -SUBST_SED.sa2+= -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g -SUBST_SED.sa2+= -e s!@VARBASE@!${VARBASE}!g +SUBST_VARS.sa2= PKG_SYSCONFDIR +SUBST_VARS.sa2+= VARBASE SUBST_CLASSES+= sa3 SUBST_MESSAGE.sa3= Setting correct paths for pkgsrc (part 2) diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile index 0a62e809d9c..28801491b43 100644 --- a/mail/spamdyke/Makefile +++ b/mail/spamdyke/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2018/07/29 08:41:18 schmonz Exp $ +# $NetBSD: Makefile,v 1.38 2019/05/23 19:23:08 rillig Exp $ # DISTNAME= spamdyke-5.0.1 @@ -21,8 +21,8 @@ MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} SUBST_CLASSES+= paths SUBST_FILES.paths= spamdyke.h -SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX:Q},g' -SUBST_SED.paths+= -e 's,@QMAILDIR@,${QMAILDIR:Q},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= QMAILDIR SUBST_STAGE.paths= do-configure BUILD_DEFS+= QMAILDIR diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index a3c484bad56..682f9b639f3 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2018/08/22 09:45:34 wiz Exp $ +# $NetBSD: Makefile,v 1.136 2019/05/23 19:23:08 rillig Exp $ DISTNAME= squirrelmail-webmail-1.4.23pre14764 PKGNAME= ${DISTNAME:S/-webmail//} @@ -62,9 +62,9 @@ OWN_DIRS_PERMS+= ${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755 SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/squirrelmail.conf.dist SUBST_FILES.paths+= config/config_default.php -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@ATTACHMENTS_DIR@,${ATTACHMENTS_DIR},g' -SUBST_SED.paths+= -e 's,@USER_PREFS_DIR@,${USER_PREFS_DIR},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= ATTACHMENTS_DIR +SUBST_VARS.paths+= USER_PREFS_DIR SUBST_SED.paths+= -e 's,@SMDIR@,${PREFIX}/${SMDIR},g' SUBST_STAGE.paths= pre-configure diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile index 0703c6ad243..43dc2bfc5f1 100644 --- a/mail/ssmtp/Makefile +++ b/mail/ssmtp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2016/03/09 03:24:19 tnn Exp $ +# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:09 rillig Exp $ # # TLS functionality needs testing. Please let me know the result, # and preferably info about your system. @@ -33,7 +33,7 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR} SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/mailer.conf ssmtp.c ssmtp.conf ssmtp.8 -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX SUBST_SED.paths+= -e 's,/etc/ssl/certs,${PKG_SYSCONFDIR},g' SUBST_SED.paths+= -e 's,/etc/ssmtp,${PKG_SYSCONFDIR},g' SUBST_STAGE.paths= pre-configure diff --git a/mail/turba/Makefile b/mail/turba/Makefile index fdd9fc495c5..b7ce26777f8 100644 --- a/mail/turba/Makefile +++ b/mail/turba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2018/08/22 09:45:35 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2019/05/23 19:23:09 rillig Exp $ DISTNAME= turba-h3-${TURBAVER} PKGNAME= turba-${TURBAVER} @@ -38,7 +38,7 @@ BUILD_DEFS= APACHE_USER SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= turba.conf.dist -SUBST_SED.files= -e "s|@TURBADIR@|${TURBADIR}|g" +SUBST_VARS.files= TURBADIR SUBST_MESSAGE.files= Fixing configuration files. REPLACE_INTERPRETER+= php diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile index 0df3c11c1a6..7495246784f 100644 --- a/mail/up-imapproxy/Makefile +++ b/mail/up-imapproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/07/04 13:40:24 jperkin Exp $ +# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:09 rillig Exp $ DISTNAME= up-imapproxy-1.2.5 PKGREVISION= 7 @@ -15,7 +15,7 @@ RCD_SCRIPTS= upimapproxy SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= include/imapproxy.h -SUBST_SED.paths= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.paths= PKG_SYSCONFDIR SUBST_MESSAGE.paths= Fixing hard coded paths. CONF_FILES= ${PREFIX}/share/examples/up-imapproxy/imapproxy.conf \ diff --git a/math/octave/Makefile b/math/octave/Makefile index eb13752c1e4..68b0c00925c 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.187 2019/04/03 00:32:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.188 2019/05/23 19:23:09 rillig Exp $ DISTNAME= octave-5.1.0 PKGREVISION= 2 @@ -71,7 +71,7 @@ SUBST_CLASSES+= fix-make SUBST_STAGE.fix-make= pre-configure SUBST_MESSAGE.fix-make= Fixing path to gmake. SUBST_FILES.fix-make= scripts/pkg/private/configure_make.m -SUBST_SED.fix-make= -e 's:@GMAKE@:${GMAKE}:g' +SUBST_VARS.fix-make= GMAKE SUBST_CLASSES+= qt5-pkg-config SUBST_STAGE.qt5-pkg-config= pre-configure diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 1e52a0317b7..76bfbda9e68 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.109 2019/05/11 22:47:05 kim Exp $ +# $NetBSD: Makefile,v 1.110 2019/05/23 19:23:09 rillig Exp $ DISTNAME= screen-4.6.2 PKGREVISION= 1 @@ -37,7 +37,7 @@ INFO_FILES= YES SUBST_CLASSES+= paths SUBST_FILES.paths= etc/etcscreenrc doc/screen.1 -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_VARS.paths= PKG_SYSCONFDIR SUBST_SED.paths+= -e 's,@EXAMPLES@,${PREFIX}/share/examples/screen,g' SUBST_STAGE.paths= pre-configure diff --git a/net/djbdnscurve6/Makefile b/net/djbdnscurve6/Makefile index 72d331e5d59..72d0361d70f 100644 --- a/net/djbdnscurve6/Makefile +++ b/net/djbdnscurve6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/03/18 20:19:31 schmonz Exp $ +# $NetBSD: Makefile,v 1.3 2019/05/23 19:23:09 rillig Exp $ DISTNAME= djbdnscurve6-34 CATEGORIES= net @@ -27,7 +27,7 @@ SUBST_MESSAGE.etc= Fixing prefix. SUBST_CLASSES+= sysconfdir SUBST_STAGE.sysconfdir= do-configure SUBST_FILES.sysconfdir= src/dnscache-conf.c -SUBST_SED.sysconfdir= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' +SUBST_VARS.sysconfdir= PKG_SYSCONFDIR SUBST_MESSAGE.sysconfdir=Fixing sysconfdir. EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/net/hf6to4/Makefile b/net/hf6to4/Makefile index 1713161cab2..5cecb6694cf 100644 --- a/net/hf6to4/Makefile +++ b/net/hf6to4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/03/21 10:45:18 taca Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:09 rillig Exp $ # DISTNAME= hf6to4-1.3 @@ -29,8 +29,8 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/examples/hf6to4 share/doc/hf6to4 SUBST_CLASSES+= paths SUBST_FILES.paths= hf6to4 -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' -SUBST_SED.paths+= -e 's,@SH@,${SH},g' +SUBST_VARS.paths= PKG_SYSCONFDIR +SUBST_VARS.paths+= SH SUBST_STAGE.paths= pre-install post-extract: diff --git a/net/hping3/Makefile b/net/hping3/Makefile index 89a6455eed7..1a613121123 100644 --- a/net/hping3/Makefile +++ b/net/hping3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2017/06/14 12:17:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:09 rillig Exp $ # DISTNAME= hping3-alpha-2 @@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2 AND original-bsd SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= Makefile.in configure -SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX USE_TOOLS= gmake USE_PKGLOCALEDIR= yes diff --git a/net/icinga-base/Makefile b/net/icinga-base/Makefile index abd1b528246..73ead221eee 100644 --- a/net/icinga-base/Makefile +++ b/net/icinga-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/08/22 09:45:53 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:10 rillig Exp $ # DISTNAME= icinga-1.9.4 @@ -76,7 +76,7 @@ OWN_DIRS_PERMS+=${ICINGADIR}/checkresults ${ICINGA_USER} ${ICINGACMD_GROUP} 0775 SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= icinga.conf.dist -SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.files= PREFIX SUBST_MESSAGE.files= Fixing configuration files. pre-build: diff --git a/net/knot/Makefile b/net/knot/Makefile index 97726da76b4..526eb1f6fac 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/04/25 07:33:11 maya Exp $ +# $NetBSD: Makefile,v 1.44 2019/05/23 19:23:10 rillig Exp $ DISTNAME= knot-2.8.1 PKGREVISION= 1 @@ -51,7 +51,7 @@ PKG_SYSCONFSUBDIR= knot SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKSRC}/samples/Makefile.in SUBST_STAGE.paths= pre-configure -SUBST_SED.paths= -e 's,@EGDIR@,${EGDIR},' +SUBST_VARS.paths= EGDIR CONF_FILES= ${EGDIR}/knot.sample.conf \ ${PKG_SYSCONFDIR}/knot.conf diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 0aab993a701..8e99c69d737 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.127 2019/04/14 21:50:36 jnemeth Exp $ +# $NetBSD: Makefile,v 1.128 2019/05/23 19:23:10 rillig Exp $ DISTNAME= mrtg-2.17.7 #PKGREVISION= 12 @@ -30,7 +30,7 @@ SUBST_CLASSES+= files SUBST_STAGE.files= pre-configure SUBST_FILES.files= ../mrtg.conf.example ../netstat2mrtg \ ../sys2mrtg ../envstat2mrtg -SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.files= PREFIX SUBST_MESSAGE.files= Fixing default configuration files. INSTALLATION_DIRS+= ${EGDIR} libexec diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile index 3ce7775bf24..1196496fd1f 100644 --- a/net/nagios-base/Makefile +++ b/net/nagios-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2018/08/22 09:45:54 wiz Exp $ +# $NetBSD: Makefile,v 1.77 2019/05/23 19:23:10 rillig Exp $ # DISTNAME= nagios-4.3.2 @@ -82,7 +82,7 @@ SPECIAL_PERMS+= share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 06 SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= nagios.conf.dist -SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.files= PREFIX SUBST_MESSAGE.files= Fixing configuration files. pre-build: diff --git a/net/nagstamon/Makefile b/net/nagstamon/Makefile index 2d97d5e40f0..a720a3c94de 100644 --- a/net/nagstamon/Makefile +++ b/net/nagstamon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2019/04/26 14:12:43 maya Exp $ +# $NetBSD: Makefile,v 1.55 2019/05/23 19:23:10 rillig Exp $ VERSION= 1.0.1 DISTNAME= Nagstamon-${VERSION} @@ -29,7 +29,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # py-libxslt, py-ORBit via py-gnome2, py-gtk SUBST_CLASSES+= mandir SUBST_STAGE.mandir= pre-configure -SUBST_SED.mandir= -e s,@PKGMANDIR@,${PKGMANDIR},g +SUBST_VARS.mandir= PKGMANDIR SUBST_FILES.mandir= setup.py # Upstream renamed script from nagstamon to nagstamon.py diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile index b4939c97274..3d7aeb41bdc 100644 --- a/net/netdisco/Makefile +++ b/net/netdisco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2018/08/22 09:45:55 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2019/05/23 19:23:10 rillig Exp $ DISTNAME= netdisco-${PKGVERSION}_with_mibs PKGNAME= netdisco-${PKGVERSION} @@ -87,7 +87,7 @@ SUBST_MESSAGE.path= Fixing hardcoded path. SUBST_STAGE.varbase= pre-configure SUBST_FILES.varbase= netdisco.conf -SUBST_SED.varbase= -e "s|@VARBASE@|${VARBASE}|g" +SUBST_VARS.varbase= VARBASE SUBST_MESSAGE.varbase= Fixing data directory. NETDISCOUSER?= netdisco diff --git a/net/ocsinventory-agent/Makefile b/net/ocsinventory-agent/Makefile index 96360d9e1f4..94e80671b40 100644 --- a/net/ocsinventory-agent/Makefile +++ b/net/ocsinventory-agent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/08/22 09:45:56 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:10 rillig Exp $ # VERS= 1.1.2.1 PKGREVISION= 10 @@ -44,7 +44,7 @@ SUBST_CLASSES+= sysconfdir path varbase apachevers SUBST_STAGE.sysconfdir= pre-configure SUBST_FILES.sysconfdir= lib/Ocsinventory/Agent/Config.pm SUBST_FILES.sysconfdir+= postinst.pl -SUBST_SED.sysconfdir= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_VARS.sysconfdir= PKG_SYSCONFDIR SUBST_MESSAGE.sysconfdir= Fixing hardcoded install directory path. SUBST_STAGE.path= pre-configure diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile index 85052def50a..c6b430c49bc 100644 --- a/net/py-pcap/Makefile +++ b/net/py-pcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/04/26 13:14:10 maya Exp $ +# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:10 rillig Exp $ DISTNAME= pypcap-1.1 PKGNAME= ${PYPKGPREFIX}-pcap-1.1 @@ -20,7 +20,7 @@ SUBST_STAGE.python= pre-configure SUBST_CLASSES+= prefix SUBST_FILES.prefix= Makefile -SUBST_SED.prefix= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.prefix= PREFIX SUBST_STAGE.prefix= pre-configure PYDISTUTILSPKG= yes diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile index 3a167a17100..64546cace2d 100644 --- a/net/rinetd/Makefile +++ b/net/rinetd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:10 rillig Exp $ # DISTNAME= rinetd @@ -22,8 +22,8 @@ RCD_SCRIPTS= rinetd SUBST_CLASSES+= paths SUBST_FILES.paths= rinetd.8 -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PKG_SYSCONFDIR SUBST_STAGE.paths= pre-configure LDFLAGS.SunOS+= -lsocket -lnsl diff --git a/net/ruby-stompserver/Makefile b/net/ruby-stompserver/Makefile index fe6461790ac..ff2e32fff2b 100644 --- a/net/ruby-stompserver/Makefile +++ b/net/ruby-stompserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2019/05/23 19:23:11 rillig Exp $ DISTNAME= drizztbsd-stompserver-1c7a275 PKGNAME= ${RUBY_PKGPREFIX}-stompserver-1.0.0 @@ -77,13 +77,13 @@ OWN_DIRS_PERMS+= ${ST_ROOT}/${STOMPSERVER_CFGDIR} \ SUBST_CLASSES+= cfg SUBST_STAGE.cfg= pre-configure SUBST_FILES.cfg= config/stompserver.conf -SUBST_SED.cfg= -e 's,@STOMPSERVER_WRKDIR@,${STOMPSERVER_WRKDIR},g' -SUBST_SED.cfg+= -e 's,@STOMPSERVER_LOGDIR@,${STOMPSERVER_LOGDIR},g' -SUBST_SED.cfg+= -e 's,@STOMPSERVER_PIDFILE@,${STOMPSERVER_PIDFILE},g' -SUBST_SED.cfg+= -e 's,@STOMPSERVER_CFGDIR@,${STOMPSERVER_CFGDIR},g' -SUBST_SED.cfg+= -e 's,@STOMPSERVER_STORAGE@,${STOMPSERVER_STORAGE},g' -SUBST_SED.cfg+= -e 's,@STOMPSERVER_USER@,${STOMPSERVER_USER},g' -SUBST_SED.cfg+= -e 's,@STOMPSERVER_GROUP@,${STOMPSERVER_GROUP},g' +SUBST_VARS.cfg= STOMPSERVER_WRKDIR +SUBST_VARS.cfg+= STOMPSERVER_LOGDIR +SUBST_VARS.cfg+= STOMPSERVER_PIDFILE +SUBST_VARS.cfg+= STOMPSERVER_CFGDIR +SUBST_VARS.cfg+= STOMPSERVER_STORAGE +SUBST_VARS.cfg+= STOMPSERVER_USER +SUBST_VARS.cfg+= STOMPSERVER_GROUP FILES_SUBST+= STOMPSERVER_RCD_CFG=${ST_ROOT}/${STOMPSERVER_CFGDIR} FILES_SUBST+= STOMPSERVER_RCD_PID=${ST_ROOT}/${STOMPSERVER_PIDFILE} diff --git a/net/scapy/Makefile b/net/scapy/Makefile index e50f45e3d1b..b495e17a2ed 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/04/26 13:14:10 maya Exp $ +# $NetBSD: Makefile,v 1.27 2019/05/23 19:23:11 rillig Exp $ DISTNAME= scapy-2.3.2 PKGREVISION= 1 @@ -29,7 +29,7 @@ CONF_FILES= ${PREFIX}/share/examples/scapy/ethertypes \ SUBST_CLASSES+= config SUBST_STAGE.config= pre-configure SUBST_FILES.config= scapy/data.py setup.py -SUBST_SED.config= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.config= PKG_SYSCONFDIR SUBST_SED.config+= -e "s|share/man|${PKGMANDIR}|g" SUBST_MESSAGE.config= Fixing paths. diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile index 749afd7691f..5c60065d3dc 100644 --- a/net/smokeping/Makefile +++ b/net/smokeping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2018/08/22 09:46:07 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2019/05/23 19:23:11 rillig Exp $ DISTNAME= smokeping-2.6.7 PKGREVISION= 7 @@ -52,11 +52,11 @@ SUBST_STAGE.files= pre-configure SUBST_FILES.files= etc/config.dist.in bin/smokeping \ bin/smokeping_cgi bin/tSmoke \ htdocs/Makefile.in smokeping.conf -SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g" -SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" -SUBST_SED.files+= -e "s|@INTERP@|${INTERP}|g" -SUBST_SED.files+= -e "s|@SPDIR@|${SPDIR}|g" +SUBST_VARS.files= PREFIX +SUBST_VARS.files+= VARBASE +SUBST_VARS.files+= PKG_SYSCONFDIR +SUBST_VARS.files+= INTERP +SUBST_VARS.files+= SPDIR SUBST_MESSAGE.files= Fixing configuration files. SUBST_CLASSES+= libs diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile index 06288dd4dbf..a6127e7dd3e 100644 --- a/net/tinyfugue/Makefile +++ b/net/tinyfugue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2017/01/19 18:52:21 agc Exp $ +# $NetBSD: Makefile,v 1.34 2019/05/23 19:23:11 rillig Exp $ DISTNAME= tf-40s1 PKGNAME= tf-4.0s1 @@ -26,7 +26,7 @@ SUBST_CLASSES+= fix-paths SUBST_MESSAGE.fix-paths= late-addition DESTDIR SUBST_STAGE.fix-paths= pre-configure SUBST_FILES.fix-paths= unix/Config -SUBST_SED.fix-paths= -e 's,@DESTDIR@,'${DESTDIR}',g' +SUBST_VARS.fix-paths= DESTDIR LDFLAGS.SunOS+= -lz diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile index 4bcffb647bb..fa2fc1d4f6a 100644 --- a/net/tsocks/Makefile +++ b/net/tsocks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/04/06 21:07:34 rodent Exp $ +# $NetBSD: Makefile,v 1.18 2019/05/23 19:23:11 rillig Exp $ # DISTNAME= tsocks-1.8beta5 @@ -26,8 +26,8 @@ SUBST_CLASSES+= tsocks SUBST_STAGE.tsocks= post-configure SUBST_MESSAGE.tsocks= Generating tsocks wrapper script. SUBST_FILES.tsocks= tsocks -SUBST_SED.tsocks= -e "s|@SH@|${SH}|g" -SUBST_SED.tsocks+= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.tsocks= SH +SUBST_VARS.tsocks+= PREFIX INSTALLATION_DIRS+= ${EGDIR} diff --git a/net/vnc/Makefile b/net/vnc/Makefile index 0eac5b7203e..e2858cc78a6 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2018/08/22 09:46:08 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2019/05/23 19:23:11 rillig Exp $ DISTNAME= vnc-3.3.3r2 PKGNAME= vnc-3.3.3.2 @@ -50,7 +50,7 @@ patch-sockets: SUBST_CLASSES+= paths SUBST_FILES.paths= vncserver -SUBST_SED.paths+= -e 's,@X11BASE@,${X11BASE},g' +SUBST_VARS.paths= X11BASE SUBST_STAGE.paths= pre-configure INSTALLATION_DIRS= bin share/doc/vnc diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index f9fb4f1773a..e806c03310a 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2018/08/22 09:46:08 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2019/05/23 19:23:11 rillig Exp $ # DISTNAME= vpnc-0.5.3 @@ -24,12 +24,12 @@ SUBST_MESSAGE.paths= fixing pathnames SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= config.c vpnc-script.in makeman.pl pcf2vpnc SUBST_FILES.paths+= vpnc.8.template vpnc-disconnect -SUBST_SED.paths= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' -SUBST_SED.paths+= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.paths+= -e 's|@PKGMANDIR@|${PKGMANDIR}|g' -SUBST_SED.paths+= -e 's|@VARBASE@|${VARBASE}|g' -SUBST_SED.paths+= -e 's|@PERL5@|${PERL5}|g' -SUBST_SED.paths+= -e 's|@SH@|${SH}|g' +SUBST_VARS.paths= PKG_SYSCONFDIR +SUBST_VARS.paths+= PREFIX +SUBST_VARS.paths+= PKGMANDIR +SUBST_VARS.paths+= VARBASE +SUBST_VARS.paths+= PERL5 +SUBST_VARS.paths+= SH BUILD_DEFS+= VARBASE diff --git a/net/xnap/Makefile b/net/xnap/Makefile index a982d3a9064..abca7d66e22 100644 --- a/net/xnap/Makefile +++ b/net/xnap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/23 17:19:21 asau Exp $ +# $NetBSD: Makefile,v 1.16 2019/05/23 19:23:11 rillig Exp $ # DISTNAME= xnap-2.0 @@ -22,7 +22,7 @@ SUBST_STAGE.path= pre-configure SUBST_MESSAGE.path= fixing java path SUBST_FILES.path= xnap.sh SUBST_SED.path= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME}/,g' -SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.path= PREFIX do-install: ${INSTALL_SCRIPT} ${WRKSRC}/xnap.sh ${DESTDIR}${PREFIX}/bin/xnap diff --git a/net/yale-tftpd/Makefile b/net/yale-tftpd/Makefile index 04b6aaddd39..4a1862c66cf 100644 --- a/net/yale-tftpd/Makefile +++ b/net/yale-tftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/09/12 11:15:12 jperkin Exp $ +# $NetBSD: Makefile,v 1.24 2019/05/23 19:23:11 rillig Exp $ DISTNAME= yale-tftpd-3.0 PKGREVISION= 6 @@ -26,7 +26,7 @@ SUBST_STAGE.ytftpdman= post-configure SUBST_MESSAGE.ytftpdman= Fixing pathnames references SUBST_FILES.ytftpdman= tftpd.8 SUBST_SED.ytftpdman= -e 's|@ETCDIR@|${PKG_SYSCONFDIR}|g' -SUBST_SED.ytftpdman+= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.ytftpdman= PREFIX INSTALLATION_DIRS= libexec ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 diff --git a/news/flnews/Makefile b/news/flnews/Makefile index e236380c504..0e033895b8a 100644 --- a/news/flnews/Makefile +++ b/news/flnews/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/01/21 12:03:41 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/05/23 19:23:12 rillig Exp $ FLNEWS_VERSION= 0.16 @@ -32,7 +32,7 @@ SUBST_STAGE.edit-config= pre-configure SUBST_MESSAGE.edit-config= Preparing CONFIG file ... SUBST_FILES.edit-config= CONFIG SUBST_SED.edit-config= -e 's,@VERSION@,${FLNEWS_VERSION},g' -SUBST_SED.edit-config+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.edit-config= PREFIX SUBST_SED.edit-config+= -e 's,@MAINT@,${FLNEWS_MAINTAINER},g' SUBST_SED.edit-config+= -e 's,@IP6@,${FLNEWS_OPT_DISABLE_IP6},g' SUBST_SED.edit-config+= -e 's,@NLS@,${FLNEWS_OPT_DISABLE_NLS},g' diff --git a/pkgtools/autoswc/Makefile b/pkgtools/autoswc/Makefile index 57c8a2e325b..bbe61002846 100644 --- a/pkgtools/autoswc/Makefile +++ b/pkgtools/autoswc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2015/11/25 12:52:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:12 rillig Exp $ PKGNAME= autoswc-1.6 CATEGORIES= pkgtools sysutils @@ -29,13 +29,13 @@ SUBST_FILES.build+= config.site SUBST_SED.build= -e 's|@ACLOCAL@|${LOCALBASE}/bin/aclocal|g' SUBST_SED.build+= -e 's|@AUTOCONF@|${LOCALBASE}/bin/autoconf|g' SUBST_SED.build+= -e 's|@AUTOMAKE@|${LOCALBASE}/bin/automake|g' -SUBST_SED.build+= -e 's|@CACHEDIR@|${CACHEDIR}|g' +SUBST_VARS.build= CACHEDIR SUBST_SED.build+= -e 's|@LIBTOOLIZE@|${LOCALBASE}/bin/libtoolize|g' -SUBST_SED.build+= -e 's|@MACHINE_GNU_PLATFORM@|${MACHINE_GNU_PLATFORM}|g' -SUBST_SED.build+= -e 's|@MAKE@|${MAKE}|g' -SUBST_SED.build+= -e 's|@MKCONF@|${MKCONF}|g' -SUBST_SED.build+= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.build+= -e 's|@SH@|${SH}|g' +SUBST_VARS.build+= MACHINE_GNU_PLATFORM +SUBST_VARS.build+= MAKE +SUBST_VARS.build+= MKCONF +SUBST_VARS.build+= PREFIX +SUBST_VARS.build+= SH SUBST_SED.build+= -e 's|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g' INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/autoswc diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile index da85ef31658..7cddc573dda 100644 --- a/pkgtools/dfdisk/Makefile +++ b/pkgtools/dfdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/09/27 23:02:57 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:12 rillig Exp $ # PKGNAME= dfdisk-1.0 @@ -27,12 +27,12 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${EGDIR} SUBST_CLASSES+= paths SUBST_FILES.paths= dfdisk.sh dfdisk.1 dfdisk.conf -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' -SUBST_SED.paths+= -e 's,@PKGVERSION@,${PKGVERSION},g' -SUBST_SED.paths+= -e 's,@PKGBASE@,${PKGBASE},g' -SUBST_SED.paths+= -e 's,@FTP@,${FTP},g' -SUBST_SED.paths+= -e 's,@SH@,${SH},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PKG_SYSCONFDIR +SUBST_VARS.paths+= PKGVERSION +SUBST_VARS.paths+= PKGBASE +SUBST_VARS.paths+= FTP +SUBST_VARS.paths+= SH SUBST_STAGE.paths= pre-install post-extract: diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile index 556198b1f70..998f6e46b7f 100644 --- a/pkgtools/libkver/Makefile +++ b/pkgtools/libkver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2018/07/04 13:40:32 jperkin Exp $ +# $NetBSD: Makefile,v 1.40 2019/05/23 19:23:12 rillig Exp $ PKGNAME= libkver-${VERSION} CATEGORIES= pkgtools @@ -32,8 +32,8 @@ FILES_SUBST+= HAS_SYSCTL=false SUBST_CLASSES+= paths SUBST_FILES.paths= kver/kver.sh kver/kver.8 lib/kver.3 -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 INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8 diff --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile index a46dc65d41c..ecd61124a84 100644 --- a/pkgtools/pkg_alternatives/Makefile +++ b/pkgtools/pkg_alternatives/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:49 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:12 rillig Exp $ # PKGNAME= pkg_alternatives-1.6 @@ -28,14 +28,14 @@ SUBST_STAGE.vars= do-configure SUBST_MESSAGE.vars= Configuring sources. SUBST_FILES.vars= pkg_alternatives.8 pkg_alternatives.sh SUBST_SED.vars= -e 's|@CONFDIR@|${PKG_SYSCONFDIR}|g' -SUBST_SED.vars+= -e 's|@DATADIR@|${DATADIR}|g' -SUBST_SED.vars+= -e 's|@DBDIR@|${DBDIR}|g' -SUBST_SED.vars+= -e 's|@PKGMANDIR@|${PKGMANDIR}|g' -SUBST_SED.vars+= -e 's|@PKG_DBDIR@|${PKG_DBDIR}|g' -SUBST_SED.vars+= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.vars= DATADIR +SUBST_VARS.vars+= DBDIR +SUBST_VARS.vars+= PKGMANDIR +SUBST_VARS.vars+= PKG_DBDIR +SUBST_VARS.vars+= PREFIX SUBST_SED.vars+= -e 's|@ROOT_USER@|${REAL_ROOT_USER}|g' -SUBST_SED.vars+= -e 's|@ID@|${ID}|g' -SUBST_SED.vars+= -e 's|@SH@|${SH}|g' +SUBST_VARS.vars+= ID +SUBST_VARS.vars+= SH INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin diff --git a/pkgtools/pkg_distinst/Makefile b/pkgtools/pkg_distinst/Makefile index 88656567ed5..b8277785abf 100644 --- a/pkgtools/pkg_distinst/Makefile +++ b/pkgtools/pkg_distinst/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2018/08/22 09:46:11 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/05/23 19:23:12 rillig Exp $ PKGNAME= pkg_distinst-0.02 PKGREVISION= 6 @@ -16,9 +16,9 @@ AUTO_MKDIRS= yes SUBST_CLASSES+= di SUBST_STAGE.di= do-configure SUBST_FILES.di= pkg_distinst.pl -SUBST_SED.di= -e 's,@PERL5@,${PERL5},g' -SUBST_SED.di+= -e 's,@PKGSRCDIR@,${PKGSRCDIR},g' -SUBST_SED.di+= -e 's,@MAKE@,${MAKE},g' +SUBST_VARS.di= PERL5 +SUBST_VARS.di+= PKGSRCDIR +SUBST_VARS.di+= MAKE SUBST_MESSAGE.di= Fixing script for installation. do-extract: diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile index bc95963c249..6d6031e0747 100644 --- a/pkgtools/pkg_filecheck/Makefile +++ b/pkgtools/pkg_filecheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2018/08/22 09:46:11 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2019/05/23 19:23:12 rillig Exp $ # PKGNAME= pkg_filecheck-0.4 @@ -27,10 +27,10 @@ INSTALLATION_DIRS= \ SUBST_CLASSES+= paths SUBST_FILES.paths= builddb.pl builddb.1 pkg_filecheck.conf SUBST_FILES.paths+= pkg_filecheck.conf.5 pkg_filecheck.c pkg_filecheck.1 -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@PERL5@,${PERL5},g' -SUBST_SED.paths+= -e 's,@PKG_DBDIR@,${PKG_DBDIR},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PERL5 +SUBST_VARS.paths+= PKG_DBDIR +SUBST_VARS.paths+= PKG_SYSCONFDIR SUBST_STAGE.paths= pre-configure post-extract: diff --git a/pkgtools/pkg_notify/Makefile b/pkgtools/pkg_notify/Makefile index 06dd59fe14e..fe13cb7d34a 100644 --- a/pkgtools/pkg_notify/Makefile +++ b/pkgtools/pkg_notify/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2018/09/27 23:00:48 tnn Exp $ +# $NetBSD: Makefile,v 1.29 2019/05/23 19:23:12 rillig Exp $ PKGNAME= pkg_notify-0.4.6 PKGREVISION= 1 @@ -26,11 +26,11 @@ SUBST_CLASSES+= pkg_notify SUBST_STAGE.pkg_notify= pre-install SUBST_FILES.pkg_notify= pkg_notify SUBST_FILES.pkg_notify+= pkg_notify.1 -SUBST_SED.pkg_notify= -e 's|@PKGSRCDIR@|${PKGSRCDIR}|' -SUBST_SED.pkg_notify+= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.pkg_notify+= -e 's|@MAKE@|${MAKE:Q}|g' +SUBST_VARS.pkg_notify= PKGSRCDIR +SUBST_VARS.pkg_notify+= PREFIX +SUBST_VARS.pkg_notify+= MAKE SUBST_SED.pkg_notify+= -e 's|@PERL@|${PERL5:Q}|g' -SUBST_SED.pkg_notify+= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' +SUBST_VARS.pkg_notify+= PKG_SYSCONFDIR INSTALLATION_DIRS= bin ${EGDIR} ${PKGMANDIR}/man1 diff --git a/pkgtools/pkg_p5up2date/Makefile b/pkgtools/pkg_p5up2date/Makefile index 9776d67c4b0..568cf0c59e3 100644 --- a/pkgtools/pkg_p5up2date/Makefile +++ b/pkgtools/pkg_p5up2date/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2018/08/22 09:46:11 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/05/23 19:23:13 rillig Exp $ PKGNAME= pkg_p5up2date-0.06 PKGREVISION= 4 @@ -28,7 +28,7 @@ SUBST_CLASSES+= pkgsrcdir SUBST_STAGE.pkgsrcdir= pre-configure SUBST_MESSAGE.pkgsrcdir= Recording default path of pkgsrc base directory. SUBST_FILES.pkgsrcdir= pkg_p5up2date.pl -SUBST_SED.pkgsrcdir= -e 's,@PKGSRCDIR@,${PKGSRCDIR},g' +SUBST_VARS.pkgsrcdir= PKGSRCDIR # REPLACE_PERL+= pkg_p5up2date.pl diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile index 6f395abaf94..794df6d06ea 100644 --- a/pkgtools/pkgclean/Makefile +++ b/pkgtools/pkgclean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2018/09/14 16:31:28 leot Exp $ +# $NetBSD: Makefile,v 1.22 2019/05/23 19:23:13 rillig Exp $ PKGNAME= pkgclean-20051116 CATEGORIES= pkgtools @@ -21,8 +21,8 @@ do-install: SUBST_CLASSES+= path SUBST_STAGE.path= pre-configure SUBST_FILES.path= pkgclean.sh pkgclean.1 -SUBST_SED.path+= -e 's,@SH@,${SH},g' -SUBST_SED.path+= -e 's,@PKGSRCDIR@,${PKGSRCDIR},g' +SUBST_VARS.path= SH +SUBST_VARS.path+= PKGSRCDIR SUBST_MESSAGE.path= Adjusting pkgsrc directory. .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkglint4/Makefile b/pkgtools/pkglint4/Makefile index 933fd518248..94b253c8f57 100644 --- a/pkgtools/pkglint4/Makefile +++ b/pkgtools/pkglint4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/08/22 09:46:11 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/05/23 19:23:13 rillig Exp $ PKGNAME= pkglint4-4.164 PKGREVISION= 1 @@ -34,11 +34,11 @@ SUBST_FILES.pkglint+= build.pl pkglint.pl pkglint.t plist-clash.pl .if defined(BATCH) SUBST_SED.pkglint+= -e s\|@PKGSRCDIR@\|/usr/pkgsrc\|g .else -SUBST_SED.pkglint+= -e s\|@PKGSRCDIR@\|${PKGSRCDIR}\|g +SUBST_VARS.pkglint= PKGSRCDIR .endif -SUBST_SED.pkglint+= -e s\|@PREFIX@\|${PREFIX}\|g +SUBST_VARS.pkglint= PREFIX SUBST_SED.pkglint+= -e s\|@DISTVER@\|${PKGNAME:S/pkglint-//}\|g -SUBST_SED.pkglint+= -e s\|@MAKE@\|${MAKE:Q}\|g +SUBST_VARS.pkglint+= MAKE SUBST_SED.pkglint+= -e s\|@PERL@\|${PERL5:Q}\|g SUBST_SED.pkglint+= -e s\|@DATADIR@\|${FILESDIR}\|g diff --git a/pkgtools/pkgsrc-todo/Makefile b/pkgtools/pkgsrc-todo/Makefile index 0cdaba57ccb..41f1ce30670 100644 --- a/pkgtools/pkgsrc-todo/Makefile +++ b/pkgtools/pkgsrc-todo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/08/22 09:46:11 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:13 rillig Exp $ PKGNAME= pkgsrc-todo-1.3 PKGREVISION= 3 @@ -27,10 +27,10 @@ SUBST_FILES.todo+= list_todo.sh SUBST_FILES.todo+= obsolete_todo.pl SUBST_FILES.todo+= obsolete_todo.1 SUBST_SED.todo+= -e s\|pkgsrc/\|${PKGSRCDIR}/\|g -SUBST_SED.todo+= -e s\|@PKGSRCDIR@\|${PKGSRCDIR}\|g +SUBST_VARS.todo= PKGSRCDIR SUBST_SED.todo+= -e s\|@PERL@\|${PERL5:Q}\|g -SUBST_SED.todo+= -e s\|@SED@\|${SED:Q}\|g -SUBST_SED.todo+= -e s\|@PKG_INFO@\|${PKG_INFO:Q}\|g +SUBST_VARS.todo+= SED +SUBST_VARS.todo+= PKG_INFO do-extract: cd ${FILESDIR} && ${CP} add_todo.1 add_todo.pl list_todo.sh \ diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 70bc73d373d..43c5f46eaf6 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2018/08/22 09:46:12 wiz Exp $ +# $NetBSD: Makefile,v 1.90 2019/05/23 19:23:13 rillig Exp $ PKGNAME= url2pkg-2.29 PKGREVISION= 1 @@ -25,13 +25,13 @@ SUBST_CLASSES+= up SUBST_STAGE.up= do-configure SUBST_MESSAGE.up= Replacing variable placeholders SUBST_FILES.up= url2pkg.pl MakeMaker.pm -SUBST_SED.up= -e 's,@MAKE@,'${MAKE:Q}',g' +SUBST_VARS.up= MAKE SUBST_SED.up+= -e 's,@PERL@,${PERL5},g' SUBST_SED.up+= -e 's,@PERLLIBDIR@,${PREFIX}/lib/url2pkg,g' .if defined(BATCH) SUBST_SED.up+= -e 's,@PKGSRCDIR@,/usr/pkgsrc,g' .else -SUBST_SED.up+= -e 's,@PKGSRCDIR@,${PKGSRCDIR},g' +SUBST_VARS.up+= PKGSRCDIR .endif do-install: diff --git a/pkgtools/verifypc/Makefile b/pkgtools/verifypc/Makefile index 371d610d97d..d4693e842f0 100644 --- a/pkgtools/verifypc/Makefile +++ b/pkgtools/verifypc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2018/02/20 02:55:15 dholland Exp $ +# $NetBSD: Makefile,v 1.17 2019/05/23 19:23:13 rillig Exp $ # PKGNAME= verifypc-1.7 @@ -15,8 +15,8 @@ SUBST_CLASSES+= vars SUBST_STAGE.vars= do-configure SUBST_MESSAGE.vars= Configuring sources. SUBST_FILES.vars= * -SUBST_SED.vars= -e s\|@MAKE@\|${MAKE:Q}\|g -SUBST_SED.vars+= -e s\|@SH@\|${SH:Q}\|g +SUBST_VARS.vars= MAKE +SUBST_VARS.vars+= SH INSTALLATION_DIRS= ${PKGMANDIR}/man1 bin diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 09b08b9c74c..6e8c7264c63 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/12/10 07:54:49 leot Exp $ +# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:13 rillig Exp $ .include "../../print/cups/Makefile.common" @@ -113,7 +113,7 @@ OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/cups.pam -SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_VARS.paths= LOCALBASE SUBST_STAGE.paths= pre-configure SUBST_CLASSES+= rpathfix diff --git a/print/cups15/Makefile b/print/cups15/Makefile index 2386fc4a2f5..7a9dabc8674 100644 --- a/print/cups15/Makefile +++ b/print/cups15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2018/08/22 09:46:12 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:13 rillig Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -142,7 +142,7 @@ OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/cups.pam -SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_VARS.paths= LOCALBASE SUBST_STAGE.paths= pre-configure SUBST_CLASSES+= rpathfix diff --git a/print/papersize/Makefile b/print/papersize/Makefile index 6b97296df34..c14f1048655 100644 --- a/print/papersize/Makefile +++ b/print/papersize/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2012/10/08 13:45:43 asau Exp $ +# $NetBSD: Makefile,v 1.30 2019/05/23 19:23:13 rillig Exp $ # DISTNAME= papersize-1.0.8 @@ -18,18 +18,18 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= getpapersize setpapersize -SUBST_SED.paths= -e 's,@SH@,${SH},' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},' -SUBST_SED.paths+= -e 's,@X11BASE@,${X11BASE},' -SUBST_SED.paths+= -e 's,@ECHO@,${ECHO},' -SUBST_SED.paths+= -e 's,@AWK@,${AWK},' -SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},' -SUBST_SED.paths+= -e 's,@SED@,${SED},' -SUBST_SED.paths+= -e 's,@GREP@,${GREP},' -SUBST_SED.paths+= -e 's,@MV@,${MV},' -SUBST_SED.paths+= -e 's,@TR@,${TR},' -SUBST_SED.paths+= -e 's,@RM@,${RM},' -SUBST_SED.paths+= -e 's,@CHMOD@,${CHMOD},' +SUBST_VARS.paths= SH +SUBST_VARS.paths+= PKG_SYSCONFDIR +SUBST_VARS.paths+= X11BASE +SUBST_VARS.paths+= ECHO +SUBST_VARS.paths+= AWK +SUBST_VARS.paths+= LOCALBASE +SUBST_VARS.paths+= SED +SUBST_VARS.paths+= GREP +SUBST_VARS.paths+= MV +SUBST_VARS.paths+= TR +SUBST_VARS.paths+= RM +SUBST_VARS.paths+= CHMOD do-extract: cd ${FILESDIR} && cp setpapersize getpapersize ${WRKSRC}/. diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile index d28ab96f467..e582e1c1a5f 100644 --- a/print/tex-musixtex/Makefile +++ b/print/tex-musixtex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2019/01/25 19:26:55 markd Exp $ +# $NetBSD: Makefile,v 1.40 2019/05/23 19:23:14 rillig Exp $ DISTNAME= musixtex PKGNAME= tex-${DISTNAME}-1.29 @@ -19,7 +19,7 @@ SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Setting paths to commands. SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= bin/musixtex -SUBST_SED.paths= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_VARS.paths= LOCALBASE REPLACE_TEXLUA= bin/musixflx bin/musixtex diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index 8a80b3f282c..a3b333c1bf2 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2018/07/04 13:40:33 jperkin Exp $ +# $NetBSD: Makefile,v 1.87 2019/05/23 19:23:14 rillig Exp $ DISTNAME= xpdf-3.04 CATEGORIES= print @@ -38,8 +38,8 @@ SUBST_CLASSES+= paths #SUBST_FILES.paths= doc/pdffonts.1 doc/pdfimages.1 doc/pdfinfo.1 #SUBST_FILES.paths+= doc/pdftoppm.1 doc/pdftops.1 doc/pdftotext.1 SUBST_FILES.paths+= doc/sample-xpdfrc doc/xpdf.1 doc/xpdfrc.5 -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= PKG_SYSCONFDIR SUBST_STAGE.paths= pre-configure OWN_DIRS= share/xpdf diff --git a/security/Bastille/Makefile b/security/Bastille/Makefile index 842ee60198a..33ed61b9d81 100644 --- a/security/Bastille/Makefile +++ b/security/Bastille/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/08/22 09:46:16 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:14 rillig Exp $ # DISTNAME= Bastille-3.0.9 @@ -34,9 +34,9 @@ SUBST_SED.b+= -e 's,\$$RPM_BUILD_ROOT/var/,${DESTDIR}${VARBASE}/,g' SUBST_CLASSES+= b2 SUBST_STAGE.b2= pre-configure SUBST_FILES.b2= bin/bastille Bastille/API.pm -SUBST_SED.b2= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' -SUBST_SED.b2+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.b2+= -e 's,@VARBASE@,${VARBASE},g' +SUBST_VARS.b2= PKG_SYSCONFDIR +SUBST_VARS.b2+= PREFIX +SUBST_VARS.b2+= VARBASE SUBST_CLASSES+= b3 SUBST_STAGE.b3= pre-configure diff --git a/security/amap/Makefile b/security/amap/Makefile index b49a40a40c4..04b24668f49 100644 --- a/security/amap/Makefile +++ b/security/amap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2017/08/16 20:45:44 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2019/05/23 19:23:14 rillig Exp $ # DISTNAME= amap-5.2 @@ -24,13 +24,13 @@ CONF_FILES+= ${EGDIR}/appdefs.trig ${PKG_SYSCONFDIR}/appdefs.trig SUBST_CLASSES+= conf SUBST_FILES.conf= configure SUBST_STAGE.conf= pre-configure -SUBST_SED.conf= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.conf= PREFIX SUBST_SED.conf+= -e 's|@MANDIR@|${PREFIX}/man|g' -SUBST_SED.conf+= -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g' +SUBST_VARS.conf+= COMPILER_RPATH_FLAG SUBST_SED.conf+= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' -SUBST_SED.conf+= -e "s|@UNAME@|${UNAME}|g" -SUBST_SED.conf+= -e "s|@GREP@|${GREP}|g" -SUBST_SED.conf+= -e "s|@SED@|${SED}|g" +SUBST_VARS.conf+= UNAME +SUBST_VARS.conf+= GREP +SUBST_VARS.conf+= SED SUBST_MESSAGE.conf= Fixing configure script. INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${EGDIR} diff --git a/security/base/Makefile b/security/base/Makefile index 55ce9e0cfdd..e3f289901fa 100644 --- a/security/base/Makefile +++ b/security/base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2018/08/22 09:46:17 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2019/05/23 19:23:14 rillig Exp $ DISTNAME= base-1.4.3.1 PKGREVISION= 13 @@ -60,9 +60,9 @@ BUILD_DEFS+= APACHE_USER APACHE_GROUP SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure SUBST_FILES.conf= base.conf base_conf.php.dist -SUBST_SED.conf= -e "s|@BASE_DIR@|${BASE_DIR}|g" -SUBST_SED.conf+= -e "s|@DBTYPE@|${DBTYPE}|g" -SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_VARS.conf= BASE_DIR +SUBST_VARS.conf+= DBTYPE +SUBST_VARS.conf+= PREFIX SUBST_MESSAGE.conf= Fixing configuration files. INSTALLATION_DIRS= ${BASE_DIR} ${EGDIR} share/doc/base diff --git a/security/cvm/Makefile b/security/cvm/Makefile index cf0bd7fa741..2a9d87d28b2 100644 --- a/security/cvm/Makefile +++ b/security/cvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2017/07/31 20:34:17 schmonz Exp $ +# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:14 rillig Exp $ # DISTNAME= cvm-0.97 @@ -30,7 +30,7 @@ SUBST_MESSAGE.paths= Fixing paths. SUBST_CLASSES+= shlibs SUBST_STAGE.shlibs= do-configure SUBST_FILES.shlibs= INSTHIER -SUBST_SED.shlibs= -e 's|@CVM_LIB_EXT@|${CVM_LIB_EXT}|g' +SUBST_VARS.shlibs= CVM_LIB_EXT SUBST_MESSAGE.shlibs= Fixing shlibs. RCD_SCRIPTS= cvm diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 7c99223de4e..31db4252803 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2019/04/03 14:28:57 adam Exp $ +# $NetBSD: Makefile,v 1.93 2019/05/23 19:23:14 rillig Exp $ DISTNAME= gpgme-1.13.0 CATEGORIES= security @@ -20,7 +20,7 @@ INFO_FILES= yes SUBST_CLASSES+= pthread SUBST_FILES.pthread= src/gpgme-config.in SUBST_SED.pthread+= -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g' -SUBST_SED.pthread+= -e 's,@PTHREAD_CFLAGS@,${PTHREAD_CFLAGS},g' +SUBST_VARS.pthread= PTHREAD_CFLAGS SUBST_STAGE.pthread= pre-configure CPPFLAGS.Darwin= -D_POSIX_C_SOURCE=200809L diff --git a/security/john/Makefile b/security/john/Makefile index a142710d529..1688018779c 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2017/08/24 17:22:58 jperkin Exp $ +# $NetBSD: Makefile,v 1.26 2019/05/23 19:23:14 rillig Exp $ # DISTNAME= john-1.8.0 @@ -73,7 +73,7 @@ INSTALLATION_DIRS= bin share/john SUBST_CLASSES+= john SUBST_STAGE.john= pre-build SUBST_FILES.john= src/params.h -SUBST_SED.john= -e "s+@PREFIX@+${PREFIX}+g" +SUBST_VARS.john= PREFIX do-install: # programs and scripts diff --git a/security/libprelude/Makefile.common b/security/libprelude/Makefile.common index 1a7588e21ab..e6b7882642d 100644 --- a/security/libprelude/Makefile.common +++ b/security/libprelude/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2018/07/04 13:40:34 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.14 2019/05/23 19:23:15 rillig Exp $ # # used by security/libprelude/Makefile # used by security/libprelude-lua/Makefile @@ -52,7 +52,7 @@ MAKE_DIRS_PERMS+= ${PKG_SYSCONFDIR}/profile ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} SUBST_CLASSES+= make SUBST_STAGE.make= pre-configure SUBST_FILES.make= Makefile.in -SUBST_SED.make= -e 's,@EGDIR@,${EGDIR},g' +SUBST_VARS.make= EGDIR INSTALLATION_DIRS= share/examples/libprelude diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile index d4651753db9..341a5eb13b7 100644 --- a/security/logcheck/Makefile +++ b/security/logcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2017/08/16 20:21:14 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/05/23 19:23:15 rillig Exp $ DISTNAME= logcheck-1.1.1 PKGREVISION= 1 @@ -24,8 +24,8 @@ SUBST_STAGE.prefix= pre-configure SUBST_MESSAGE.prefix= Fixing hard-coded paths. SUBST_FILES.prefix= Makefile systems/freebsd/logcheck.sh SUBST_SED.prefix= -e "s+/usr/local+${PREFIX}+g" -SUBST_SED.prefix+= -e "s+@PKG_SYSCONFDIR@+${PKG_SYSCONFDIR}+g" -SUBST_SED.prefix+= -e "s+@TEMPDIR@+${TEMPDIR}+g" +SUBST_VARS.prefix= PKG_SYSCONFDIR +SUBST_VARS.prefix+= TEMPDIR INSTALLATION_DIRS+= bin ${EGDIR} diff --git a/security/lynis/Makefile b/security/lynis/Makefile index 7c1ce6a91e6..bd05746b019 100644 --- a/security/lynis/Makefile +++ b/security/lynis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2018/02/26 17:42:54 sborrill Exp $ +# $NetBSD: Makefile,v 1.6 2019/05/23 19:23:15 rillig Exp $ # DISTNAME= lynis-2.6.2 @@ -17,13 +17,13 @@ SUBST_CLASSES+= libdir SUBST_STAGE.libdir= pre-install SUBST_MESSAGE.libdir= Fixing lib path SUBST_FILES.libdir= lynis -SUBST_SED.libdir= -e "s,@PREFIX@,${PREFIX}," +SUBST_VARS.libdir= PREFIX SUBST_CLASSES+= vardir SUBST_STAGE.vardir= pre-install SUBST_MESSAGE.vardir= Fixing var path SUBST_FILES.vardir= lynis -SUBST_SED.vardir= -e "s,@VARBASE@,${VARBASE}," +SUBST_VARS.vardir= VARBASE SUBST_CLASSES+= confdir SUBST_STAGE.confdir= pre-install diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile index c369c53f8d1..b584c178f12 100644 --- a/security/opendnssec/Makefile +++ b/security/opendnssec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2019/04/03 00:33:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.75 2019/05/23 19:23:15 rillig Exp $ # DISTNAME= opendnssec-1.4.13 @@ -51,7 +51,7 @@ PKG_SYSCONFSUBDIR= opendnssec SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKSRC}/conf/Makefile.in SUBST_STAGE.paths= pre-configure -SUBST_SED.paths= -e 's,@EGDIR@,${EGDIR},' +SUBST_VARS.paths= EGDIR CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE diff --git a/security/pam-tacplus/Makefile b/security/pam-tacplus/Makefile index 7f64aa9ee2b..9aa6e34b030 100644 --- a/security/pam-tacplus/Makefile +++ b/security/pam-tacplus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:34 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:15 rillig Exp $ # DISTNAME= pam_tacplus-1.3.6 @@ -19,7 +19,7 @@ GNU_CONFIGURE=yes SUBST_CLASSES+= egdir SUBST_STAGE.egdir= pre-configure SUBST_FILES.egdir= Makefile.in -SUBST_SED.egdir= -e "s,@EGDIR@,${EGDIR}," +SUBST_VARS.egdir= EGDIR .include "../../mk/pam.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/prelude-correlator/Makefile b/security/prelude-correlator/Makefile index b98096b596c..bb119a72d19 100644 --- a/security/prelude-correlator/Makefile +++ b/security/prelude-correlator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/04/26 14:12:45 maya Exp $ +# $NetBSD: Makefile,v 1.22 2019/05/23 19:23:15 rillig Exp $ DISTNAME= prelude-correlator-0.9.0-beta8 PKGNAME= prelude-correlator-${DISTNAME:S/-beta/beta/:C/.*-//} @@ -38,9 +38,9 @@ SUBST_CLASSES+= code SUBST_STAGE.code= pre-configure SUBST_FILES.code= run-prelude-correlator.c SUBST_FILES.code+= ${WRKSRC}/*.py -SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g' -SUBST_SED.code+= -e 's,@PRELUDE_HOME@,${PRELUDE_HOME},g' +SUBST_VARS.code= PREFIX +SUBST_VARS.code+= PRELUDE_USER +SUBST_VARS.code+= PRELUDE_HOME CONF_FILES+= ${EGDIR}/prelude-correlator.conf ${PKG_SYSCONFDIR}/prelude-correlator/prelude-correlator.conf CONF_FILES+= ${EGDIR}/dshield.dat ${PRELUDE_HOME}/dshield.dat diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile index 8f95dbcde92..f9298eacded 100644 --- a/security/prelude-lml/Makefile +++ b/security/prelude-lml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2018/07/04 13:40:35 jperkin Exp $ +# $NetBSD: Makefile,v 1.43 2019/05/23 19:23:16 rillig Exp $ # DISTNAME= prelude-lml-0.9.15 @@ -51,13 +51,13 @@ FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_GROUP:Q} SUBST_CLASSES+= code SUBST_STAGE.code= pre-configure SUBST_FILES.code= run-prelude-lml.c -SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g' +SUBST_VARS.code= PREFIX +SUBST_VARS.code+= PRELUDE_USER SUBST_CLASSES+= make SUBST_STAGE.make= pre-configure SUBST_FILES.make= Makefile.in -SUBST_SED.make= -e 's,@EGDIR@,${EGDIR},g' +SUBST_VARS.make= EGDIR PKG_SYSCONFSUBDIR= prelude-lml CONF_FILES_PERMS+= ${EGDIR}/plugins.rules ${PKG_SYSCONFDIR}/plugins.rules \ diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index 52bbed97b99..d5e9af61865 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2018/07/04 13:40:35 jperkin Exp $ +# $NetBSD: Makefile,v 1.48 2019/05/23 19:23:16 rillig Exp $ # DISTNAME= prelude-manager-0.9.15 @@ -50,8 +50,8 @@ FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_USER:Q} SUBST_CLASSES+= code SUBST_STAGE.code= pre-configure SUBST_FILES.code= run-prelude-manager.c -SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g' +SUBST_VARS.code= PREFIX +SUBST_VARS.code+= PRELUDE_USER EGDIR= share/examples/prelude-manager/ CONF_FILES+= ${EGDIR}/prelude-manager.conf ${PKG_SYSCONFDIR}/prelude-manager/prelude-manager.conf diff --git a/security/prelude-pflogger/Makefile b/security/prelude-pflogger/Makefile index 936d22565b4..45afa1fc54d 100644 --- a/security/prelude-pflogger/Makefile +++ b/security/prelude-pflogger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:35 jperkin Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:16 rillig Exp $ # DISTNAME= prelude-pflogger-0.9.0-rc2 @@ -45,13 +45,13 @@ MESSAGE_SUBST+= PRELUDE_GROUP=${PRELUDE_GROUP:Q} SUBST_CLASSES+= code SUBST_STAGE.code= pre-configure SUBST_FILES.code= run-prelude-pflogger.c -SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g' +SUBST_VARS.code= PREFIX +SUBST_VARS.code+= PRELUDE_USER SUBST_CLASSES+= make SUBST_STAGE.make= pre-configure SUBST_FILES.make= Makefile.am -SUBST_SED.make= -e 's,@EGDIR@,${EGDIR},g' +SUBST_VARS.make= EGDIR RCD_SCRIPTS= pflogger diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile index 80ce7125878..437b68793ba 100644 --- a/security/py-prewikka/Makefile +++ b/security/py-prewikka/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2019/04/26 13:14:13 maya Exp $ +# $NetBSD: Makefile,v 1.50 2019/05/23 19:23:16 rillig Exp $ DISTNAME= prewikka-${VERSION} PKGNAME= ${PYPKGPREFIX}-prewikka-${VERSION} @@ -44,9 +44,9 @@ PKG_USERS_VARS+= PREWIKKA_USER SUBST_CLASSES+= code SUBST_STAGE.code= pre-configure SUBST_FILES.code= runPrewikka.c -SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.code+= -e 's,@PREWIKKA_USER@,${PREWIKKA_USER},g' -SUBST_SED.code+= -e 's,@PYTHONBIN@,${PYTHONBIN},g' +SUBST_VARS.code= PREFIX +SUBST_VARS.code+= PREWIKKA_USER +SUBST_VARS.code+= PYTHONBIN FILES_SUBST+= PREWIKKA_USER=${PREWIKKA_USER:Q} diff --git a/security/py-tlslite/Makefile b/security/py-tlslite/Makefile index 9c209517256..61888924fce 100644 --- a/security/py-tlslite/Makefile +++ b/security/py-tlslite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2017/07/23 22:30:03 schmonz Exp $ +# $NetBSD: Makefile,v 1.16 2019/05/23 19:23:16 rillig Exp $ DISTNAME= tlslite-0.4.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -24,8 +24,8 @@ REPLACE_PYTHON= setup.py tests/httpsclient.py tests/tlstest.py SUBST_CLASSES+= pyclash SUBST_STAGE.pyclash= do-configure SUBST_FILES.pyclash= setup.py tests/tlstest.py tests/httpsserver.sh -SUBST_SED.pyclash= -e 's|@PYTHONBIN@|${PYTHONBIN}|g' -SUBST_SED.pyclash+= -e 's|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g' +SUBST_VARS.pyclash= PYTHONBIN +SUBST_VARS.pyclash+= PYVERSSUFFIX .include "../../lang/python/distutils.mk" .include "../../lang/python/application.mk" diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile index a8891692039..ca8edd2c0e5 100644 --- a/security/softhsm/Makefile +++ b/security/softhsm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2019/04/03 00:33:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.43 2019/05/23 19:23:16 rillig Exp $ # DISTNAME= softhsm-1.3.7 @@ -25,7 +25,7 @@ EGDIR= ${PREFIX}/share/examples/softhsm SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKSRC}/Makefile.in SUBST_STAGE.paths= pre-configure -SUBST_SED.paths= -e 's,@EGDIR@,${EGDIR},' +SUBST_VARS.paths= EGDIR CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index b08d8394fb9..9698da46709 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/04/26 13:14:14 maya Exp $ +# $NetBSD: Makefile,v 1.24 2019/05/23 19:23:16 rillig Exp $ DISTNAME= ansible-1.9.4 PKGREVISION= 2 @@ -37,9 +37,9 @@ SUBST_FILES.prefix+= lib/ansible/modules/extras/packaging/os/pkgin.py SUBST_FILES.prefix+= plugins/README.md plugins/inventory/cobbler.py SUBST_FILES.prefix+= plugins/inventory/collins.py SUBST_MESSAGE.prefix= Fixing PREFIX path. -SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX}," -SUBST_SED.prefix+= -e "s,@PKG_SYSCONFBASE@,${PKG_SYSCONFBASE}," -SUBST_SED.prefix+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR}," +SUBST_VARS.prefix= PREFIX +SUBST_VARS.prefix+= PKG_SYSCONFBASE +SUBST_VARS.prefix+= PKG_SYSCONFDIR SUBST_CLASSES+= pythonbin SUBST_STAGE.pythonbin= pre-configure diff --git a/sysutils/atitvout/Makefile b/sysutils/atitvout/Makefile index 552806e0f10..4694ca2004c 100644 --- a/sysutils/atitvout/Makefile +++ b/sysutils/atitvout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/07/10 10:45:40 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2019/05/23 19:23:16 rillig Exp $ DISTNAME= atitvout-0.4 PKGREVISION= 1 @@ -33,7 +33,7 @@ REPLACE_FILES.bash= test.sh SUBST_CLASSES+= sh SUBST_STAGE.sh= pre-configure SUBST_FILES.sh= test.sh -SUBST_SED.sh= -e "s,@PREFIX@,${PREFIX}," +SUBST_VARS.sh= PREFIX INSTALLATION_DIRS= sbin share/doc/atitvout diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile index 66b41398c17..8ed5f1b9b06 100644 --- a/sysutils/backuppc/Makefile +++ b/sysutils/backuppc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/08/22 09:46:31 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:17 rillig Exp $ DISTNAME= BackupPC-3.3.1 PKGNAME= ${DISTNAME:tl} @@ -77,13 +77,13 @@ SUBST_FILES.fix-paths+= ${WRKSRC}/build/${PREFIX}/share/BackupPC/lib/BackupPC/L SUBST_FILES.fix-paths+= ${WRKSRC}/backuppc.conf SUBST_FILES.fix-paths+= ${WRKSRC}/cgiwrapper.c SUBST_SED.fix-paths= -e 's,${PREFIX}/share/examples/BackupPC,${PKG_SYSCONFDIR},g' -SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.fix-paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' -SUBST_SED.fix-paths+= -e 's,@APACHE_USER@,${APACHE_USER},g' -SUBST_SED.fix-paths+= -e 's,@APACHE_GROUP@,${APACHE_GROUP},g' -SUBST_SED.fix-paths+= -e 's,@BACKUPPC_USER@,${BACKUPPC_USER},g' -SUBST_SED.fix-paths+= -e 's,@BACKUPPC_GROUP@,${BACKUPPC_GROUP},g' -SUBST_SED.fix-paths+= -e 's,@PERL5@,${PERL5},g' +SUBST_VARS.fix-paths= PREFIX +SUBST_VARS.fix-paths+= PKG_SYSCONFDIR +SUBST_VARS.fix-paths+= APACHE_USER +SUBST_VARS.fix-paths+= APACHE_GROUP +SUBST_VARS.fix-paths+= BACKUPPC_USER +SUBST_VARS.fix-paths+= BACKUPPC_GROUP +SUBST_VARS.fix-paths+= PERL5 FILES_SUBST+= BACKUPPC_USER=${BACKUPPC_USER:Q} BACKUPPC_GROUP=${BACKUPPC_GROUP:Q} diff --git a/sysutils/estd/Makefile b/sysutils/estd/Makefile index 1a68de7a329..2307ae84aad 100644 --- a/sysutils/estd/Makefile +++ b/sysutils/estd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/04/09 11:08:13 sevan Exp $ +# $NetBSD: Makefile,v 1.34 2019/05/23 19:23:17 rillig Exp $ DISTNAME= estd-r11 PKGNAME= estd-0.11 @@ -30,7 +30,7 @@ SUBST_CLASSES+= rcd SUBST_STAGE.rcd= do-configure SUBST_MESSAGE.rcd= Fixing startup script. SUBST_FILES.rcd= estd.sh -SUBST_SED.rcd= -e 's|@PREFIX@|${PREFIX}|' -SUBST_SED.rcd+= -e 's|@ECHO@|${ECHO}|' +SUBST_VARS.rcd= PREFIX +SUBST_VARS.rcd+= ECHO .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile index 141bf8b9ecc..82985a8f053 100644 --- a/sysutils/gnometoaster/Makefile +++ b/sysutils/gnometoaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2018/07/04 13:40:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.30 2019/05/23 19:23:17 rillig Exp $ # DISTNAME= gtoaster1.0Beta5 @@ -23,7 +23,7 @@ LDFLAGS.DragonFly= -lintl SUBST_CLASSES+= paths SUBST_FILES.paths= audio_oss.c -SUBST_SED.paths+= -e 's,@DEVOSSAUDIO@,${DEVOSSAUDIO},g' +SUBST_VARS.paths= DEVOSSAUDIO SUBST_STAGE.paths= pre-configure .include "../../x11/gtk/buildlink3.mk" diff --git a/sysutils/smbldap-tools/Makefile b/sysutils/smbldap-tools/Makefile index 299db7b6438..0d3554bc8d7 100644 --- a/sysutils/smbldap-tools/Makefile +++ b/sysutils/smbldap-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2018/08/22 09:46:40 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:17 rillig Exp $ DISTNAME= smbldap-tools-${VERS} PKGREVISION= 7 @@ -43,10 +43,10 @@ SUBST_CLASSES+= path SUBST_STAGE.path= pre-install SUBST_FILES.path= configure.pl doc/slapd.conf doc/smb.conf SUBST_FILES.path+= smbldap_tools.pm smbldap.conf -SUBST_SED.path= -e "s,@PREFIX@,${PREFIX},g" -SUBST_SED.path+= -e "s,@OPENLDAP_VARDIR@,${OPENLDAP_VARDIR},g" -SUBST_SED.path+= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g" -SUBST_SED.path+= -e "s,@SAMBA_PIDDIR@,${SAMBA_PIDDIR},g" +SUBST_VARS.path= PREFIX +SUBST_VARS.path+= OPENLDAP_VARDIR +SUBST_VARS.path+= PKG_SYSCONFDIR +SUBST_VARS.path+= SAMBA_PIDDIR SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install diff --git a/sysutils/tob/Makefile b/sysutils/tob/Makefile index 6faf4a7963b..7f3669ce40b 100644 --- a/sysutils/tob/Makefile +++ b/sysutils/tob/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2017/09/06 10:40:33 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:17 rillig Exp $ DISTNAME= tob-0.25 PKGREVISION= 2 @@ -24,8 +24,8 @@ SUBST_CLASSES+= confdir SUBST_STAGE.confdir= do-build SUBST_MESSAGE.confdir= Adjusting configuration directory SUBST_FILES.confdir= tob tob.rc -SUBST_SED.confdir= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' -SUBST_SED.confdir+= -e 's|@VARBASE@|${VARBASE}|g' +SUBST_VARS.confdir= PKG_SYSCONFDIR +SUBST_VARS.confdir+= VARBASE BUILD_DEFS+= VARBASE diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index 91216f668d0..823bbff5f6f 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2018/11/14 22:22:28 kleink Exp $ +# $NetBSD: Makefile,v 1.82 2019/05/23 19:23:17 rillig Exp $ DISTNAME= xcdroast-1.18 PKGREVISION= 3 @@ -34,7 +34,7 @@ SUBST_CLASSES+= devossaudio SUBST_STAGE.devossaudio= pre-build SUBST_MESSAGE.devossaudio= Fixing path to audio device. SUBST_FILES.devossaudio= io.c wavplay.c -SUBST_SED.devossaudio= -e "s,@DEVOSSAUDIO@,${DEVOSSAUDIO},g" +SUBST_VARS.devossaudio= DEVOSSAUDIO INSTALLATION_DIRS= ${DOCDIR} SPECIAL_PERMS+= lib/xcdroast/bin/xcdrwrap {REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4711 diff --git a/sysutils/xe-guest-utilities/Makefile b/sysutils/xe-guest-utilities/Makefile index 73d25a538ab..864ed2f9238 100644 --- a/sysutils/xe-guest-utilities/Makefile +++ b/sysutils/xe-guest-utilities/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2018/10/26 09:15:06 sborrill Exp $ +# $NetBSD: Makefile,v 1.13 2019/05/23 19:23:17 rillig Exp $ # # Values from XenServer 7.0 = 7, 0, 0, 125243 @@ -37,16 +37,16 @@ RCD_SCRIPTS= xenguest SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-install SUBST_FILES.paths= ${SRCFILES} -SUBST_SED.paths= -e "s,@VARBASE@,${VARBASE},g" -SUBST_SED.paths+= -e "s,@PREFIX@,${PREFIX},g" +SUBST_VARS.paths= VARBASE +SUBST_VARS.paths+= PREFIX SUBST_CLASSES+= version SUBST_STAGE.version= pre-install SUBST_FILES.version= xe-update-guest-attrs -SUBST_SED.version= -e "s,@XENMAJOR@,${XENMAJOR},g" -SUBST_SED.version+= -e "s,@XENMINOR@,${XENMINOR},g" -SUBST_SED.version+= -e "s,@XENTEENY@,${XENTEENY},g" -SUBST_SED.version+= -e "s,@XENBUILD@,${XENBUILD},g" +SUBST_VARS.version= XENMAJOR +SUBST_VARS.version+= XENMINOR +SUBST_VARS.version+= XENTEENY +SUBST_VARS.version+= XENBUILD INSTALLATION_DIRS= sbin diff --git a/textproc/awf/Makefile b/textproc/awf/Makefile index b35e3472a8f..1fc77e752e5 100644 --- a/textproc/awf/Makefile +++ b/textproc/awf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/04/06 12:04:02 rodent Exp $ +# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:18 rillig Exp $ # DISTNAME= nroff-clone @@ -19,7 +19,7 @@ SUBST_CLASSES+= awflib SUBST_MESSAGE.awflib= Fixing awf library path and awk pathname. SUBST_FILES.awflib= Makefile awf awf.1 SUBST_SED.awflib+= -e 's|/usr/lib/awf|${PREFIX}/share/awf|' -SUBST_SED.awflib+= -e 's|@AWK@|${AWK}|g' +SUBST_VARS.awflib= AWK SUBST_STAGE.awflib= pre-configure INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile index b4d294f3499..921d3568409 100644 --- a/textproc/ruby-rdtool/Makefile +++ b/textproc/ruby-rdtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2017/05/30 14:22:41 taca Exp $ +# $NetBSD: Makefile,v 1.46 2019/05/23 19:23:18 rillig Exp $ DISTNAME= rdtool-0.6.38 PKGREVISION= 2 @@ -14,7 +14,7 @@ CONF_FILES+= ${GEM_LIBDIR}/lib/rd/dot.rd2rc ${PKG_SYSCONFDIR}/dot.rd2rc SUBST_CLASSES+= path SUBST_STAGE.path= post-configure SUBST_FILES.path= bin/rd2 -SUBST_SED.path= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|" +SUBST_VARS.path= PKG_SYSCONFDIR SUBST_MESSAGE.path= Fixing PKG_SYSCONFDIR paths. RUBYGEM_OPTIONS+= --format-executable diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile index 010619bf7ea..1def2a5420b 100644 --- a/textproc/sphinxsearch/Makefile +++ b/textproc/sphinxsearch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/12/15 21:12:24 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:18 rillig Exp $ # DISTNAME= sphinx-2.2.11-release @@ -51,7 +51,7 @@ SUBST_SED.paths+= -e 's,@CONFDIR@/log/searchd.log,${SPHINX_LOG}/searchd.log,g' SUBST_SED.paths+= -e 's,@CONFDIR@,${SPHINX_DIR},g' SUBST_SED.paths+= -e 's,@localstatedir@,${SPHINX_DIR},g' SUBST_SED.paths+= -e 's,@egdir@,${EGDIR},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_VARS.paths= PKG_SYSCONFDIR MAKE_JOBS_SAFE= no diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile index 7f46d8207a2..d16198ee6d0 100644 --- a/time/cardboard-schedule/Makefile +++ b/time/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2017/08/01 17:40:17 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2019/05/23 19:23:18 rillig Exp $ # DISTNAME= cs113ins @@ -49,8 +49,8 @@ INSTALLATION_DIRS= bin lib/cardboard-schedule SUBST_CLASSES+= cs SUBST_STAGE.cs= do-configure SUBST_FILES.cs= csched.sh -SUBST_SED.cs+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.cs+= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_VARS.cs= PREFIX +SUBST_VARS.cs+= LOCALBASE SUBST_SED.cs+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' post-extract: diff --git a/time/kronolith/Makefile b/time/kronolith/Makefile index a34a136afbf..0867e3e2943 100644 --- a/time/kronolith/Makefile +++ b/time/kronolith/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2017/08/16 20:21:16 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/05/23 19:23:18 rillig Exp $ DISTNAME= kronolith-h3-${KRONOLITHVER} PKGNAME= kronolith-${KRONOLITHVER} @@ -50,7 +50,7 @@ USE_PKGINSTALL= YES SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= kronolith.conf.dist -SUBST_SED.files= -e "s|@KRONOLITHDIR@|${KRONOLITHDIR}|g" +SUBST_VARS.files= KRONOLITHDIR SUBST_MESSAGE.files= Fixing configuration files. PKG_USERS_VARS+= APACHE_USER diff --git a/time/leapsunpack/Makefile b/time/leapsunpack/Makefile index 66a1ee5546a..a1e4f262e72 100644 --- a/time/leapsunpack/Makefile +++ b/time/leapsunpack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/08/16 20:45:46 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/05/23 19:23:18 rillig Exp $ # DISTNAME= leapsunpack-0.05 @@ -18,7 +18,7 @@ LDFLAGS.SunOS+= -lsocket -lnsl SUBST_CLASSES+= files SUBST_STAGE.files= do-configure SUBST_FILES.files= leapsinstall.sh -SUBST_SED.files= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.files= PKG_SYSCONFDIR SUBST_MESSAGE.files= Fixing configuration files. INSTALLATION_DIRS= bin share/doc/${PKGBASE} 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 diff --git a/www/apache24/Makefile b/www/apache24/Makefile index c2fa92deb01..4c60dee4d21 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2019/04/05 13:48:38 jperkin Exp $ +# $NetBSD: Makefile,v 1.79 2019/05/23 19:23:19 rillig Exp $ # # When updating this package, make sure that no strings like # "PR 12345" are in the commit message. Upstream likes @@ -119,10 +119,10 @@ SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_MESSAGE.paths= Fixing paths. SUBST_FILES.paths= config.layout Makefile.in support/apxs.in -SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.paths+= -e "s|@VARBASE@|${VARBASE}|g" +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= VARBASE SUBST_SED.paths+= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g" -SUBST_SED.paths+= -e "s|@PAX@|${PAX}|g" +SUBST_VARS.paths+= PAX SUBST_SED.paths+= -e "s|@LOCALBASE@|${PREFIX}|g" SUBST_CLASSES+= apr-lt diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile index dc6aec9dc16..6dd640b6657 100644 --- a/www/aws-demos/Makefile +++ b/www/aws-demos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2018/07/04 13:40:40 jperkin Exp $ +# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:19 rillig Exp $ DISTNAME= aws-${AWS_VERSION} PKGNAME= aws-demos-${AWS_VERSION} @@ -35,7 +35,7 @@ SUBST_CLASSES+= lpath SUBST_STAGE.lpath= pre-configure SUBST_MESSAGE.lpath= Add library path for ldap SUBST_FILES.lpath= demos/test_ldap/test_ldap.gpr -SUBST_SED.lpath= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.lpath= PREFIX DEMO_DIRS+= auth DEMO_DIRS+= autobahn diff --git a/www/awstats/Makefile b/www/awstats/Makefile index 638107c13e5..d367a41bff8 100644 --- a/www/awstats/Makefile +++ b/www/awstats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2018/08/22 09:47:23 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2019/05/23 19:23:20 rillig Exp $ DISTNAME= awstats-7.6 PKGREVISION= 1 @@ -42,9 +42,9 @@ SUBST_FILES.conf= tools/awstats_configure.pl \ tools/awstats_updateall.pl \ wwwroot/cgi-bin/awstats.model.conf \ wwwroot/cgi-bin/awstats.pl -SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.conf+= -e "s|@VARBASE@|${VARBASE}|g" -SUBST_SED.conf+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.conf= PREFIX +SUBST_VARS.conf+= VARBASE +SUBST_VARS.conf+= PKG_SYSCONFDIR SUBST_SED.conf+= -e "s|\"/etc/awstats|\"${PKG_SYSCONFDIR}|g" SUBST_SED.conf+= -e "s|\"/usr/local/awstats/wwwroot|\"${PREFIX}/awstats|g" SUBST_SED.conf+= -e "s|/var/log/httpd/mylog.log|${VARBASE}/log/httpd/access_log|g" diff --git a/www/bannerfilter/Makefile b/www/bannerfilter/Makefile index 7ffdcf9ae27..4d835a17c08 100644 --- a/www/bannerfilter/Makefile +++ b/www/bannerfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/08/22 09:47:23 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:20 rillig Exp $ # DISTNAME= bannerfilter-1.31 @@ -20,7 +20,7 @@ REPLACE_PERL= redirector.pl SUBST_CLASSES+= bf SUBST_STAGE.bf= pre-configure SUBST_FILES.bf= bannerfilter.conf -SUBST_SED.bf= -e s,@SHAREDIR@,${SHAREDIR},g +SUBST_VARS.bf= SHAREDIR INSTALLATION_DIRS= bin ${SHAREDIR}/www ${SHAREDIR}/doc ${SHAREDIR}/data diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile index 54f13999b2d..4924c2215ea 100644 --- a/www/geeklog/Makefile +++ b/www/geeklog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2015/12/13 14:55:35 taca Exp $ +# $NetBSD: Makefile,v 1.46 2019/05/23 19:23:20 rillig Exp $ # DISTNAME= geeklog-${VER} @@ -73,11 +73,11 @@ SUBST_CLASSES+= paths SUBST_FILES.paths+= ${WRKDIR}/README SUBST_FILES.paths+= ${WRKSRC}/emailgeeklogstories SUBST_FILES.paths+= ${WRKDIR}/geeklog.conf -SUBST_SED.paths+= -e 's,@GEEKLOG_BASE@,${GEEKLOG_BASE:Q},g' -SUBST_SED.paths+= -e 's,@GEEKLOG_PUB@,${GEEKLOG_PUB:Q},g' -SUBST_SED.paths+= -e 's,@GEEKLOG_SITESUBDIR@,${GEEKLOG_SITESUBDIR:Q},g' -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g' -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX:Q},g' +SUBST_VARS.paths= GEEKLOG_BASE +SUBST_VARS.paths+= GEEKLOG_PUB +SUBST_VARS.paths+= GEEKLOG_SITESUBDIR +SUBST_VARS.paths+= PKG_SYSCONFDIR +SUBST_VARS.paths+= PREFIX .if empty(GEEKLOG_SITEBASE) SUBST_SED.conf+= -e '/^Alias/s,^,\#,' .endif diff --git a/www/horde/Makefile b/www/horde/Makefile index de160236668..4a0bca02b8a 100644 --- a/www/horde/Makefile +++ b/www/horde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2018/02/21 12:26:45 wiz Exp $ +# $NetBSD: Makefile,v 1.84 2019/05/23 19:23:20 rillig Exp $ DISTNAME= horde-3.3.13 PKGREVISION= 4 @@ -90,7 +90,7 @@ SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= horde.conf.dist config/conf.xml config/conf.xml.dist \ scripts/set_perms.sh -SUBST_SED.files= -e "s|@HORDEDIR@|${HORDEDIR}|g" +SUBST_VARS.files= HORDEDIR SUBST_SED.files+= -e "s|/usr/lib/sendmail|${SENDMAIL}|g" SUBST_SED.files+= -e "s|/bin/sh|${SH}|g" SUBST_MESSAGE.files= Fixing configuration files. diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile index d16688c9df0..bd1af9d945b 100644 --- a/www/htmllint/Makefile +++ b/www/htmllint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2018/08/22 09:47:25 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2019/05/23 19:23:20 rillig Exp $ # DISTNAME= htmllint @@ -32,7 +32,7 @@ SUBST_CLASSES+= hl SUBST_STAGE.hl= pre-configure SUBST_MESSAGE.hl= Setting PREFIX. SUBST_FILES.hl= faq.html htmllintenv htmllint htmllint.caller -SUBST_SED.hl= -e 's!@PREFIX@!${PREFIX}!g' +SUBST_VARS.hl= PREFIX do-install: ${INSTALL_SCRIPT} ${WRKSRC}/htmllint.caller ${DESTDIR}${PREFIX}/bin/htmllint diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile index 08156e41b5b..ad17dc0432a 100644 --- a/www/mediawiki/Makefile +++ b/www/mediawiki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2019/05/08 02:12:07 wen Exp $ +# $NetBSD: Makefile,v 1.76 2019/05/23 19:23:20 rillig Exp $ DISTNAME= mediawiki-${VER}.${PVER} CATEGORIES= www @@ -41,7 +41,7 @@ SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing pathnames in configuration file. SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= ../mediawiki.conf -SUBST_SED.paths= -e "s,@MEDIAWIKI@,${MEDIAWIKI},g" +SUBST_VARS.paths= MEDIAWIKI SUBST_CLASSES+= sh SUBST_STAGE.sh= pre-configure diff --git a/www/moodle/Makefile b/www/moodle/Makefile index 77a6f983a00..1f24727ca98 100644 --- a/www/moodle/Makefile +++ b/www/moodle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2019/03/11 07:52:06 wen Exp $ +# $NetBSD: Makefile,v 1.73 2019/05/23 19:23:20 rillig Exp $ DISTNAME= moodle-3.6.3 CATEGORIES= www @@ -58,8 +58,8 @@ SUBST_CLASSES+= conf SUBST_MESSAGE.conf= Fixing pathnames in configuration file. SUBST_STAGE.conf= pre-configure SUBST_FILES.conf= ../moodle.conf -SUBST_SED.conf= -e "s,@MOODLEDIR@,${MOODLEDIR},g" -SUBST_SED.conf+= -e "s,@MOODLEDATADIR@,${MOODLEDATADIR},g" +SUBST_VARS.conf= MOODLEDIR +SUBST_VARS.conf+= MOODLEDATADIR .if ${PKG_APACHE} == "apache24" SUBST_SED.conf+= -e "/Order allow,deny/d" SUBST_SED.conf+= -e "s,Allow from all,Require all granted,g" diff --git a/www/mserv-php/Makefile b/www/mserv-php/Makefile index 0bcc1212696..a5e7228da69 100644 --- a/www/mserv-php/Makefile +++ b/www/mserv-php/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2016/07/09 13:11:58 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:20 rillig Exp $ # DISTNAME= mserv-php-090 @@ -23,7 +23,7 @@ DOCDIR= ${PREFIX}/share/doc/mserv-php SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/config.php -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX SUBST_STAGE.paths= post-build INSTALLATION_DIRS+= share/mserv-php share/mserv-php/image share/doc/mserv-php diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 0280d2a5dd8..c93c78357b8 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2018/08/22 09:47:57 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2019/05/23 19:23:21 rillig Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src @@ -62,7 +62,7 @@ FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER:Q} SUBST_CLASSES+= paths SUBST_FILES.paths= config -SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' +SUBST_VARS.paths= PKG_SYSCONFDIR SUBST_STAGE.paths= pre-configure .include "options.mk" diff --git a/www/shibboleth-sp/Makefile b/www/shibboleth-sp/Makefile index c9897753479..356caee294a 100644 --- a/www/shibboleth-sp/Makefile +++ b/www/shibboleth-sp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/01/24 16:46:21 perseant Exp $ +# $NetBSD: Makefile,v 1.31 2019/05/23 19:23:21 rillig Exp $ # DISTNAME= shibboleth-sp-2.5.5 @@ -35,8 +35,8 @@ SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKSRC}/configs/Makefile.in SUBST_FILES.paths+= ${WRKSRC}/configs/keygen.sh SUBST_STAGE.paths= pre-configure -SUBST_SED.paths= -e 's,@EGDIR@,${EGDIR},' -SUBST_SED.paths+= -e 's,@SHIB_CONFDIR@,${SHIB_CONFDIR},' +SUBST_VARS.paths= EGDIR +SUBST_VARS.paths+= SHIB_CONFDIR REPLACE_BASH= configs/metagen.sh diff --git a/www/siege/Makefile b/www/siege/Makefile index 2d6648e05ba..42f779cc800 100644 --- a/www/siege/Makefile +++ b/www/siege/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2018/07/04 13:40:42 jperkin Exp $ +# $NetBSD: Makefile,v 1.6 2019/05/23 19:23:21 rillig Exp $ # DISTNAME= siege-3.1.3 @@ -27,7 +27,7 @@ CONF_FILES+= ${EGDIR}/siegerc ${PKG_SYSCONFDIR}/siegerc SUBST_CLASSES+= siege SUBST_STAGE.siege= pre-configure SUBST_FILES.siege= doc/Makefile.am doc/Makefile.in -SUBST_SED.siege+= -e "s|@EGDIR@|${EGDIR}|g" +SUBST_VARS.siege= EGDIR CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --localstatedir=${VARBASE}/log/ diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index e22eda9901c..c59bb432f1d 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2018/08/06 15:54:38 nia Exp $ +# $NetBSD: Makefile,v 1.52 2019/05/23 19:23:21 rillig Exp $ DISTNAME= thttpd-2.29 CATEGORIES= www @@ -33,7 +33,7 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/thttpd ${EGDIR} SUBST_CLASSES+= paths SUBST_FILES.paths= thttpd.conf -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.paths= PREFIX SUBST_STAGE.paths= pre-configure MAKE_JOBS_SAFE= no diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile index 1b97c3c0f79..64f48c00964 100644 --- a/www/tinyproxy/Makefile +++ b/www/tinyproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2018/10/12 13:57:46 adam Exp $ +# $NetBSD: Makefile,v 1.40 2019/05/23 19:23:21 rillig Exp $ DISTNAME= tinyproxy-1.10.0 CATEGORIES= www @@ -39,10 +39,10 @@ CONF_FILES= ${EGDIR}/tinyproxy.conf.default ${PKG_SYSCONFDIR}/tinyproxy.conf SUBST_CLASSES+= docs SUBST_STAGE.docs= pre-configure SUBST_FILES.docs= docs/man5/tinyproxy.conf.txt.in docs/man8/tinyproxy.txt.in etc/tinyproxy.conf.in -SUBST_SED.docs+= -e 's,@TINYPROXY_USER@,${TINYPROXY_USER},g' -SUBST_SED.docs+= -e 's,@TINYPROXY_GROUP@,${TINYPROXY_GROUP},g' -SUBST_SED.docs+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' -SUBST_SED.docs+= -e 's,@VARBASE@,${VARBASE},g' +SUBST_VARS.docs= TINYPROXY_USER +SUBST_VARS.docs+= TINYPROXY_GROUP +SUBST_VARS.docs+= PKG_SYSCONFDIR +SUBST_VARS.docs+= VARBASE INSTALLATION_DIRS= ${EGDIR} share/doc/tinyproxy diff --git a/www/viewvc/Makefile b/www/viewvc/Makefile index f19cca7f168..b509a028fa9 100644 --- a/www/viewvc/Makefile +++ b/www/viewvc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/04/26 14:12:49 maya Exp $ +# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:21 rillig Exp $ DISTNAME= viewvc-1.1.26 PKGREVISION= 1 @@ -37,10 +37,10 @@ SUBST_STAGE.conf= pre-configure SUBST_MESSAGE.conf= Fixing configuration files. SUBST_FILES.conf= conf/viewvc.conf.dist SUBST_FILES.conf+= conf/cvsgraph.conf.dist -SUBST_SED.conf= -e "s|@VIEWVCDIR@|${VIEWVCDIR}|g" -SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.conf+= -e "s|@PHP_OPT@|${PHP_OPT}|g" -SUBST_SED.conf+= -e "s|@CVSGRAPH_OPT@|${CVSGRAPH_OPT}|g" +SUBST_VARS.conf= VIEWVCDIR +SUBST_VARS.conf+= PREFIX +SUBST_VARS.conf+= PHP_OPT +SUBST_VARS.conf+= CVSGRAPH_OPT .if defined(RCS_PKG) && ${RCS_PKG} == "YES" SUBST_SED.conf+= -e "s|@RCS_PREFIX@|${PREFIX}|g" diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index a0c7e05c4a1..e0a97d6c56b 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2018/04/21 13:38:07 wiz Exp $ +# $NetBSD: Makefile,v 1.70 2019/05/23 19:23:21 rillig Exp $ DISTNAME= webalizer-2.21-02-src PKGNAME= webalizer-2.21.2 @@ -28,7 +28,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples ${DOC_SUBDIR} SUBST_CLASSES+= webalizer SUBST_STAGE.webalizer= post-build SUBST_FILES.webalizer= sample.conf webalizer.1 -SUBST_SED.webalizer= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.webalizer= PKG_SYSCONFDIR PKG_OPTIONS_VAR= PKG_OPTIONS.webalizer PKG_SUPPORTED_OPTIONS= bzip2 geoip diff --git a/www/websvn/Makefile b/www/websvn/Makefile index 9558c034a36..eab2dc74029 100644 --- a/www/websvn/Makefile +++ b/www/websvn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/03/16 07:21:26 obache Exp $ +# $NetBSD: Makefile,v 1.24 2019/05/23 19:23:22 rillig Exp $ # DISTNAME= websvn-2.2.1 @@ -31,8 +31,8 @@ SUBST_CLASSES+= conf SUBST_STAGE.conf= do-configure SUBST_MESSAGE.conf= Fixing paths to configuration files. SUBST_FILES.conf= include/setup.php -SUBST_SED.conf= -e "s|@EGDIR@|${EGDIR}|g" -SUBST_SED.conf+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.conf= EGDIR +SUBST_VARS.conf+= PKG_SYSCONFDIR INSTALLATION_DIRS= ${HTTPD_ROOT}/websvn share/examples/websvn diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile index 47af4414663..5344e55b063 100644 --- a/www/wordpress/Makefile +++ b/www/wordpress/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2019/03/16 17:55:04 jklos Exp $ +# $NetBSD: Makefile,v 1.86 2019/05/23 19:23:22 rillig Exp $ DISTNAME= wordpress-${VERSION} VERSION= 5.1.1 @@ -47,7 +47,7 @@ SUBST_CLASSES+= conf SUBST_MESSAGE.conf= Fixing pathnames in configuration file. SUBST_STAGE.conf= pre-configure SUBST_FILES.conf= ../wordpress.conf -SUBST_SED.conf= -e "s,@WPHOME@,${WPHOME},g" +SUBST_VARS.conf= WPHOME .if !empty(PKG_OPTIONS:Map-php) && ${PKG_APACHE} == "apache24" SUBST_SED.conf+= -e "/Order allow,deny/d" SUBST_SED.conf+= -e "s,Allow from all,Require all granted,g" diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index bac5ee3fd8e..e82736e3507 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2018/08/22 09:48:00 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2019/05/23 19:23:22 rillig Exp $ DISTNAME= wwwoffle-2.9j PKGREVISION= 3 @@ -32,7 +32,7 @@ SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. SUBST_FILES.fix-paths= cache/search/namazu/scripts/wwwoffle-namazu SUBST_FILES.fix-paths+= cache/search/hyperestraier/scripts/wwwoffle-estseek -SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g' +SUBST_VARS.fix-paths= PREFIX .include "options.mk" 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" |