[pkgsrc/trunk]: pkgsrc/sysutils/bacula sysutils/bacula*: fix substitution for...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4df01a1f99f
branches:  trunk
changeset: 428448:b4df01a1f99f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Apr 28 03:48:29 2020 +0000

description:
sysutils/bacula*: fix substitution for C++ compiler

The compiler is not guaranteed to be called "g++". It may also be "c++"
or anything else.

diffstat:

 sysutils/bacula/Makefile.common |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 8f6eb3de2385 -r b4df01a1f99f sysutils/bacula/Makefile.common
--- a/sysutils/bacula/Makefile.common   Tue Apr 28 03:04:36 2020 +0000
+++ b/sysutils/bacula/Makefile.common   Tue Apr 28 03:48:29 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.70 2020/03/06 19:48:47 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.71 2020/04/28 03:48:29 rillig Exp $
 #
 # used by sysutils/bacula-clientonly/Makefile
 # used by sysutils/bacula-tray-monitor/Makefile
@@ -57,7 +57,7 @@
 SUBST_CLASSES+=                fixwrap
 SUBST_STAGE.fixwrap=   post-build
 SUBST_FILES.fixwrap=   scripts/bacula_config
-SUBST_SED.fixwrap=     -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g"
+SUBST_SED.fixwrap=     -e "s,${WRAPPER_BINDIR}/[^[:space:]]*,${CXXPATH},g"
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-scriptdir=${PREFIX}/libexec/bacula