pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc all: replace SUBST_SED with the simpler SUBST_VARS
details: https://anonhg.NetBSD.org/pkgsrc/rev/e7c03434221b
branches: trunk
changeset: 334331:e7c03434221b
user: rillig <rillig%pkgsrc.org@localhost>
date: Thu May 23 19:22:54 2019 +0000
description:
all: replace SUBST_SED with the simpler SUBST_VARS
pkglint -Wall -r --only "substitution command" -F
With manual review and indentation fixes since pkglint doesn't get that
part correct in every case.
diffstat:
archivers/freeze/Makefile | 4 ++--
archivers/ruby-xz/Makefile | 4 ++--
audio/ampache/Makefile | 4 ++--
audio/juke/Makefile | 4 ++--
audio/mt-daapd/Makefile | 10 +++++-----
audio/nas/Makefile | 6 +++---
audio/solfege/Makefile | 10 +++++-----
benchmarks/hbench/Makefile | 6 +++---
cad/qcad/Makefile | 4 ++--
chat/anope/Makefile | 8 ++++----
chat/bitchx/Makefile | 4 ++--
chat/inspircd/Makefile | 6 +++---
chat/psybnc/Makefile | 4 ++--
chat/silc-server/Makefile | 4 ++--
chat/spectrum/Makefile | 4 ++--
comms/asterisk/options.mk | 6 +++---
comms/asterisk13/options.mk | 6 +++---
comms/asterisk14/options.mk | 6 +++---
comms/asterisk15/options.mk | 6 +++---
comms/fidogate/Makefile | 8 ++++----
comms/op_panel/Makefile | 10 +++++-----
converters/wkhtmltopdf/Makefile | 4 ++--
databases/phpmyadmin/Makefile | 6 +++---
databases/unixodbc/Makefile | 6 +++---
devel/apache-ant/Makefile | 4 ++--
devel/apache-ant19/Makefile | 4 ++--
devel/bugzilla/Makefile | 12 ++++++------
devel/bugzilla3/Makefile | 12 ++++++------
devel/glib/Makefile | 4 ++--
devel/gps/Makefile | 4 ++--
devel/gradle/Makefile | 4 ++--
devel/libnet10/Makefile | 4 ++--
devel/mantis/Makefile | 4 ++--
devel/monotone-server/Makefile | 14 +++++++-------
devel/ncc/Makefile | 4 ++--
devel/nss/Makefile | 12 ++++++------
devel/ocaml-findlib/Makefile | 8 ++++----
devel/p5-File-BaseDir/Makefile | 4 ++--
devel/pwlib/Makefile | 8 ++++----
devel/py-jupyter_core/Makefile | 4 ++--
devel/quilt/Makefile | 4 ++--
devel/rt3/Makefile.install | 4 ++--
devel/ruby-mkrf/Makefile | 4 ++--
devel/ruby-redmine/Makefile | 8 ++++----
devel/ruby-redmine/options.mk | 4 ++--
devel/sgb/Makefile | 4 ++--
devel/sloccount/Makefile | 4 ++--
devel/tmake/Makefile | 10 +++++-----
editors/TeXmacs/Makefile | 4 ++--
editors/ce-doc/Makefile | 4 ++--
editors/lpe/Makefile | 4 ++--
emulators/b-em/Makefile | 4 ++--
emulators/dynagen/Makefile | 4 ++--
filesystems/fuse-gmailfs/Makefile | 6 +++---
finance/tclticker/Makefile | 4 ++--
fonts/t1lib/Makefile | 6 +++---
games/0verkill/Makefile | 4 ++--
games/et/Makefile | 6 +++---
games/onscripter/Makefile | 12 ++++++------
games/polyglot/Makefile | 4 ++--
games/xevil/Makefile | 4 ++--
graphics/camlimages/Makefile | 8 ++++----
graphics/circos/Makefile | 4 ++--
graphics/frameworks/Makefile | 4 ++--
graphics/libbpg/Makefile | 4 ++--
graphics/magicpoint/Makefile | 8 ++++----
graphics/xpaint/Makefile | 6 +++---
graphics/xv/Makefile | 4 ++--
lang/clojure/Makefile | 4 ++--
lang/ghc-bootstrap/Makefile | 4 ++--
lang/ghc/Makefile | 4 ++--
lang/mono/Makefile | 4 ++--
lang/mono2/Makefile | 4 ++--
lang/openjdk7/Makefile | 6 +++---
lang/openjdk8/Makefile | 6 +++---
lang/pear/Makefile | 6 +++---
lang/php56/Makefile | 6 +++---
lang/php71/Makefile | 6 +++---
lang/php72/Makefile | 6 +++---
lang/php73/Makefile | 6 +++---
lang/ruby/platform.mk | 4 ++--
lang/sather/Makefile | 16 ++++++++--------
lang/sbcl/Makefile | 6 +++---
lang/scala/Makefile | 6 +++---
lang/tinyscheme/Makefile | 4 ++--
mail/amavisd-new/Makefile | 14 +++++++-------
mail/courier-maildir/Makefile | 14 +++++++-------
mail/courier-mta/Makefile | 4 ++--
mail/deliver/Makefile | 4 ++--
mail/dkim-milter/Makefile | 6 +++---
mail/dot-forward/Makefile | 4 ++--
mail/dovecot/Makefile | 4 ++--
mail/dspam/Makefile | 8 ++++----
mail/exim3/Makefile | 14 +++++++-------
mail/fastforward/Makefile | 4 ++--
mail/fml4/Makefile | 6 +++---
mail/freepops/Makefile | 8 ++++----
mail/imp/Makefile | 4 ++--
mail/ingo/Makefile | 4 ++--
mail/mailman/Makefile | 6 +++---
mail/mailsync/Makefile | 4 ++--
mail/mimp/Makefile | 4 ++--
mail/mush/Makefile | 4 ++--
mail/newspipe/Makefile | 8 ++++----
mail/opensmtpd/Makefile | 4 ++--
mail/p5-Mail-Ezmlm/Makefile | 6 +++---
mail/pfqueue/Makefile | 4 ++--
mail/pfqueue/options.mk | 4 ++--
mail/poppassd/Makefile | 4 ++--
mail/postfix/Makefile | 4 ++--
mail/qmqtool/Makefile | 12 ++++++------
mail/qpopper/Makefile | 6 +++---
mail/queue-fix/Makefile | 10 +++++-----
mail/relay-ctrl/Makefile | 12 ++++++------
mail/roundcube/Makefile | 10 +++++-----
mail/serialmail/Makefile | 4 ++--
mail/spamassassin/Makefile | 6 +++---
mail/spamdyke/Makefile | 6 +++---
mail/squirrelmail/Makefile | 8 ++++----
mail/ssmtp/Makefile | 4 ++--
mail/turba/Makefile | 4 ++--
mail/up-imapproxy/Makefile | 4 ++--
math/octave/Makefile | 4 ++--
misc/screen/Makefile | 4 ++--
net/djbdnscurve6/Makefile | 4 ++--
net/hf6to4/Makefile | 6 +++---
net/hping3/Makefile | 4 ++--
net/icinga-base/Makefile | 4 ++--
net/knot/Makefile | 4 ++--
net/mrtg/Makefile | 4 ++--
net/nagios-base/Makefile | 4 ++--
net/nagstamon/Makefile | 4 ++--
net/netdisco/Makefile | 4 ++--
net/ocsinventory-agent/Makefile | 4 ++--
net/py-pcap/Makefile | 4 ++--
net/rinetd/Makefile | 6 +++---
net/ruby-stompserver/Makefile | 16 ++++++++--------
net/scapy/Makefile | 4 ++--
net/smokeping/Makefile | 12 ++++++------
net/tinyfugue/Makefile | 4 ++--
net/tsocks/Makefile | 6 +++---
net/vnc/Makefile | 4 ++--
net/vpnc/Makefile | 14 +++++++-------
net/xnap/Makefile | 4 ++--
net/yale-tftpd/Makefile | 4 ++--
news/flnews/Makefile | 4 ++--
pkgtools/autoswc/Makefile | 14 +++++++-------
pkgtools/dfdisk/Makefile | 14 +++++++-------
pkgtools/libkver/Makefile | 6 +++---
pkgtools/pkg_alternatives/Makefile | 16 ++++++++--------
pkgtools/pkg_distinst/Makefile | 8 ++++----
pkgtools/pkg_filecheck/Makefile | 10 +++++-----
pkgtools/pkg_notify/Makefile | 10 +++++-----
pkgtools/pkg_p5up2date/Makefile | 4 ++--
pkgtools/pkgclean/Makefile | 6 +++---
pkgtools/pkglint4/Makefile | 8 ++++----
pkgtools/pkgsrc-todo/Makefile | 8 ++++----
pkgtools/url2pkg/Makefile | 6 +++---
pkgtools/verifypc/Makefile | 6 +++---
print/cups-base/Makefile | 4 ++--
print/cups15/Makefile | 4 ++--
print/papersize/Makefile | 26 +++++++++++++-------------
print/tex-musixtex/Makefile | 4 ++--
print/xpdf/Makefile | 6 +++---
security/Bastille/Makefile | 8 ++++----
security/amap/Makefile | 12 ++++++------
security/base/Makefile | 8 ++++----
security/cvm/Makefile | 4 ++--
security/gpgme/Makefile | 4 ++--
security/john/Makefile | 4 ++--
security/libprelude/Makefile.common | 4 ++--
security/logcheck/Makefile | 6 +++---
security/lynis/Makefile | 6 +++---
security/opendnssec/Makefile | 4 ++--
security/pam-tacplus/Makefile | 4 ++--
security/prelude-correlator/Makefile | 8 ++++----
security/prelude-lml/Makefile | 8 ++++----
security/prelude-manager/Makefile | 6 +++---
security/prelude-pflogger/Makefile | 8 ++++----
security/py-prewikka/Makefile | 8 ++++----
security/py-tlslite/Makefile | 6 +++---
security/softhsm/Makefile | 4 ++--
sysutils/ansible/Makefile | 8 ++++----
sysutils/atitvout/Makefile | 4 ++--
sysutils/backuppc/Makefile | 16 ++++++++--------
sysutils/estd/Makefile | 6 +++---
sysutils/gnometoaster/Makefile | 4 ++--
sysutils/smbldap-tools/Makefile | 10 +++++-----
sysutils/tob/Makefile | 6 +++---
sysutils/xcdroast/Makefile | 4 ++--
sysutils/xe-guest-utilities/Makefile | 14 +++++++-------
textproc/awf/Makefile | 4 ++--
textproc/ruby-rdtool/Makefile | 4 ++--
textproc/sphinxsearch/Makefile | 4 ++--
time/cardboard-schedule/Makefile | 6 +++---
time/kronolith/Makefile | 4 ++--
time/leapsunpack/Makefile | 4 ++--
wm/awesome/Makefile | 4 ++--
wm/compiz/Makefile | 4 ++--
wm/enlightenment/Makefile | 8 ++++----
wm/fvwm-devel/Makefile | 4 ++--
wm/golem/Makefile | 4 ++--
wm/larswm/Makefile | 4 ++--
wm/mlvwm/Makefile | 4 ++--
wm/musca/Makefile | 4 ++--
www/apache24/Makefile | 8 ++++----
www/aws-demos/Makefile | 4 ++--
www/awstats/Makefile | 8 ++++----
www/bannerfilter/Makefile | 4 ++--
www/geeklog/Makefile | 12 ++++++------
www/horde/Makefile | 4 ++--
www/htmllint/Makefile | 4 ++--
www/mediawiki/Makefile | 4 ++--
www/moodle/Makefile | 6 +++---
www/mserv-php/Makefile | 4 ++--
www/privoxy/Makefile | 4 ++--
www/shibboleth-sp/Makefile | 6 +++---
www/siege/Makefile | 4 ++--
www/thttpd/Makefile | 4 ++--
www/tinyproxy/Makefile | 10 +++++-----
www/viewvc/Makefile | 10 +++++-----
www/webalizer/Makefile | 4 ++--
www/websvn/Makefile | 6 +++---
www/wordpress/Makefile | 4 ++--
www/wwwoffle/Makefile | 4 ++--
x11/alacarte/Makefile | 6 +++---
x11/avant-window-navigator/Makefile | 4 ++--
x11/gnome-screensaver/Makefile | 4 ++--
x11/kde-runtime4/Makefile | 4 ++--
x11/kde-workspace4/Makefile | 4 ++--
x11/kdelibs4/Makefile | 4 ++--
x11/py-qt5/Makefile | 4 ++--
x11/py-sip/Makefile.common | 4 ++--
x11/ruby-wxruby/Makefile | 4 ++--
x11/slim/Makefile | 8 ++++----
x11/wxGTK28/Makefile.common | 4 ++--
x11/wxGTK30/Makefile | 4 ++--
x11/xcolorsel/Makefile | 6 +++---
x11/xpns/Makefile | 4 ++--
x11/xteddy2/Makefile | 4 ++--
x11/xview-clients/Makefile | 6 +++---
x11/xworld/Makefile | 4 ++--
242 files changed, 728 insertions(+), 728 deletions(-)
diffs (truncated from 4905 to 300 lines):
diff -r d6075fee4d83 -r e7c03434221b archivers/freeze/Makefile
--- a/archivers/freeze/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/archivers/freeze/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b archivers/ruby-xz/Makefile
--- a/archivers/ruby-xz/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/archivers/ruby-xz/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b audio/ampache/Makefile
--- a/audio/ampache/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/audio/ampache/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b audio/juke/Makefile
--- a/audio/juke/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/audio/juke/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b audio/mt-daapd/Makefile
--- a/audio/mt-daapd/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/audio/mt-daapd/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b audio/nas/Makefile
--- a/audio/nas/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/audio/nas/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b audio/solfege/Makefile
--- a/audio/solfege/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/audio/solfege/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b benchmarks/hbench/Makefile
--- a/benchmarks/hbench/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/benchmarks/hbench/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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_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 -r d6075fee4d83 -r e7c03434221b cad/qcad/Makefile
--- a/cad/qcad/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/cad/qcad/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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_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 -r d6075fee4d83 -r e7c03434221b chat/anope/Makefile
--- a/chat/anope/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/chat/anope/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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_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 -r d6075fee4d83 -r e7c03434221b chat/bitchx/Makefile
--- a/chat/bitchx/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/chat/bitchx/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b chat/inspircd/Makefile
--- a/chat/inspircd/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/chat/inspircd/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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_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 -r d6075fee4d83 -r e7c03434221b chat/psybnc/Makefile
--- a/chat/psybnc/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/chat/psybnc/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b chat/silc-server/Makefile
--- a/chat/silc-server/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/chat/silc-server/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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 @@
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 -r d6075fee4d83 -r e7c03434221b chat/spectrum/Makefile
--- a/chat/spectrum/Makefile Thu May 23 17:39:53 2019 +0000
+++ b/chat/spectrum/Makefile Thu May 23 19:22:54 2019 +0000
@@ -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_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 -r d6075fee4d83 -r e7c03434221b comms/asterisk/options.mk
--- a/comms/asterisk/options.mk Thu May 23 17:39:53 2019 +0000
+++ b/comms/asterisk/options.mk Thu May 23 19:22:54 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2018/07/04 13:40:11 jperkin Exp $
Home |
Main Index |
Thread Index |
Old Index