- use OPTION_GROUP in all devel/bugzilla ports

- s/CONFLICTS/CONFLICTS_INSTALL/
- use easier CONFLICT notation (future proof)
- trim Makefile.common header
- update russian/bugzilla42 language template to version 4.2.6

11 files changed, 145 insertions, 82 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index ba08d659437f..915d973d5768 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -140,7 +140,7 @@ post-patch:
 	@${PERL} -pi -e 's/(default => ON_WINDOWS.+)apache/$$1www/' \
 		${WRKSRC}/Bugzilla/Install/Localconfig.pm
 
-.if ${PORT_OPTIONS:MPGSQL} && empty(PORT_OPTIONS:MMYSQL)
+.if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL}
 	@${PERL} -pi -e 's/(default =>.+|Default is )mysql/$$1Pg/' \
 		${WRKSRC}/Bugzilla/Install/Localconfig.pm
 .endif
diff --git a/devel/bugzilla/Makefile.common b/devel/bugzilla/Makefile.common
index e3412fb7ba93..feb60374b821 100644
--- a/devel/bugzilla/Makefile.common
+++ b/devel/bugzilla/Makefile.common
@@ -1,15 +1,14 @@
-#
 # $FreeBSD$
-#
 
 DIST_SUBDIR=	${PORTNAME}
 
-CONFLICTS=	bugzilla-3.* \
-		bugzilla-4.[2|4].*
+CONFLICTS_INSTALL=	\
+		bugzilla-3.* \
+		bugzilla-4.[^0].*
 
 PORTSCOUT=	limit:^4\.0\.
 
-WWWDIR=	${PREFIX}/www/bugzilla
+WWWDIR=		${PREFIX}/www/bugzilla
 
 NO_BUILD=	yes
 
diff --git a/devel/bugzilla/Makefile.options b/devel/bugzilla/Makefile.options
index b557522683e8..8b6def64de1c 100644
--- a/devel/bugzilla/Makefile.options
+++ b/devel/bugzilla/Makefile.options
@@ -1,32 +1,47 @@
 # $FreeBSD$
 
-NO_OPTIONS_SORT=	yes
-
-OPTIONS_DEFINE=	\
+OPTIONS_DEFINE=		\
 	DOCS		\
-	MYSQL		\
-	PGSQL		\
-	GRAPHVIZ	\
-	GRAPH_REPORTS	\
-	CHARTING_MODULES\
-	PATCH_VIEWER	\
-	MORE_HTML	\
-	INBOUND_EMAIL	\
-	MAIL_QUEUEING	\
+	MODPERL
+
+OPTIONS_GROUP=	UI DBBACKEND REPORTING ATTACHMENT EMAIL WEBSERVICE AUTH ADMIN
+
+OPTION_GROUP_ADMIN=	\
 	MOVE_BUGZ	\
-	BMP2PNG		\
-	XMLRPC		\
-	JSONRPC		\
-	MODPERL		\
 	EXPORT_IMPORT	\
-	CONTRIB		\
+	CONTRIB
+
+OPTIONS_GROUP_ATTACHMENT= \
+	BMP2PNG
+
+OPTIONS_GROUP_AUTH= 	\
 	LDAP		\
 	RADIUS
 
+OPTIONS_GROUP_DBBACKEND= \
+	MYSQL		\
+	PGSQL
+
+OPTIONS_GROUP_EMAIL= 	\
+	INBOUND_EMAIL	\
+	MAIL_QUEUEING
+
+OPTIONS_GROUP_REPORTING= \
+	GRAPHVIZ	\
+	GRAPH_REPORTS	\
+	CHARTING_MODULES
+
+OPTIONS_GROUP_WEBSERVICE= \
+	XMLRPC		\
+	JSONRPC
+
+OPTIONS_GROUP_UI= 	\
+	PATCH_VIEWER	\
+	MORE_HTML
+
 OPTIONS_DEFAULT=	\
 	CHARTING_MODULES\
 	CONTRIB		\
-	DOCS		\
 	GRAPH_REPORTS	\
 	MORE_HTML	\
 	PATCH_VIEWER
