CVS commit: pkgsrc/devel/bugzilla3

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Jul  9 13:21:05 UTC 2016

Modified Files:
        pkgsrc/devel/bugzilla3: Makefile options.mk

Log Message:
Fixed some pkglint warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/bugzilla3/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/bugzilla3/options.mk

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

Modified files:

Index: pkgsrc/devel/bugzilla3/Makefile
diff -u pkgsrc/devel/bugzilla3/Makefile:1.24 pkgsrc/devel/bugzilla3/Makefile:1.25
--- pkgsrc/devel/bugzilla3/Makefile:1.24        Sat Jul  9 06:38:05 2016
+++ pkgsrc/devel/bugzilla3/Makefile     Sat Jul  9 13:21:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/07/09 06:38:05 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2016/07/09 13:21:05 rillig Exp $
 
 DISTNAME=      bugzilla-3.2.4
 PKGREVISION=   8
@@ -32,7 +32,7 @@ PERL5_REQD+=  5.8.1
 PKG_USERS_VARS+=       APACHE_USER
 PKG_GROUPS_VARS+=      BZ_WEB_GROUP APACHE_GROUP
 
-MESSAGE_SUBST+=        BZDIR=${BZDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+=        BZDIR=${BZDIR} PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 BZDIR=                 ${PREFIX}/share/bugzilla
 EGDIR=                 ${PREFIX}/share/examples/bugzilla
@@ -55,11 +55,11 @@ SUBST_SED.conf+=    -e "s|@CVS@|${CVS}|g"
 SUBST_SED.conf+=       -e "s|@DBDRIVER@|${DBDRIVER}|g"
 SUBST_SED.conf+=       -e "s|/usr/lib/sendmail|${SENDMAIL}|g"
 
-INSTALLATION_DIRS += ${DOCDIR} ${DOCDIR}/en ${EGDIR} ${BZDIR} ${BZDIR}/Bugzilla
-INSTALLATION_DIRS += ${BZDIR}/js ${BZDIR}/lib ${BZDIR}/template ${BZDIR}/skins
-INSTALLATION_DIRS += ${BZDIR}/docs ${BZDIR}/docs/en ${BZDIR}/docs/en/html
-INSTALLATION_DIRS += ${BZDIR}/images ${BZDIR}/docs/en/html/api
-INSTALLATION_DIRS += ${BZDIR}/docs/en/html/api/Bugzilla
+INSTALLATION_DIRS+=    ${DOCDIR} ${DOCDIR}/en ${EGDIR} ${BZDIR} ${BZDIR}/Bugzilla
+INSTALLATION_DIRS+=    ${BZDIR}/js ${BZDIR}/lib ${BZDIR}/template ${BZDIR}/skins
+INSTALLATION_DIRS+=    ${BZDIR}/docs ${BZDIR}/docs/en ${BZDIR}/docs/en/html
+INSTALLATION_DIRS+=    ${BZDIR}/images ${BZDIR}/docs/en/html/api
+INSTALLATION_DIRS+=    ${BZDIR}/docs/en/html/api/Bugzilla
 
 post-extract:
        ${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf

Index: pkgsrc/devel/bugzilla3/options.mk
diff -u pkgsrc/devel/bugzilla3/options.mk:1.6 pkgsrc/devel/bugzilla3/options.mk:1.7
--- pkgsrc/devel/bugzilla3/options.mk:1.6       Sun Jun 22 19:47:22 2014
+++ pkgsrc/devel/bugzilla3/options.mk   Sat Jul  9 13:21:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/06/22 19:47:22 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2016/07/09 13:21:05 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bugzilla
 
@@ -57,9 +57,9 @@ DEPENDS+=     p5-HTML-Parser>=3.40:../../www
 .if !empty(PKG_OPTIONS:Mbugzilla-modperl)
 DEPENDS+=      p5-CGI>=3.11:../../www/p5-CGI
 DEPENDS+=      p5-Apache-DBI>=0.96:../../databases/p5-Apache-DBI
-. if defined(PKG_APACHE)
-.  include "../../www/ap2-perl/buildlink3.mk"
-. endif
+.  if defined(PKG_APACHE)
+.    include "../../www/ap2-perl/buildlink3.mk"
+.  endif
 .endif
 
 ###