From 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 4 Jul 2018 13:40:07 +0000 Subject: *: Move SUBST_STAGE from post-patch to pre-configure Performing substitutions during post-patch breaks tools such as mkpatches, making it very difficult to regenerate correct patches after making changes, and often leading to substituted string replacements being committed. --- comms/asterisk14/options.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'comms/asterisk14') diff --git a/comms/asterisk14/options.mk b/comms/asterisk14/options.mk index 13e1fcc82a5..8a15366a48e 100644 --- a/comms/asterisk14/options.mk +++ b/comms/asterisk14/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2016/10/25 08:17:03 jnemeth Exp $ +# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:11 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp @@ -78,7 +78,7 @@ post-configure: .if !empty(PKG_OPTIONS:Mwebvmail) DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI SUBST_CLASSES+= webvmail -SUBST_STAGE.webvmail= post-patch +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}|" -- cgit v1.2.3