@@ -38,11 +53,18 @@ EXPORT_IMPORT_DESC=	Import/export bugs (via XML)
 GRAPH_REPORTS_DESC=	Graphical Reports
 INBOUND_EMAIL_DESC=	Inbound Email
 JSONRPC_DESC=		JSON-RPC Interface
-LDAP_DESC=		LDAP Authentication
 MAIL_QUEUEING_DESC=	Mail Queueing
 MORE_HTML_DESC=		More HTML in Product/Group Descriptions
 MOVE_BUGZ_DESC=		Move Bugs Between Installations
 PATCH_VIEWER_DESC=	Patch Viewer
-RADIUS_DESC=		RADIUS Authentication
 XMLRPC_DESC=		XML-RPC Interface
 
+# Option group description
+ADMIN_DESC=		Administration
+ATTACHMENT_DESC=	Attachment handling
+AUTH_DESC=		Alternative Authentication
+DBBACKEND_DESC=		Database Engine
+EMAIL_DESC=		Email handling
+REPORTING_DESC= 	Reports and Charts
+WEBSERVICE_DESC=	Web Services
+
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 1115641433b8..8e6d8648d9a4 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -143,7 +143,7 @@ post-patch:
 	@${PERL} -pi -e 's/(default => ON_WINDOWS.+)apache/$$1www/' \
 		${WRKSRC}/Bugzilla/Install/Localconfig.pm
 
-.if ${PORT_OPTIONS:MPGSQL} && empty(PORT_OPTIONS:MMYSQL)
+.if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL}
 	@${PERL} -pi -e 's/(default =>.+|Default is )mysql/$$1Pg/' \
 		${WRKSRC}/Bugzilla/Install/Localconfig.pm
 .endif
diff --git a/devel/bugzilla3/Makefile.common b/devel/bugzilla3/Makefile.common
index 1bb4634ba701..70419b575b09 100644
--- a/devel/bugzilla3/Makefile.common
+++ b/devel/bugzilla3/Makefile.common
@@ -1,14 +1,13 @@
-#
 # $FreeBSD$
-#
 
 DIST_SUBDIR=	${PORTNAME}
 
-CONFLICTS=	bugzilla-4.*
+CONFLICTS_INSTALL=	\
+		bugzilla-4.*
 
 PORTSCOUT=	limitw:1,even
 
-WWWDIR=	${PREFIX}/www/bugzilla
+WWWDIR=		${PREFIX}/www/bugzilla
 
 NO_BUILD=	yes
 
diff --git a/devel/bugzilla3/Makefile.options b/devel/bugzilla3/Makefile.options
index b557522683e8..8b6def64de1c 100644
--- a/devel/bugzilla3/Makefile.options
+++ b/devel/bugzilla3/Makefile.options
@@ -1,32 +1,47 @@
 # $FreeBSD$
 
-NO_OPTIONS_SORT=	yes
-
-OPTIONS_DEFINE=	\
+OPTIONS_DEFINE=		\
 	DOCS		\
-	MYSQL		\
-	PGSQL		\
-	GRAPHVIZ	\
-	GRAPH_REPORTS	\
-	CHARTING_MODULES\
-	PATCH_VIEWER	\
-	MORE_HTML	\
-	INBOUND_EMAIL	\
-	MAIL_QUEUEING	\
+	MODPERL
+
+OPTIONS_GROUP=	UI DBBACKEND REPORTING ATTACHMENT EMAIL WEBSERVICE AUTH ADMIN
+
+OPTION_GROUP_ADMIN=	\
 	MOVE_BUGZ	\
-	BMP2PNG		\
-	XMLRPC		\
-	JSONRPC		\
-	MODPERL		\
 	EXPORT_IMPORT	\
-	CONTRIB		\
+	CONTRIB
+
+OPTIONS_GROUP_ATTACHMENT= \
+	BMP2PNG
+
+OPTIONS_GROUP_AUTH= 	\
 	LDAP		\
 	RADIUS
 
+OPTIONS_GROUP_DBBACKEND= \
+	MYSQL		\
+	PGSQL
+
+OPTIONS_GROUP_EMAIL= 	\
+	INBOUND_EMAIL	\
+	MAIL_QUEUEING
+
+OPTIONS_GROUP_REPORTING= \
+	GRAPHVIZ	\
+	GRAPH_REPORTS	\
+	CHARTING_MODULES
+
+OPTIONS_GROUP_WEBSERVICE= \
+	XMLRPC		\
+	JSONRPC
+
+OPTIONS_GROUP_UI= 	\
+	PATCH_VIEWER	\
+	MORE_HTML
+
 OPTIONS_DEFAULT=	\
 	CHARTING_MODULES\
 	CONTRIB		\
