Move to bugzilla 2.20

From the release-notes.html:

What's New?
 New User-Interface Color/Style
 Higher-Level Categorization of Bugs (above "Product")
 Regular Reports by Email of Complex Queries ("Whining")
 "Environment Variable" Authentication Method
 User-List Drop-Down Menus
 Server-Side Comment Wrapping
 UI for Editing Priority, OS, Platform, and Severity
 Bugzilla Queries as RSS
 Choice of E-Mail Sending Methods
 "Large Attachment" Storage
 and lots of Miscellaneous Improvements

See http://www.bugzilla.org/releases/2.20/release-notes.html for
all the details.

1 files changed, 33 insertions, 40 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 9a197b4b8f1..5bfe3f10c90 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/10/05 15:09:23 salo Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/26 10:16:09 adrianp Exp $
 #
 
-DISTNAME=	bugzilla-2.18.4
+DISTNAME=	bugzilla-2.20
 CATEGORIES=	www devel
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/webtools/
 
@@ -11,13 +11,15 @@ COMMENT=	Web based bug tracking system
 
 DEPENDS+=	p5-AppConfig>=1.52:../../devel/p5-AppConfig
 DEPENDS+=	p5-CGI>=2.93:../../www/p5-CGI
-DEPENDS+=	p5-DBD-mysql>=2.1010:../../databases/p5-DBD-mysql
-DEPENDS+=	p5-DBI>=1.36:../../databases/p5-DBI
-DEPENDS+=	p5-File-Spec>=0.82:../../devel/p5-File-Spec
+DEPENDS+=	p5-DBD-mysql>=2.9003:../../databases/p5-DBD-mysql
+DEPENDS+=	p5-DBI>=1.38:../../databases/p5-DBI
+DEPENDS+=	p5-File-Spec>=0.84:../../devel/p5-File-Spec
 DEPENDS+=	p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
 DEPENDS+=	p5-Template-Toolkit>=2.08:../../www/p5-Template-Toolkit
 DEPENDS+=	p5-Text-Tabs+Wrap>=2001.0131:../../textproc/p5-Text-Tabs+Wrap
-DEPENDS+=	p5-TimeDate>=1.14:../../time/p5-TimeDate
+DEPENDS+=	p5-Storable-[0-9]*:../../devel/p5-Storable
+DEPENDS+=	p5-TimeDate>=1.16:../../time/p5-TimeDate
+DEPENDS+=	p5-MailTools>=1.65:../../mail/p5-MailTools
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -25,7 +27,7 @@ DEPENDS+=	p5-TimeDate>=1.14:../../time/p5-TimeDate
 NO_BUILD=	YES
 USE_PKGINSTALL=	YES
 
-BZ_WEB_GROUP?=	www
+BZ_WEB_GROUP?=	${APACHE_GROUP}
 SENDMAIL?=	/usr/sbin/sendmail
 
 BUILD_DEFS+= 	BZ_WEB_GROUP SENDMAIL APACHE_USER
@@ -38,6 +40,7 @@ DOCDIR=		${PREFIX}/share/doc/bugzilla
 CONF_FILES=	${EGDIR}/bugzilla.conf ${PKG_SYSCONFDIR}/bugzilla.conf \
 		${EGDIR}/localconfig ${BZDIR}/localconfig
 SPECIAL_PERMS=	${BZDIR}/localconfig ${APACHE_USER} ${SHAREGRP} 0400
+PAX_DIRS=	Bugzilla skins template
 
 REPLACE_PERL=	*.pl *.cgi
 
@@ -51,9 +54,8 @@ SUBST_SED.conf=		-e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g"		\
 SUBST_MESSAGE.conf=	"Fixing configuration files."
 
 post-extract:
