CVS commit: pkgsrc/sysutils/bacula

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue Apr 28 03:48:29 UTC 2020

Modified Files:
        pkgsrc/sysutils/bacula: Makefile.common

Log Message:
sysutils/bacula*: fix substitution for C++ compiler

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


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/sysutils/bacula/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/bacula/Makefile.common
diff -u pkgsrc/sysutils/bacula/Makefile.common:1.70 pkgsrc/sysutils/bacula/Makefile.common:1.71
--- pkgsrc/sysutils/bacula/Makefile.common:1.70 Fri Mar  6 19:48:47 2020
+++ pkgsrc/sysutils/bacula/Makefile.common      Tue Apr 28 03:48:29 2020
@@ -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_SED.egdir=      -e 's,%%EXAMPLESDIR%%,$
 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