-	DOCS		\
 	GRAPH_REPORTS	\
 	MORE_HTML	\
 	PATCH_VIEWER
@@ -38,11 +53,18 @@ EXPORT_IMPORT_DESC=	Import/export bugs (via XML)
 GRAPH_REPORTS_DESC=	Graphical Reports
 INBOUND_EMAIL_DESC=	Inbound Email
 JSONRPC_DESC=		JSON-RPC Interface
-LDAP_DESC=		LDAP Authentication
 MAIL_QUEUEING_DESC=	Mail Queueing
 MORE_HTML_DESC=		More HTML in Product/Group Descriptions
 MOVE_BUGZ_DESC=		Move Bugs Between Installations
 PATCH_VIEWER_DESC=	Patch Viewer
-RADIUS_DESC=		RADIUS Authentication
 XMLRPC_DESC=		XML-RPC Interface
 
+# Option group description
+ADMIN_DESC=		Administration
+ATTACHMENT_DESC=	Attachment handling
+AUTH_DESC=		Alternative Authentication
+DBBACKEND_DESC=		Database Engine
+EMAIL_DESC=		Email handling
+REPORTING_DESC= 	Reports and Charts
+WEBSERVICE_DESC=	Web Services
+
diff --git a/devel/bugzilla42/Makefile b/devel/bugzilla42/Makefile
index cfee79dd0541..669b86307688 100644
--- a/devel/bugzilla42/Makefile
+++ b/devel/bugzilla42/Makefile
@@ -49,7 +49,7 @@ USE_APACHE_RUN=	22+
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
+USE_MYSQL=	yes
 RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
@@ -149,7 +149,7 @@ post-patch:
 	@${PERL} -pi -e 's/(default => ON_WINDOWS.+)apache/$$1www/' \
 		${WRKSRC}/Bugzilla/Install/Localconfig.pm
 
-.if ${PORT_OPTIONS:MPGSQL} && empty(PORT_OPTIONS:MMYSQL)
+.if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL}
 	@${PERL} -pi -e 's/(default =>.+|Default is )mysql/$$1Pg/' \
 		${WRKSRC}/Bugzilla/Install/Localconfig.pm
 .endif
diff --git a/devel/bugzilla42/Makefile.common b/devel/bugzilla42/Makefile.common
index 596ea0eafc0d..9a212094b4d5 100644
--- a/devel/bugzilla42/Makefile.common
+++ b/devel/bugzilla42/Makefile.common
@@ -1,15 +1,14 @@
-#
 # $FreeBSD$
-#
 
 DIST_SUBDIR=	${PORTNAME}
 
-CONFLICTS=	bugzilla-3.* \
-		bugzilla-4.[0|4].*
+CONFLICTS_INSTALL=	\
+		bugzilla-3.* \
+		bugzilla-4.[^2].*
 
 PORTSCOUT=	limitw:1,even
 
-WWWDIR=	${PREFIX}/www/bugzilla
+WWWDIR=		${PREFIX}/www/bugzilla
 
 NO_BUILD=	yes
 
diff --git a/devel/bugzilla42/Makefile.options b/devel/bugzilla42/Makefile.options
index b6d1a15c1024..b6286a835468 100644
--- a/devel/bugzilla42/Makefile.options
+++ b/devel/bugzilla42/Makefile.options
@@ -1,33 +1,48 @@
 # $FreeBSD$
 
-NO_OPTIONS_SORT=	yes
-
-OPTIONS_DEFINE=	\
+OPTIONS_DEFINE=		\
 	DOCS		\
+	MODPERL
+
+OPTIONS_GROUP=	UI DBBACKEND REPORTING ATTACHMENT EMAIL WEBSERVICE AUTH ADMIN
+
+OPTION_GROUP_ADMIN=	\
+	MOVE_BUGZ	\
+	EXPORT_IMPORT	\
+	CONTRIB
+
+OPTIONS_GROUP_ATTACHMENT= \
+	BMP2PNG
+
+OPTIONS_GROUP_AUTH= 	\
+	LDAP		\
+	RADIUS
+
+OPTIONS_GROUP_DBBACKEND= \
 	MYSQL		\
 	PGSQL		\
