[pkgsrc/trunk]: pkgsrc/devel/bugzilla Fixed SUBST sed expression that confuse...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8d01aafd80d
branches:  trunk
changeset: 373434:c8d01aafd80d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Jan 02 00:08:42 2018 +0000

description:
Fixed SUBST sed expression that confused pkglint.

In the text "s|\$diffpath = .*|...|", the dollar is interpreted as a Make
variable, as if it were "s|\${d}iffpath". Since that variable is usually
not defined, the substitution failed to match. Since most systems provide
a diff tool in /usr/bin, this didn't break anything.

The patched version can also handle DIFF=/usr/bin/gdiff or
DIFF=/opt/bin/gnudiff.

diffstat:

 devel/bugzilla/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 7bd38cc8944e -r c8d01aafd80d devel/bugzilla/Makefile
--- a/devel/bugzilla/Makefile   Mon Jan 01 23:47:44 2018 +0000
+++ b/devel/bugzilla/Makefile   Tue Jan 02 00:08:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/03/17 16:26:30 mef Exp $
+# $NetBSD: Makefile,v 1.46 2018/01/02 00:08:42 rillig Exp $
 
 DISTNAME=      bugzilla-5.0.3
 CATEGORIES=    www devel
@@ -105,7 +105,7 @@
 SUBST_STAGE.diff=      post-configure
 SUBST_MESSAGE.diff=    Fixing diff path used for Patch Viewer (Ignore depending on OS)
 SUBST_FILES.diff=      localconfig
-SUBST_SED.diff=                -e "s|\$diffpath = .*|\$diffpath = \'${DIFF}\';|" -e "s|/diff||"
+SUBST_SED.diff=                -e "s|\$$diffpath = .*|\$$diffpath = \'${DIFF:C,/[^/]+$,,}\';|"
 
 INSTALLATION_DIRS+=    ${DOCDIR} ${DOCDIR}/en ${EGDIR} ${BZDIR} ${BZDIR}/Bugzilla
 INSTALLATION_DIRS+=    ${BZDIR}/js ${BZDIR}/lib ${BZDIR}/template ${BZDIR}/skins
@@ -120,7 +120,7 @@
                 BZDIR=${BZDIR}
 
 do-configure:
-       (cd ${WRKSRC}; ./checksetup.pl)
+       cd ${WRKSRC} && ./checksetup.pl
 
 post-extract:
        ${CP} ${FILESDIR}/bugzilla.conf ${WRKSRC}