diff options
| author | rillig <rillig@pkgsrc.org> | 2018-01-02 00:08:42 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2018-01-02 00:08:42 +0000 |
| commit | 6d0abb1224966e6b71eece50acb8a0210e8d98b7 (patch) | |
| tree | 4c05f22f303ee7165cf93684366baea155386a05 /devel/bugzilla | |
| parent | aff0f16c629cde9bc359237cef3646f868df8459 (diff) | |
| download | pkgsrc-6d0abb1224966e6b71eece50acb8a0210e8d98b7.tar.gz | |
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 (limited to 'devel/bugzilla')
| -rw-r--r-- | devel/bugzilla/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile index fa1bc78c16e..a9a9ea37f33 100644 --- a/devel/bugzilla/Makefile +++ b/devel/bugzilla/Makefile @@ -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} WWWOWN=${APACHE_USER} \ BZDIR=${BZDIR} do-configure: - (cd ${WRKSRC}; ./checksetup.pl) + cd ${WRKSRC} && ./checksetup.pl post-extract: ${CP} ${FILESDIR}/bugzilla.conf ${WRKSRC} |