9 files changed, 54 insertions, 27 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 642b31552f8c..46a6c7b83e2c 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	bugzilla
-PORTVERSION?=	2.18
-PORTREVISION?=	2
+PORTVERSION?=	2.18.1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -16,6 +15,7 @@ MAINTAINER?=	skv@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
 OPTIONS=	CHARTING_MODULES "Bug charting support" on \
+		GRAPHVIZ "Use GraphViz" off \
 		EMAIL_GATEWAY "Use email gateway" off \
 		EXPORT_IMPORT "Import/export bugs (via XML)" off \
 		CONTRIB	"Install user-contributed scripts" off \
@@ -59,6 +59,10 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
+.ifdef WITH_GRAPHVIZ
+RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+.endif
+
 .ifdef WITH_EMAIL_GATEWAY
 RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
diff --git a/devel/bugzilla/distinfo b/devel/bugzilla/distinfo
index 7d0369a5d06a..7178e33aa8d3 100644
--- a/devel/bugzilla/distinfo
+++ b/devel/bugzilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (bugzilla-2.18.tar.gz) = 243089e2137ecfc8f857dbbeae0ad1d7
-SIZE (bugzilla-2.18.tar.gz) = 1490302
+MD5 (bugzilla-2.18.1.tar.gz) = 3765b0021377d626a9b8c50868dd51b9
+SIZE (bugzilla-2.18.1.tar.gz) = 1542054
diff --git a/devel/bugzilla/pkg-plist b/devel/bugzilla/pkg-plist
index 004d836ad011..fd680aee1637 100644
--- a/devel/bugzilla/pkg-plist
+++ b/devel/bugzilla/pkg-plist
@@ -71,6 +71,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/security-webserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-passwd-encryption.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-relogin-everyone.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trouble-filetemp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
@@ -81,11 +82,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/versions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/voting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2868.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2875.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2885.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2890.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2944.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2918.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2925.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2935.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2940.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2994.html
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.png
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.xml
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.gif
@@ -174,8 +175,12 @@
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla.procmailrc
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_email_append.pl
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_ldapsync.rb
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugcount
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugids
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/buglist
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugs
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugslink
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/makequery
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/query.conf
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cvs-update.pl
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/gnats2bz.pl
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index 642b31552f8c..46a6c7b83e2c 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	bugzilla
-PORTVERSION?=	2.18
-PORTREVISION?=	2
+PORTVERSION?=	2.18.1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -16,6 +15,7 @@ MAINTAINER?=	skv@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
 OPTIONS=	CHARTING_MODULES "Bug charting support" on \
+		GRAPHVIZ "Use GraphViz" off \
 		EMAIL_GATEWAY "Use email gateway" off \
 		EXPORT_IMPORT "Import/export bugs (via XML)" off \
 		CONTRIB	"Install user-contributed scripts" off \
@@ -59,6 +59,10 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
+.ifdef WITH_GRAPHVIZ
+RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+.endif
+
 .ifdef WITH_EMAIL_GATEWAY
 RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
diff --git a/devel/bugzilla2/distinfo b/devel/bugzilla2/distinfo
index 7d0369a5d06a..7178e33aa8d3 100644
--- a/devel/bugzilla2/distinfo
+++ b/devel/bugzilla2/distinfo
@@ -1,2 +1,2 @@
-MD5 (bugzilla-2.18.tar.gz) = 243089e2137ecfc8f857dbbeae0ad1d7
-SIZE (bugzilla-2.18.tar.gz) = 1490302
+MD5 (bugzilla-2.18.1.tar.gz) = 3765b0021377d626a9b8c50868dd51b9
+SIZE (bugzilla-2.18.1.tar.gz) = 1542054
diff --git a/devel/bugzilla2/pkg-plist b/devel/bugzilla2/pkg-plist
index 004d836ad011..fd680aee1637 100644
--- a/devel/bugzilla2/pkg-plist
+++ b/devel/bugzilla2/pkg-plist
@@ -71,6 +71,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/security-webserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-passwd-encryption.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-relogin-everyone.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trouble-filetemp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
@@ -81,11 +82,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/versions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/voting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2868.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2875.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2885.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2890.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2944.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2918.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2925.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2935.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2940.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2994.html
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.png
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.xml
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.gif
@@ -174,8 +175,12 @@
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla.procmailrc
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_email_append.pl
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_ldapsync.rb
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugcount
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugids
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/buglist
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugs
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugslink
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/makequery
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/query.conf
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cvs-update.pl
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/gnats2bz.pl
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 642b31552f8c..46a6c7b83e2c 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	bugzilla
-PORTVERSION?=	2.18
-PORTREVISION?=	2
+PORTVERSION?=	2.18.1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -16,6 +15,7 @@ MAINTAINER?=	skv@FreeBSD.org
 COMMENT?=	Bug-tracking system developed by Mozilla Project
 
 OPTIONS=	CHARTING_MODULES "Bug charting support" on \
+		GRAPHVIZ "Use GraphViz" off \
 		EMAIL_GATEWAY "Use email gateway" off \
 		EXPORT_IMPORT "Import/export bugs (via XML)" off \
 		CONTRIB	"Install user-contributed scripts" off \
@@ -59,6 +59,10 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/GD/Text/Align.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 .endif
 
+.ifdef WITH_GRAPHVIZ
+RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+.endif
+
 .ifdef WITH_EMAIL_GATEWAY
 RUN_DEPENDS+=	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
 .endif
diff --git a/devel/bugzilla3/distinfo b/devel/bugzilla3/distinfo
index 7d0369a5d06a..7178e33aa8d3 100644
--- a/devel/bugzilla3/distinfo
+++ b/devel/bugzilla3/distinfo
@@ -1,2 +1,2 @@
-MD5 (bugzilla-2.18.tar.gz) = 243089e2137ecfc8f857dbbeae0ad1d7
-SIZE (bugzilla-2.18.tar.gz) = 1490302
+MD5 (bugzilla-2.18.1.tar.gz) = 3765b0021377d626a9b8c50868dd51b9
+SIZE (bugzilla-2.18.1.tar.gz) = 1542054
diff --git a/devel/bugzilla3/pkg-plist b/devel/bugzilla3/pkg-plist
index 004d836ad011..fd680aee1637 100644
--- a/devel/bugzilla3/pkg-plist
+++ b/devel/bugzilla3/pkg-plist
@@ -71,6 +71,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/security-webserver.html
 %%PORTDOCS%%%%DOCSDIR%%/html/security.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trbl-passwd-encryption.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trbl-relogin-everyone.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trouble-filetemp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
@@ -81,11 +82,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/versions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/voting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2868.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2875.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2885.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2890.html
-%%PORTDOCS%%%%DOCSDIR%%/html/x2944.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2918.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2925.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2935.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2940.html
+%%PORTDOCS%%%%DOCSDIR%%/html/x2994.html
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.png
 %%PORTDOCS%%%%DOCSDIR%%/images/bzLifecycle.xml
 %%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.gif
@@ -174,8 +175,12 @@
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla.procmailrc
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_email_append.pl
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_ldapsync.rb
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugcount
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugids
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/buglist
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugs
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/bugslink
+%%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/makequery
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cmdline/query.conf
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/cvs-update.pl
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/gnats2bz.pl