12 files changed, 279 insertions, 306 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index e46cdb34ee61..a45cfaa70ec7 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -7,127 +7,115 @@
 
 PORTNAME?=	bugzilla
 PORTVERSION?=	2.18
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	skv@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
+OPTIONS=	CHARTING_MODULES "Bug charting support" on \
+		EMAIL_GATEWAY "Use email gateway" off \
+		EXPORT_IMPORT "Import/export bugs (via XML)" off \
+		CONTRIB	"Install user-contributed scripts" off \
+		LDAP "Enable LDAP support" off
+
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
+		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
+		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
-		${SITE_PERL}/Data/Dumper/Simple.pm:${PORTSDIR}/devel/p5-Data-Dumper-Simple \
+		${SITE_PERL}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
 		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
 		${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
 
-.if !defined(WITHOUT_BUG_CHARTING_MODULES)
+CONFLICTS?=	ja-bugzilla-2.*
+
+USE_REINPLACE=	yes
+
+BINMODE=	700
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+.ifndef BUGZILLADIR
+.ifdef APACHE_DATADIR
+BUGZILLADIR=	${APACHE_DATADIR}/data/bugzilla
+.else
+BUGZILLADIR=	${PREFIX}/www/data/bugzilla
+.endif
+.endif
+
+PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
+
+CONTRIB_DOCS=	README README.Mailif bugmail_help.html bugzilla.procmailrc
+
+.include <bsd.port.pre.mk>
+
+.ifdef WITH_CHARTING_MODULES
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart \
 		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
-		${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
+		${SITE_PERL}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
-.if defined(WITH_BUG_MAILING_MODULES)
+.ifdef WITH_EMAIL_GATEWAY
 RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
 
-.if defined(WITH_BUG_EXPORT_AND_IMPORT)
+.ifdef WITH_EXPORT_IMPORT
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 .endif
 
-CONFLICTS?=	ja-bugzilla-2.*
-
-.if defined(WITH_CONTRIB)
+.ifdef WITH_CONTRIB
 PLIST_SUB+=	CONTRIB=""
 .else
 PLIST_SUB+=	CONTRIB="@comment "
 .endif
 
-USE_REINPLACE=	yes
-
-NO_BUILD=	yes
-BINMODE=	700
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-BUGZILLADIR?=	www/data/bugzilla
-BUGZILLADOCS=	html images txt rel_notes.txt
-SENDMAILWC=	*.pl *.pm contrib/*.pl Bugzilla/*.pm
-
-PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR}
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
-	@${ECHO_MSG} "                               charting support"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_BUG_MAILING_MODULES     install perl modules required for bug mailing"
-	@${ECHO_MSG} "                               support (contrib/bug_email.pl) interface"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_BUG_EXPORT_AND_IMPORT   install perl modules required for bug"
-	@${ECHO_MSG} "                               export/import feature to move bugs to or from"
-	@${ECHO_MSG} "                               other bugzilla installations"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_CONTRIB                 to install various user-contributed scripts,"
-	@${ECHO_MSG} "                               e.g. to import bugs from other databases, to"
-	@${ECHO_MSG} "                               allow follow-ups/submissions by e-mail etc."
-	@${ECHO_MSG} ""
+.ifdef WITH_LDAP
+RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
+.endif
 
 post-patch:
-	@${FIND} -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
-	@${FIND} -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
-	@${FIND} ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
-	@${FIND} ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
-	@${FIND} ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
-.for i in ${SENDMAILWC}
-	@${REINPLACE_CMD} -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
-		${WRKSRC}/$i
-.endfor
-	@${FIND} ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} \( -name "CVS" -or -name ".cvsignore" -or -name "*.orig" \
+		-or -name "README.docs" \) | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -name "*.p[ml]" | \
+		${XARGS} ${REINPLACE_CMD} -i '' -e 's!/usr/lib/sendmail!/usr/sbin/sendmail!'
 
-pre-install:
-	@${FIND} ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
-	@${FIND} ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
-	@${FIND} ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
+do-build:
+	@${SED} -e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g; s:%%DOCSDIR%%:${DOCSDIR}:g" \
+		${MASTERDIR}/pkg-message >${PKGMESSAGE}
 
 do-install:
-	${MKDIR} ${PREFIX}/${BUGZILLADIR}
-	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
-		${INSTALL_SCRIPT} {} ${PREFIX}/${BUGZILLADIR} \;
-	${TAR} -C ${WRKSRC} -cf - Bugzilla template css js skins | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} --unlink -C ${DOCSDIR} -xf -
+	${MKDIR} ${BUGZILLADIR}
+	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
+		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
+.for D in css js skins/standard
+	@${MKDIR} ${BUGZILLADIR}/${D}
+	${INSTALL_DATA} ${WRKSRC}/${D}/*.* ${BUGZILLADIR}/${D}
+.endfor
+	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${BUGZILLADIR} -xf -
+.ifndef NOPORTDOCS
+.for D in html images/callouts images pdf txt xml ""
+	${MKDIR} ${DOCSDIR}/${D}
+	${INSTALL_DATA} ${WRKSRC}/docs/${D}/*.* ${DOCSDIR}/${D}/
+.endfor
 .endif
-
-.if defined(WITH_CONTRIB)
-	${MKDIR} ${PREFIX}/${BUGZILLADIR}/contrib
+.ifdef WITH_CONTRIB
+	${MKDIR} ${BUGZILLADIR}/contrib
 	@cd ${WRKSRC}/contrib && \
-		${FIND} . -type d -exec ${MKDIR} "${PREFIX}/${BUGZILLADIR}/contrib/{}" \; && \
-		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${BUGZILLADIR}/contrib/{}" \;
-.endif
-
-.if !defined(NOPORTDOCS)
+		${FIND} . -type d -exec ${MKDIR} "${BUGZILLADIR}/contrib/{}" \; && \
+		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${BUGZILLADIR}/contrib/{}" \;
+.ifndef NOPORTDOCS
 	${MKDIR} ${DOCSDIR}/contrib
-	cd ${WRKSRC}/contrib; ${INSTALL_DATA} README README.Mailif \
-		bugmail_help.html bugzilla.procmailrc ${DOCSDIR}/contrib
+	${INSTALL_DATA} ${CONTRIB_DOCS:S!^!${WRKSRC}/contrib/!} ${DOCSDIR}/contrib
+.endif
 .endif
-
-post-install:
-	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
-		-e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g" \
-		-e "s:%%PORTDOCS%%:${PORTDOCS}:g" \
-		-e "s:%%DOCSDIR%%:${DOCSDIR}:g" \
-		${MASTERDIR}/pkg-message >${PKGMESSAGE}
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/bugzilla/pkg-descr b/devel/bugzilla/pkg-descr
index f4b9cfcf388e..eab95354d1eb 100644
--- a/devel/bugzilla/pkg-descr
+++ b/devel/bugzilla/pkg-descr
@@ -19,4 +19,4 @@ These include:
     Bugzilla email interface and checkin/checkout scripts)
   * too many more features to list
 
-WWW: http://www.mozilla.org/projects/bugzilla/
+WWW: http://www.bugzilla.org/
diff --git a/devel/bugzilla/pkg-message b/devel/bugzilla/pkg-message
index 0474ba8f11ec..9237e1d77785 100644
--- a/devel/bugzilla/pkg-message
+++ b/devel/bugzilla/pkg-message
@@ -2,10 +2,11 @@
   Bugzilla has now been installed.  To quick setup you have to:
 
   1. Create database user who has rights on bugs database manipulation
-     by following mysql commands:
+     by following mysql commands (for MySQL 4.0 or later):
 
-     GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES,\
-	   LOCK TABLES ON <database>.* TO <dbuser>@<host> \
+     GRANT SELECT, INSERT, UPDATE, DELETE, INDEX, ALTER, CREATE, LOCK TABLES,
+           CREATE TEMPORARY TABLES, DROP, REFERENCES 
+	   ON <database>.* TO <dbuser>@<host> 
 	   IDENTIFIED BY '<password>';
      FLUSH PRIVILEGES;
 
@@ -13,11 +14,11 @@
            owner; <host> is a host there bugzilla is being setup;
            <password> is a database owner's password;
 
-  2. Change working directory to %%PREFIX%%/%%BUGZILLADIR%%
+  2. Change working directory to %%BUGZILLADIR%%
   3. Run "./checksetup.pl" script as root user
   4. Read output carefully and follow all instructions
 
   For more complete database setup and post-installation instructions
-  and security tips/notes please read Bugzilla Guide in
-  %%PORTDOCS%%%%DOCSDIR%% (chapter 4: Installation)
+  and security tips/notes please read "Bugzilla Guide" in
+  %%DOCSDIR%% (chapter 4: Installation)
 ==========================================================================
diff --git a/devel/bugzilla/pkg-plist b/devel/bugzilla/pkg-plist
index 9ccbb1189621..004d836ad011 100644
--- a/devel/bugzilla/pkg-plist
+++ b/devel/bugzilla/pkg-plist
@@ -1,7 +1,7 @@
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README.Mailif
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bugmail_help.html
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bugzilla.procmailrc
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/README
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/README.Mailif
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/bugmail_help.html
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/bugzilla.procmailrc
 %%PORTDOCS%%%%DOCSDIR%%/html/Bugzilla-Guide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/about.html
 %%PORTDOCS%%%%DOCSDIR%%/html/administration.html
@@ -418,7 +418,7 @@
 @dirrm %%BUGZILLADIR%%/template/en/default/account
 @dirrm %%BUGZILLADIR%%/template/en/default
 @dirrm %%BUGZILLADIR%%/template/en
-@dirrm %%BUGZILLADIR%%/template
+@unexec rmdir %D/%%BUGZILLADIR%%/template 2>/dev/null || true
 @dirrm %%BUGZILLADIR%%/css
 %%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/gnatsparse
 %%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/cmdline
@@ -427,16 +427,18 @@
 @dirrm %%BUGZILLADIR%%/Bugzilla/Auth
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template/Plugin
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template
-@dirrm %%BUGZILLADIR%%/Bugzilla
+@unexec rmdir %D/%%BUGZILLADIR%%/Bugzilla 2>/dev/null || true
+@unexec rmdir %D/%%BUGZILLADIR%%/data 2>/dev/null || true
+@unexec rmdir %D/%%BUGZILLADIR%%/graphs 2>/dev/null || true
 @dirrm %%BUGZILLADIR%%/js
 @dirrm %%BUGZILLADIR%%/skins/standard
 @dirrm %%BUGZILLADIR%%/skins
-@dirrm %%BUGZILLADIR%%
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/xml
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/txt
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/pdf
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/images/callouts
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/html
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/contrib
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@unexec rmdir %D/%%BUGZILLADIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/callouts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%CONTRIB%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index e46cdb34ee61..a45cfaa70ec7 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -7,127 +7,115 @@
 
 PORTNAME?=	bugzilla
 PORTVERSION?=	2.18
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	skv@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
+OPTIONS=	CHARTING_MODULES "Bug charting support" on \
+		EMAIL_GATEWAY "Use email gateway" off \
+		EXPORT_IMPORT "Import/export bugs (via XML)" off \
+		CONTRIB	"Install user-contributed scripts" off \
+		LDAP "Enable LDAP support" off
+
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
+		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
+		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
-		${SITE_PERL}/Data/Dumper/Simple.pm:${PORTSDIR}/devel/p5-Data-Dumper-Simple \
+		${SITE_PERL}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
 		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
 		${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
 
-.if !defined(WITHOUT_BUG_CHARTING_MODULES)
+CONFLICTS?=	ja-bugzilla-2.*
+
+USE_REINPLACE=	yes
+
+BINMODE=	700
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+.ifndef BUGZILLADIR
+.ifdef APACHE_DATADIR
+BUGZILLADIR=	${APACHE_DATADIR}/data/bugzilla
+.else
+BUGZILLADIR=	${PREFIX}/www/data/bugzilla
+.endif
+.endif
+
+PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
+
+CONTRIB_DOCS=	README README.Mailif bugmail_help.html bugzilla.procmailrc
+
+.include <bsd.port.pre.mk>
+
+.ifdef WITH_CHARTING_MODULES
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart \
 		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
-		${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
+		${SITE_PERL}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
-.if defined(WITH_BUG_MAILING_MODULES)
+.ifdef WITH_EMAIL_GATEWAY
 RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
 
-.if defined(WITH_BUG_EXPORT_AND_IMPORT)
+.ifdef WITH_EXPORT_IMPORT
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 .endif
 
-CONFLICTS?=	ja-bugzilla-2.*
-
-.if defined(WITH_CONTRIB)
+.ifdef WITH_CONTRIB
 PLIST_SUB+=	CONTRIB=""
 .else
 PLIST_SUB+=	CONTRIB="@comment "
 .endif
 
-USE_REINPLACE=	yes
-
-NO_BUILD=	yes
-BINMODE=	700
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-BUGZILLADIR?=	www/data/bugzilla
-BUGZILLADOCS=	html images txt rel_notes.txt
-SENDMAILWC=	*.pl *.pm contrib/*.pl Bugzilla/*.pm
-
-PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR}
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
-	@${ECHO_MSG} "                               charting support"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_BUG_MAILING_MODULES     install perl modules required for bug mailing"
-	@${ECHO_MSG} "                               support (contrib/bug_email.pl) interface"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_BUG_EXPORT_AND_IMPORT   install perl modules required for bug"
-	@${ECHO_MSG} "                               export/import feature to move bugs to or from"
-	@${ECHO_MSG} "                               other bugzilla installations"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_CONTRIB                 to install various user-contributed scripts,"
-	@${ECHO_MSG} "                               e.g. to import bugs from other databases, to"
-	@${ECHO_MSG} "                               allow follow-ups/submissions by e-mail etc."
-	@${ECHO_MSG} ""
+.ifdef WITH_LDAP
+RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
+.endif
 
 post-patch:
-	@${FIND} -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
-	@${FIND} -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
-	@${FIND} ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
-	@${FIND} ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
-	@${FIND} ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
-.for i in ${SENDMAILWC}
-	@${REINPLACE_CMD} -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
-		${WRKSRC}/$i
-.endfor
-	@${FIND} ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} \( -name "CVS" -or -name ".cvsignore" -or -name "*.orig" \
+		-or -name "README.docs" \) | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -name "*.p[ml]" | \
+		${XARGS} ${REINPLACE_CMD} -i '' -e 's!/usr/lib/sendmail!/usr/sbin/sendmail!'
 
-pre-install:
-	@${FIND} ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
-	@${FIND} ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
-	@${FIND} ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
+do-build:
+	@${SED} -e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g; s:%%DOCSDIR%%:${DOCSDIR}:g" \
+		${MASTERDIR}/pkg-message >${PKGMESSAGE}
 
 do-install:
-	${MKDIR} ${PREFIX}/${BUGZILLADIR}
-	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
-		${INSTALL_SCRIPT} {} ${PREFIX}/${BUGZILLADIR} \;
-	${TAR} -C ${WRKSRC} -cf - Bugzilla template css js skins | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} --unlink -C ${DOCSDIR} -xf -
+	${MKDIR} ${BUGZILLADIR}
+	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
+		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
+.for D in css js skins/standard
+	@${MKDIR} ${BUGZILLADIR}/${D}
+	${INSTALL_DATA} ${WRKSRC}/${D}/*.* ${BUGZILLADIR}/${D}
+.endfor
+	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${BUGZILLADIR} -xf -
+.ifndef NOPORTDOCS
+.for D in html images/callouts images pdf txt xml ""
+	${MKDIR} ${DOCSDIR}/${D}
+	${INSTALL_DATA} ${WRKSRC}/docs/${D}/*.* ${DOCSDIR}/${D}/
+.endfor
 .endif
-
-.if defined(WITH_CONTRIB)
-	${MKDIR} ${PREFIX}/${BUGZILLADIR}/contrib
+.ifdef WITH_CONTRIB
+	${MKDIR} ${BUGZILLADIR}/contrib
 	@cd ${WRKSRC}/contrib && \
-		${FIND} . -type d -exec ${MKDIR} "${PREFIX}/${BUGZILLADIR}/contrib/{}" \; && \
-		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${BUGZILLADIR}/contrib/{}" \;
-.endif
-
-.if !defined(NOPORTDOCS)
+		${FIND} . -type d -exec ${MKDIR} "${BUGZILLADIR}/contrib/{}" \; && \
+		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${BUGZILLADIR}/contrib/{}" \;
+.ifndef NOPORTDOCS
 	${MKDIR} ${DOCSDIR}/contrib
-	cd ${WRKSRC}/contrib; ${INSTALL_DATA} README README.Mailif \
-		bugmail_help.html bugzilla.procmailrc ${DOCSDIR}/contrib
+	${INSTALL_DATA} ${CONTRIB_DOCS:S!^!${WRKSRC}/contrib/!} ${DOCSDIR}/contrib
+.endif
 .endif
-
-post-install:
-	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
-		-e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g" \
-		-e "s:%%PORTDOCS%%:${PORTDOCS}:g" \
-		-e "s:%%DOCSDIR%%:${DOCSDIR}:g" \
-		${MASTERDIR}/pkg-message >${PKGMESSAGE}
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/bugzilla2/pkg-descr b/devel/bugzilla2/pkg-descr
index f4b9cfcf388e..eab95354d1eb 100644
--- a/devel/bugzilla2/pkg-descr
+++ b/devel/bugzilla2/pkg-descr
@@ -19,4 +19,4 @@ These include:
     Bugzilla email interface and checkin/checkout scripts)
   * too many more features to list
 
-WWW: http://www.mozilla.org/projects/bugzilla/
+WWW: http://www.bugzilla.org/
diff --git a/devel/bugzilla2/pkg-message b/devel/bugzilla2/pkg-message
index 0474ba8f11ec..9237e1d77785 100644
--- a/devel/bugzilla2/pkg-message
+++ b/devel/bugzilla2/pkg-message
@@ -2,10 +2,11 @@
   Bugzilla has now been installed.  To quick setup you have to:
 
   1. Create database user who has rights on bugs database manipulation
-     by following mysql commands:
+     by following mysql commands (for MySQL 4.0 or later):
 
-     GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES,\
-	   LOCK TABLES ON <database>.* TO <dbuser>@<host> \
+     GRANT SELECT, INSERT, UPDATE, DELETE, INDEX, ALTER, CREATE, LOCK TABLES,
+           CREATE TEMPORARY TABLES, DROP, REFERENCES 
+	   ON <database>.* TO <dbuser>@<host> 
 	   IDENTIFIED BY '<password>';
      FLUSH PRIVILEGES;
 
@@ -13,11 +14,11 @@
            owner; <host> is a host there bugzilla is being setup;
            <password> is a database owner's password;
 
-  2. Change working directory to %%PREFIX%%/%%BUGZILLADIR%%
+  2. Change working directory to %%BUGZILLADIR%%
   3. Run "./checksetup.pl" script as root user
   4. Read output carefully and follow all instructions
 
   For more complete database setup and post-installation instructions
-  and security tips/notes please read Bugzilla Guide in
-  %%PORTDOCS%%%%DOCSDIR%% (chapter 4: Installation)
+  and security tips/notes please read "Bugzilla Guide" in
+  %%DOCSDIR%% (chapter 4: Installation)
 ==========================================================================
diff --git a/devel/bugzilla2/pkg-plist b/devel/bugzilla2/pkg-plist
index 9ccbb1189621..004d836ad011 100644
--- a/devel/bugzilla2/pkg-plist
+++ b/devel/bugzilla2/pkg-plist
@@ -1,7 +1,7 @@
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README.Mailif
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bugmail_help.html
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bugzilla.procmailrc
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/README
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/README.Mailif
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/bugmail_help.html
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/bugzilla.procmailrc
 %%PORTDOCS%%%%DOCSDIR%%/html/Bugzilla-Guide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/about.html
 %%PORTDOCS%%%%DOCSDIR%%/html/administration.html
@@ -418,7 +418,7 @@
 @dirrm %%BUGZILLADIR%%/template/en/default/account
 @dirrm %%BUGZILLADIR%%/template/en/default
 @dirrm %%BUGZILLADIR%%/template/en
-@dirrm %%BUGZILLADIR%%/template
+@unexec rmdir %D/%%BUGZILLADIR%%/template 2>/dev/null || true
 @dirrm %%BUGZILLADIR%%/css
 %%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/gnatsparse
 %%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/cmdline
@@ -427,16 +427,18 @@
 @dirrm %%BUGZILLADIR%%/Bugzilla/Auth
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template/Plugin
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template
-@dirrm %%BUGZILLADIR%%/Bugzilla
+@unexec rmdir %D/%%BUGZILLADIR%%/Bugzilla 2>/dev/null || true
+@unexec rmdir %D/%%BUGZILLADIR%%/data 2>/dev/null || true
+@unexec rmdir %D/%%BUGZILLADIR%%/graphs 2>/dev/null || true
 @dirrm %%BUGZILLADIR%%/js
 @dirrm %%BUGZILLADIR%%/skins/standard
 @dirrm %%BUGZILLADIR%%/skins
-@dirrm %%BUGZILLADIR%%
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/xml
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/txt
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/pdf
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/images/callouts
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/html
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/contrib
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@unexec rmdir %D/%%BUGZILLADIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/callouts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%CONTRIB%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index e46cdb34ee61..a45cfaa70ec7 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -7,127 +7,115 @@
 
 PORTNAME?=	bugzilla
 PORTVERSION?=	2.18
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	skv@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
+OPTIONS=	CHARTING_MODULES "Bug charting support" on \
+		EMAIL_GATEWAY "Use email gateway" off \
+		EXPORT_IMPORT "Import/export bugs (via XML)" off \
+		CONTRIB	"Install user-contributed scripts" off \
+		LDAP "Enable LDAP support" off
+
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
+		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
+		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
-		${SITE_PERL}/Data/Dumper/Simple.pm:${PORTSDIR}/devel/p5-Data-Dumper-Simple \
+		${SITE_PERL}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
 		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
 		${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
 
-.if !defined(WITHOUT_BUG_CHARTING_MODULES)
+CONFLICTS?=	ja-bugzilla-2.*
+
+USE_REINPLACE=	yes
+
+BINMODE=	700
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+.ifndef BUGZILLADIR
+.ifdef APACHE_DATADIR
+BUGZILLADIR=	${APACHE_DATADIR}/data/bugzilla
+.else
+BUGZILLADIR=	${PREFIX}/www/data/bugzilla
+.endif
+.endif
+
+PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR:S!^${PREFIX}/!!}
+
+CONTRIB_DOCS=	README README.Mailif bugmail_help.html bugzilla.procmailrc
+
+.include <bsd.port.pre.mk>
+
+.ifdef WITH_CHARTING_MODULES
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/Chart/Base.pm:${PORTSDIR}/graphics/p5-chart \
 		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
-		${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
+		${SITE_PERL}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
-.if defined(WITH_BUG_MAILING_MODULES)
+.ifdef WITH_EMAIL_GATEWAY
 RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
 
-.if defined(WITH_BUG_EXPORT_AND_IMPORT)
+.ifdef WITH_EXPORT_IMPORT
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 .endif
 
-CONFLICTS?=	ja-bugzilla-2.*
-
-.if defined(WITH_CONTRIB)
+.ifdef WITH_CONTRIB
 PLIST_SUB+=	CONTRIB=""
 .else
 PLIST_SUB+=	CONTRIB="@comment "
 .endif
 
-USE_REINPLACE=	yes
-
-NO_BUILD=	yes
-BINMODE=	700
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-BUGZILLADIR?=	www/data/bugzilla
-BUGZILLADOCS=	html images txt rel_notes.txt
-SENDMAILWC=	*.pl *.pm contrib/*.pl Bugzilla/*.pm
-
-PLIST_SUB+=	BUGZILLADIR=${BUGZILLADIR}
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
-	@${ECHO_MSG} "                               charting support"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_BUG_MAILING_MODULES     install perl modules required for bug mailing"
-	@${ECHO_MSG} "                               support (contrib/bug_email.pl) interface"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_BUG_EXPORT_AND_IMPORT   install perl modules required for bug"
-	@${ECHO_MSG} "                               export/import feature to move bugs to or from"
-	@${ECHO_MSG} "                               other bugzilla installations"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITH_CONTRIB                 to install various user-contributed scripts,"
-	@${ECHO_MSG} "                               e.g. to import bugs from other databases, to"
-	@${ECHO_MSG} "                               allow follow-ups/submissions by e-mail etc."
-	@${ECHO_MSG} ""
+.ifdef WITH_LDAP
+RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
+.endif
 
 post-patch:
-	@${FIND} -d ${WRKSRC} -name CVS -type d -exec ${RM} -rf {} \;
-	@${FIND} -d ${WRKSRC} -name sgml -type d -exec ${RM} -rf {} \;
-	@${FIND} ${WRKSRC} -name .cvsignore -type f -exec ${RM} -f {} \;
-	@${FIND} ${WRKSRC} -name README.docs -type f -exec ${RM} -f {} \;
-	@${FIND} ${WRKSRC} -name \*.orig -type f -exec ${RM} -f {} \;
-.for i in ${SENDMAILWC}
-	@${REINPLACE_CMD} -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
-		${WRKSRC}/$i
-.endfor
-	@${FIND} ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} \( -name "CVS" -or -name ".cvsignore" -or -name "*.orig" \
+		-or -name "README.docs" \) | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -name "*.p[ml]" | \
+		${XARGS} ${REINPLACE_CMD} -i '' -e 's!/usr/lib/sendmail!/usr/sbin/sendmail!'
 
-pre-install:
-	@${FIND} ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;
-	@${FIND} ${WRKSRC}/docs -type f -exec ${CHMOD} ${MANMODE} {} \;
-	@${FIND} ${WRKSRC}/docs -type f -exec ${CHOWN} root:wheel {} \;
+do-build:
+	@${SED} -e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g; s:%%DOCSDIR%%:${DOCSDIR}:g" \
+		${MASTERDIR}/pkg-message >${PKGMESSAGE}
 
 do-install:
-	${MKDIR} ${PREFIX}/${BUGZILLADIR}
-	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
-		${INSTALL_SCRIPT} {} ${PREFIX}/${BUGZILLADIR} \;
-	${TAR} -C ${WRKSRC} -cf - Bugzilla template css js skins | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} --unlink -C ${DOCSDIR} -xf -
+	${MKDIR} ${BUGZILLADIR}
+	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
+		${INSTALL_SCRIPT} {} ${BUGZILLADIR} \;
+.for D in css js skins/standard
+	@${MKDIR} ${BUGZILLADIR}/${D}
+	${INSTALL_DATA} ${WRKSRC}/${D}/*.* ${BUGZILLADIR}/${D}
+.endfor
+	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${BUGZILLADIR} -xf -
+.ifndef NOPORTDOCS
+.for D in html images/callouts images pdf txt xml ""
+	${MKDIR} ${DOCSDIR}/${D}
+	${INSTALL_DATA} ${WRKSRC}/docs/${D}/*.* ${DOCSDIR}/${D}/
+.endfor
 .endif
-
-.if defined(WITH_CONTRIB)
-	${MKDIR} ${PREFIX}/${BUGZILLADIR}/contrib
+.ifdef WITH_CONTRIB
+	${MKDIR} ${BUGZILLADIR}/contrib
 	@cd ${WRKSRC}/contrib && \
-		${FIND} . -type d -exec ${MKDIR} "${PREFIX}/${BUGZILLADIR}/contrib/{}" \; && \
-		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${BUGZILLADIR}/contrib/{}" \;
-.endif
-
-.if !defined(NOPORTDOCS)
+		${FIND} . -type d -exec ${MKDIR} "${BUGZILLADIR}/contrib/{}" \; && \
+		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${BUGZILLADIR}/contrib/{}" \;
+.ifndef NOPORTDOCS
 	${MKDIR} ${DOCSDIR}/contrib
-	cd ${WRKSRC}/contrib; ${INSTALL_DATA} README README.Mailif \
-		bugmail_help.html bugzilla.procmailrc ${DOCSDIR}/contrib
+	${INSTALL_DATA} ${CONTRIB_DOCS:S!^!${WRKSRC}/contrib/!} ${DOCSDIR}/contrib
+.endif
 .endif
-
-post-install:
-	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
-		-e "s:%%BUGZILLADIR%%:${BUGZILLADIR}:g" \
-		-e "s:%%PORTDOCS%%:${PORTDOCS}:g" \
-		-e "s:%%DOCSDIR%%:${DOCSDIR}:g" \
-		${MASTERDIR}/pkg-message >${PKGMESSAGE}
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/bugzilla3/pkg-descr b/devel/bugzilla3/pkg-descr
index f4b9cfcf388e..eab95354d1eb 100644
--- a/devel/bugzilla3/pkg-descr
+++ b/devel/bugzilla3/pkg-descr
@@ -19,4 +19,4 @@ These include:
     Bugzilla email interface and checkin/checkout scripts)
   * too many more features to list
 
-WWW: http://www.mozilla.org/projects/bugzilla/
+WWW: http://www.bugzilla.org/
diff --git a/devel/bugzilla3/pkg-message b/devel/bugzilla3/pkg-message
index 0474ba8f11ec..9237e1d77785 100644
--- a/devel/bugzilla3/pkg-message
+++ b/devel/bugzilla3/pkg-message
@@ -2,10 +2,11 @@
   Bugzilla has now been installed.  To quick setup you have to:
 
   1. Create database user who has rights on bugs database manipulation
-     by following mysql commands:
+     by following mysql commands (for MySQL 4.0 or later):
 
-     GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE,DROP,REFERENCES,\
-	   LOCK TABLES ON <database>.* TO <dbuser>@<host> \
+     GRANT SELECT, INSERT, UPDATE, DELETE, INDEX, ALTER, CREATE, LOCK TABLES,
+           CREATE TEMPORARY TABLES, DROP, REFERENCES 
+	   ON <database>.* TO <dbuser>@<host> 
 	   IDENTIFIED BY '<password>';
      FLUSH PRIVILEGES;
 
@@ -13,11 +14,11 @@
            owner; <host> is a host there bugzilla is being setup;
            <password> is a database owner's password;
 
-  2. Change working directory to %%PREFIX%%/%%BUGZILLADIR%%
+  2. Change working directory to %%BUGZILLADIR%%
   3. Run "./checksetup.pl" script as root user
   4. Read output carefully and follow all instructions
 
   For more complete database setup and post-installation instructions
-  and security tips/notes please read Bugzilla Guide in
-  %%PORTDOCS%%%%DOCSDIR%% (chapter 4: Installation)
+  and security tips/notes please read "Bugzilla Guide" in
+  %%DOCSDIR%% (chapter 4: Installation)
 ==========================================================================
diff --git a/devel/bugzilla3/pkg-plist b/devel/bugzilla3/pkg-plist
index 9ccbb1189621..004d836ad011 100644
--- a/devel/bugzilla3/pkg-plist
+++ b/devel/bugzilla3/pkg-plist
@@ -1,7 +1,7 @@
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README.Mailif
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bugmail_help.html
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bugzilla.procmailrc
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/README
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/README.Mailif
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/bugmail_help.html
+%%CONTRIB%%%%PORTDOCS%%%%DOCSDIR%%/contrib/bugzilla.procmailrc
 %%PORTDOCS%%%%DOCSDIR%%/html/Bugzilla-Guide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/about.html
 %%PORTDOCS%%%%DOCSDIR%%/html/administration.html
@@ -418,7 +418,7 @@
 @dirrm %%BUGZILLADIR%%/template/en/default/account
 @dirrm %%BUGZILLADIR%%/template/en/default
 @dirrm %%BUGZILLADIR%%/template/en
-@dirrm %%BUGZILLADIR%%/template
+@unexec rmdir %D/%%BUGZILLADIR%%/template 2>/dev/null || true
 @dirrm %%BUGZILLADIR%%/css
 %%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/gnatsparse
 %%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/cmdline
@@ -427,16 +427,18 @@
 @dirrm %%BUGZILLADIR%%/Bugzilla/Auth
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template/Plugin
 @dirrm %%BUGZILLADIR%%/Bugzilla/Template
-@dirrm %%BUGZILLADIR%%/Bugzilla
+@unexec rmdir %D/%%BUGZILLADIR%%/Bugzilla 2>/dev/null || true
+@unexec rmdir %D/%%BUGZILLADIR%%/data 2>/dev/null || true
+@unexec rmdir %D/%%BUGZILLADIR%%/graphs 2>/dev/null || true
 @dirrm %%BUGZILLADIR%%/js
 @dirrm %%BUGZILLADIR%%/skins/standard
 @dirrm %%BUGZILLADIR%%/skins
-@dirrm %%BUGZILLADIR%%
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/xml
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/txt
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/pdf
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/images/callouts
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/html
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/contrib
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@unexec rmdir %D/%%BUGZILLADIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/callouts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%CONTRIB%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%