CVS commit: pkgsrc/devel/bugzilla

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue Jan  2 00:08:42 UTC 2018

Modified Files:
        pkgsrc/devel/bugzilla: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/bugzilla/Makefile

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

Modified files:

Index: pkgsrc/devel/bugzilla/Makefile
diff -u pkgsrc/devel/bugzilla/Makefile:1.45 pkgsrc/devel/bugzilla/Makefile:1.46
--- pkgsrc/devel/bugzilla/Makefile:1.45 Fri Mar 17 16:26:30 2017
+++ pkgsrc/devel/bugzilla/Makefile      Tue Jan  2 00:08:42 2018
@@ -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_CLASSES+=             diff
 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 @@ FILES_SUBST+=   WWWGRP=${APACHE_GROUP} W
                 BZDIR=${BZDIR}
 
 do-configure:
-       (cd ${WRKSRC}; ./checksetup.pl)
+       cd ${WRKSRC} && ./checksetup.pl
 
 post-extract:
        ${CP} ${FILESDIR}/bugzilla.conf ${WRKSRC}