-	@${FIND} ${WRKSRC}/template -type d -name CVS | ${XARGS} ${RM} -rf
-	@${FIND} ${WRKSRC}/template -type f -name ".cvsignore" | ${XARGS} \
-		${RM} -f
+	@${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -type f -name ".cvsignore" | ${XARGS} ${RM} -f
 	@${CP} ${FILESDIR}/bugzilla.conf ${WRKSRC}
 	@${CP} ${FILESDIR}/localconfig ${WRKSRC}
 
@@ -62,53 +64,44 @@ do-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${BZDIR}
 	${INSTALL_DATA_DIR} ${BZDIR}/Bugzilla
-	${INSTALL_DATA_DIR} ${BZDIR}/Bugzilla/Auth
-	${INSTALL_DATA_DIR} ${BZDIR}/Bugzilla/Template/Plugin
-	${INSTALL_DATA_DIR} ${BZDIR}/css
+
 	${INSTALL_DATA_DIR} ${BZDIR}/js
 	${INSTALL_DATA_DIR} ${BZDIR}/template
 	${INSTALL_DATA_DIR} ${BZDIR}/skins
-	${INSTALL_DATA_DIR} ${BZDIR}/skins/standard
+	${INSTALL_DATA_DIR} ${BZDIR}/docs
 	${INSTALL_DATA_DIR} ${BZDIR}/docs/html
-	${INSTALL_DATA_DIR} ${BZDIR}/docs/images
-	${INSTALL_DATA_DIR} ${BZDIR}/docs/images/callouts
+	${INSTALL_DATA_DIR} ${BZDIR}/images
+
 	${INSTALL_DATA} ${WRKSRC}/docs/txt/Bugzilla-Guide.txt ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/rel_notes.txt ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/QUICKSTART ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/UPGRADING-pre-2.8 ${DOCDIR}
+
 	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${BZDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/Bugzilla.pm ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/Bugzilla/*.pm ${BZDIR}/Bugzilla
-	${INSTALL_DATA} ${WRKSRC}/Bugzilla/Auth/*.pm ${BZDIR}/Bugzilla/Auth
-	${INSTALL_DATA} ${WRKSRC}/Bugzilla/Template/Plugin/*.pm \
-		${BZDIR}/Bugzilla/Template/Plugin
+	${INSTALL_DATA} ${WRKSRC}/*.js ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/robots.txt ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/1x1.gif ${BZDIR}
 	${INSTALL_DATA} ${WRKSRC}/ant.jpg ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/padlock.png ${BZDIR}
+	${INSTALL_DATA} ${WRKSRC}/bugzilla.dtd ${BZDIR}
+	${INSTALL_DATA} ${WRKSRC}/duplicates.xul ${BZDIR}
+	${INSTALL_DATA} ${WRKSRC}/Bugzilla.pm ${BZDIR}
+
 	${INSTALL_DATA} ${WRKSRC}/bugzilla.conf ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/localconfig ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/bugzilla.dtd ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.js ${BZDIR}
+
+	${INSTALL_DATA} ${WRKSRC}/images/*.png ${BZDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/js/*.js ${BZDIR}/js
-	${INSTALL_DATA} ${WRKSRC}/duplicates.xul ${BZDIR}
-	${INSTALL_DATA} ${WRKSRC}/css/*.css ${BZDIR}/css
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${BZDIR}/docs/html
-	cd ${WRKSRC}/template && ${PAX} -rw . ${BZDIR}/template
-	${FIND} ${BZDIR}/template -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${FIND} ${BZDIR}/template -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${CHMOD} ${BINMODE} ${BZDIR}/template/en/default/filterexceptions.pl
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${BZDIR}/template
-	${INSTALL_DATA} ${WRKSRC}/skins/standard/*.css ${BZDIR}/skins/standard
-	${INSTALL_DATA} ${WRKSRC}/docs/images/*.gif ${BZDIR}/docs/images
-	${INSTALL_DATA} ${WRKSRC}/docs/images/*.png ${BZDIR}/docs/images
-	${INSTALL_DATA} ${WRKSRC}/docs/images/*.xml ${BZDIR}/docs/images
-	${INSTALL_DATA} ${WRKSRC}/docs/images/callouts/*.gif \
-		${BZDIR}/docs/images/callouts
-
-.include "../../mk/apache.mk"
+
+.	for i in ${PAX_DIRS}
+		cd ${WRKSRC}/${i} && ${PAX} -rw . ${BZDIR}/${i}
+		${FIND} ${BZDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+		${FIND} ${BZDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${BZDIR}/${i}
+.	endfor
+
+# .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"