-	SQLITE		\
+	SQLITE
+
+OPTIONS_GROUP_EMAIL= 	\
+	INBOUND_EMAIL	\
+	MAIL_QUEUEING
+
+OPTIONS_GROUP_REPORTING= \
 	GRAPHVIZ	\
 	GRAPH_REPORTS	\
-	CHARTING_MODULES\
-	PATCH_VIEWER	\
-	MORE_HTML	\
-	INBOUND_EMAIL	\
-	MAIL_QUEUEING	\
-	MOVE_BUGZ	\
-	BMP2PNG		\
+	CHARTING_MODULES
+
+OPTIONS_GROUP_WEBSERVICE= \
 	XMLRPC		\
-	JSONRPC		\
-	MODPERL		\
-	EXPORT_IMPORT	\
-	CONTRIB		\
-	LDAP		\
-	RADIUS
+	JSONRPC
+
+OPTIONS_GROUP_UI= 	\
+	PATCH_VIEWER	\
+	MORE_HTML
 
 OPTIONS_DEFAULT=	\
 	CHARTING_MODULES\
 	CONTRIB		\
-	DOCS		\
 	GRAPH_REPORTS	\
 	MORE_HTML	\
 	PATCH_VIEWER
@@ -39,11 +54,18 @@ EXPORT_IMPORT_DESC=	Import/export bugs (via XML)
 GRAPH_REPORTS_DESC=	Graphical Reports
 INBOUND_EMAIL_DESC=	Inbound Email
 JSONRPC_DESC=		JSON-RPC Interface
-LDAP_DESC=		LDAP Authentication
 MAIL_QUEUEING_DESC=	Mail Queueing
 MORE_HTML_DESC=		More HTML in Product/Group Descriptions
 MOVE_BUGZ_DESC=		Move Bugs Between Installations
 PATCH_VIEWER_DESC=	Patch Viewer
-RADIUS_DESC=		RADIUS Authentication
 XMLRPC_DESC=		XML-RPC Interface
 
+# Option group description
+ADMIN_DESC=		Administration
+ATTACHMENT_DESC=	Attachment handling
+AUTH_DESC=		Alternative Authentication
+DBBACKEND_DESC=		Database Engine
+EMAIL_DESC=		Email handling
+REPORTING_DESC= 	Reports and Charts
+WEBSERVICE_DESC=	Web Services
+
diff --git a/russian/bugzilla42/Makefile b/russian/bugzilla42/Makefile
index 758a410fc892..ff940628cff2 100644
--- a/russian/bugzilla42/Makefile
+++ b/russian/bugzilla42/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	bugzilla
-PORTVERSION=	4.2.5
+PORTVERSION=	4.2.6
 CATEGORIES=	russian
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-ru/bugzilla-${PORTVERSION:R}-ru/${PORTVERSION}
-DISTNAME=	bugzilla-${PORTVERSION}-ru-20130222
+DISTNAME=	bugzilla-${PORTVERSION}-ru-20130618
 
 MAINTAINER=	bugzilla@FreeBSD.org
 COMMENT=	Russian localization for Bugzilla
diff --git a/russian/bugzilla42/distinfo b/russian/bugzilla42/distinfo
index 5a2e668d3c0b..868fd4a0ebc8 100644
--- a/russian/bugzilla42/distinfo
+++ b/russian/bugzilla42/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/bugzilla-4.2.5-ru-20130222.tar.gz) = 88111e180d4812955458e94f36ab9c554142349aa68343ae73694853a3596ca4
-SIZE (bugzilla/bugzilla-4.2.5-ru-20130222.tar.gz) = 356915
+SHA256 (bugzilla/bugzilla-4.2.6-ru-20130618.tar.gz) = fb71f84d2854bebefe89dae58793907b9e1727e5e4d7f24373dee9b591af145f
+SIZE (bugzilla/bugzilla-4.2.6-ru-20130618.tar.gz) = 356835