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 /comms | |
parent | afe0216c35d9e0e0b96fe80eb38badf368ef84a7 (diff) | |
download | pkgsrc-cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5.tar.gz |
all: replace SUBST_SED with the simpler SUBST_VARS
pkglint -Wall -r --only "substitution command" -F
With manual review and indentation fixes since pkglint doesn't get that
part correct in every case.
Diffstat (limited to 'comms')
-rw-r--r-- | comms/asterisk/options.mk | 6 | ||||
-rw-r--r-- | comms/asterisk13/options.mk | 6 | ||||
-rw-r--r-- | comms/asterisk14/options.mk | 6 | ||||
-rw-r--r-- | comms/asterisk15/options.mk | 6 | ||||
-rw-r--r-- | comms/fidogate/Makefile | 8 | ||||
-rw-r--r-- | comms/op_panel/Makefile | 10 |
6 files changed, 21 insertions, 21 deletions
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} |