Sat Jul 9 13:21:05 2016 UTC ()
Fixed some pkglint warnings.


(rillig)
diff -r1.24 -r1.25 pkgsrc/devel/bugzilla3/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/bugzilla3/options.mk
cvs diff -r1.24 -r1.25 pkgsrc/devel/bugzilla3/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/bugzilla3/Makefile 2016/07/09 06:38:05 1.24
+++ pkgsrc/devel/bugzilla3/Makefile 2016/07/09 13:21:05 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.24 2016/07/09 06:38:05 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2016/07/09 13:21:05 rillig Exp $
2 2
3DISTNAME= bugzilla-3.2.4 3DISTNAME= bugzilla-3.2.4
4PKGREVISION= 8 4PKGREVISION= 8
5CATEGORIES= www devel 5CATEGORIES= www devel
6MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=webtools/} 6MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=webtools/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.bugzilla.org/ 9HOMEPAGE= http://www.bugzilla.org/
10COMMENT= Web based bug tracking system 10COMMENT= Web based bug tracking system
11 11
12DEPENDS+= p5-CGI>=3.21:../../www/p5-CGI 12DEPENDS+= p5-CGI>=3.21:../../www/p5-CGI
13DEPENDS+= p5-DBI>=1.41:../../databases/p5-DBI 13DEPENDS+= p5-DBI>=1.41:../../databases/p5-DBI
14DEPENDS+= p5-Template-Toolkit>=2.15:../../www/p5-Template-Toolkit 14DEPENDS+= p5-Template-Toolkit>=2.15:../../www/p5-Template-Toolkit
@@ -22,54 +22,54 @@ DEPENDS+= p5-Email-MIME>=1.903:../../mai @@ -22,54 +22,54 @@ DEPENDS+= p5-Email-MIME>=1.903:../../mai
22USE_TOOLS+= pax perl:run 22USE_TOOLS+= pax perl:run
23NO_BUILD= YES 23NO_BUILD= YES
24 24
25BZ_WEB_GROUP?= ${APACHE_GROUP} 25BZ_WEB_GROUP?= ${APACHE_GROUP}
26SENDMAIL?= /usr/sbin/sendmail 26SENDMAIL?= /usr/sbin/sendmail
27CVS?= /usr/bin/cvs 27CVS?= /usr/bin/cvs
28 28
29BUILD_DEFS+= SENDMAIL CVS APACHE_USER APACHE_GROUP 29BUILD_DEFS+= SENDMAIL CVS APACHE_USER APACHE_GROUP
30PERL5_REQD+= 5.8.1 30PERL5_REQD+= 5.8.1
31 31
32PKG_USERS_VARS+= APACHE_USER 32PKG_USERS_VARS+= APACHE_USER
33PKG_GROUPS_VARS+= BZ_WEB_GROUP APACHE_GROUP 33PKG_GROUPS_VARS+= BZ_WEB_GROUP APACHE_GROUP
34 34
35MESSAGE_SUBST+= BZDIR=${BZDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 35MESSAGE_SUBST+= BZDIR=${BZDIR} PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
36 36
37BZDIR= ${PREFIX}/share/bugzilla 37BZDIR= ${PREFIX}/share/bugzilla
38EGDIR= ${PREFIX}/share/examples/bugzilla 38EGDIR= ${PREFIX}/share/examples/bugzilla
39DOCDIR= ${PREFIX}/share/doc/bugzilla 39DOCDIR= ${PREFIX}/share/doc/bugzilla
40CONF_FILES= ${EGDIR}/bugzilla.conf ${PKG_SYSCONFDIR}/bugzilla.conf 40CONF_FILES= ${EGDIR}/bugzilla.conf ${PKG_SYSCONFDIR}/bugzilla.conf
41CONF_FILES_PERMS= ${EGDIR}/localconfig ${BZDIR}/localconfig \ 41CONF_FILES_PERMS= ${EGDIR}/localconfig ${BZDIR}/localconfig \
42 ${APACHE_USER} ${SHAREGRP} 0400 42 ${APACHE_USER} ${SHAREGRP} 0400
43PAX_DIRS= Bugzilla skins template 43PAX_DIRS= Bugzilla skins template
44 44
45REPLACE_PERL+= *.pl *.cgi 45REPLACE_PERL+= *.pl *.cgi
46 46
47SUBST_CLASSES+= conf 47SUBST_CLASSES+= conf
48SUBST_STAGE.conf= pre-install 48SUBST_STAGE.conf= pre-install
49SUBST_MESSAGE.conf= Fixing configuration files. 49SUBST_MESSAGE.conf= Fixing configuration files.
50SUBST_FILES.conf= bugzilla.conf localconfig Bugzilla/BugMail.pm 50SUBST_FILES.conf= bugzilla.conf localconfig Bugzilla/BugMail.pm
51SUBST_SED.conf= -e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g" 51SUBST_SED.conf= -e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g"
52SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" 52SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g"
53SUBST_SED.conf+= -e "s|@BZDIR@|${BZDIR}|g" 53SUBST_SED.conf+= -e "s|@BZDIR@|${BZDIR}|g"
54SUBST_SED.conf+= -e "s|@CVS@|${CVS}|g" 54SUBST_SED.conf+= -e "s|@CVS@|${CVS}|g"
55SUBST_SED.conf+= -e "s|@DBDRIVER@|${DBDRIVER}|g" 55SUBST_SED.conf+= -e "s|@DBDRIVER@|${DBDRIVER}|g"
56SUBST_SED.conf+= -e "s|/usr/lib/sendmail|${SENDMAIL}|g" 56SUBST_SED.conf+= -e "s|/usr/lib/sendmail|${SENDMAIL}|g"
57 57
58INSTALLATION_DIRS += ${DOCDIR} ${DOCDIR}/en ${EGDIR} ${BZDIR} ${BZDIR}/Bugzilla 58INSTALLATION_DIRS+= ${DOCDIR} ${DOCDIR}/en ${EGDIR} ${BZDIR} ${BZDIR}/Bugzilla
59INSTALLATION_DIRS += ${BZDIR}/js ${BZDIR}/lib ${BZDIR}/template ${BZDIR}/skins 59INSTALLATION_DIRS+= ${BZDIR}/js ${BZDIR}/lib ${BZDIR}/template ${BZDIR}/skins
60INSTALLATION_DIRS += ${BZDIR}/docs ${BZDIR}/docs/en ${BZDIR}/docs/en/html 60INSTALLATION_DIRS+= ${BZDIR}/docs ${BZDIR}/docs/en ${BZDIR}/docs/en/html
61INSTALLATION_DIRS += ${BZDIR}/images ${BZDIR}/docs/en/html/api 61INSTALLATION_DIRS+= ${BZDIR}/images ${BZDIR}/docs/en/html/api
62INSTALLATION_DIRS += ${BZDIR}/docs/en/html/api/Bugzilla 62INSTALLATION_DIRS+= ${BZDIR}/docs/en/html/api/Bugzilla
63 63
64post-extract: 64post-extract:
65 ${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf 65 ${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf
66 ${FIND} ${WRKSRC} -type f -name ".cvsignore" | ${XARGS} ${RM} -f 66 ${FIND} ${WRKSRC} -type f -name ".cvsignore" | ${XARGS} ${RM} -f
67 ${CP} ${FILESDIR}/bugzilla.conf ${WRKSRC} 67 ${CP} ${FILESDIR}/bugzilla.conf ${WRKSRC}
68 ${CP} ${FILESDIR}/localconfig ${WRKSRC} 68 ${CP} ${FILESDIR}/localconfig ${WRKSRC}
69 69
70do-install: 70do-install:
71 71
72 ${INSTALL_DATA} ${WRKSRC}/docs/en/txt/Bugzilla-Guide.txt ${DESTDIR}${DOCDIR}/en 72 ${INSTALL_DATA} ${WRKSRC}/docs/en/txt/Bugzilla-Guide.txt ${DESTDIR}${DOCDIR}/en
73 ${INSTALL_DATA} ${WRKSRC}/docs/en/rel_notes.txt ${DESTDIR}${DOCDIR}/en 73 ${INSTALL_DATA} ${WRKSRC}/docs/en/rel_notes.txt ${DESTDIR}${DOCDIR}/en
74 ${INSTALL_DATA} ${WRKSRC}/QUICKSTART ${DESTDIR}${DOCDIR} 74 ${INSTALL_DATA} ${WRKSRC}/QUICKSTART ${DESTDIR}${DOCDIR}
75 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR} 75 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
cvs diff -r1.6 -r1.7 pkgsrc/devel/bugzilla3/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/bugzilla3/options.mk 2014/06/22 19:47:22 1.6
+++ pkgsrc/devel/bugzilla3/options.mk 2016/07/09 13:21:05 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.6 2014/06/22 19:47:22 wiz Exp $ 1# $NetBSD: options.mk,v 1.7 2016/07/09 13:21:05 rillig Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.bugzilla 3PKG_OPTIONS_VAR= PKG_OPTIONS.bugzilla
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= db 5PKG_OPTIONS_REQUIRED_GROUPS= db
6PKG_OPTIONS_GROUP.db= mysql pgsql oracle 6PKG_OPTIONS_GROUP.db= mysql pgsql oracle
7 7
8PKG_SUPPORTED_OPTIONS= bugzilla-notify bugzilla-graphicalreports 8PKG_SUPPORTED_OPTIONS= bugzilla-notify bugzilla-graphicalreports
9PKG_SUPPORTED_OPTIONS+= bugzilla-inboundemail bugzilla-movebugs 9PKG_SUPPORTED_OPTIONS+= bugzilla-inboundemail bugzilla-movebugs
10PKG_SUPPORTED_OPTIONS+= bugzilla-imagemagick bugzilla-patchviewer 10PKG_SUPPORTED_OPTIONS+= bugzilla-imagemagick bugzilla-patchviewer
11PKG_SUPPORTED_OPTIONS+= bugzilla-descriptions bugzilla-xmlrpc 11PKG_SUPPORTED_OPTIONS+= bugzilla-descriptions bugzilla-xmlrpc
12PKG_SUPPORTED_OPTIONS+= bugzilla-modperl radius 12PKG_SUPPORTED_OPTIONS+= bugzilla-modperl radius
13PKG_SUPPORTED_OPTIONS+= mysql pgsql oracle ldap 13PKG_SUPPORTED_OPTIONS+= mysql pgsql oracle ldap
14PKG_SUGGESTED_OPTIONS= mysql 14PKG_SUGGESTED_OPTIONS= mysql
@@ -47,29 +47,29 @@ DEPENDS+= p5-RadiusPerl-[0-9]*:../../net @@ -47,29 +47,29 @@ DEPENDS+= p5-RadiusPerl-[0-9]*:../../net
47### More HTML in Product/Group Descriptions 47### More HTML in Product/Group Descriptions
48### 48###
49.if !empty(PKG_OPTIONS:Mbugzilla-descriptions) 49.if !empty(PKG_OPTIONS:Mbugzilla-descriptions)
50DEPENDS+= p5-HTML-Scrubber-[0-9]*:../../www/p5-HTML-Scrubber 50DEPENDS+= p5-HTML-Scrubber-[0-9]*:../../www/p5-HTML-Scrubber
51DEPENDS+= p5-HTML-Parser>=3.40:../../www/p5-HTML-Parser 51DEPENDS+= p5-HTML-Parser>=3.40:../../www/p5-HTML-Parser
52.endif 52.endif
53 53
54### 54###
55### mod_perl 55### mod_perl
56### 56###
57.if !empty(PKG_OPTIONS:Mbugzilla-modperl) 57.if !empty(PKG_OPTIONS:Mbugzilla-modperl)
58DEPENDS+= p5-CGI>=3.11:../../www/p5-CGI 58DEPENDS+= p5-CGI>=3.11:../../www/p5-CGI
59DEPENDS+= p5-Apache-DBI>=0.96:../../databases/p5-Apache-DBI 59DEPENDS+= p5-Apache-DBI>=0.96:../../databases/p5-Apache-DBI
60. if defined(PKG_APACHE) 60. if defined(PKG_APACHE)
61. include "../../www/ap2-perl/buildlink3.mk" 61. include "../../www/ap2-perl/buildlink3.mk"
62. endif 62. endif
63.endif 63.endif
64 64
65### 65###
66### XML-RPC Interface 66### XML-RPC Interface
67### 67###
68.if !empty(PKG_OPTIONS:Mbugzilla-xmlrpc) 68.if !empty(PKG_OPTIONS:Mbugzilla-xmlrpc)
69DEPENDS+= p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite 69DEPENDS+= p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
70.endif 70.endif
71 71
72### 72###
73### Inbound Email 73### Inbound Email
74### 74###
75.if !empty(PKG_OPTIONS:Mbugzilla-inboundemail) 75.if !empty(PKG_OPTIONS:Mbugzilla-inboundemail)