Date: Thu, 20 Jun 2013 21:54:03 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321428 - in head: devel/bugzilla devel/bugzilla3 devel/bugzilla42 russian/bugzilla42 Message-ID: <201306202154.r5KLs3BY092581@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Thu Jun 20 21:54:02 2013 New Revision: 321428 URL: http://svnweb.freebsd.org/changeset/ports/321428 Log: - 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 Modified: head/devel/bugzilla/Makefile head/devel/bugzilla/Makefile.common head/devel/bugzilla/Makefile.options head/devel/bugzilla3/Makefile head/devel/bugzilla3/Makefile.common head/devel/bugzilla3/Makefile.options head/devel/bugzilla42/Makefile head/devel/bugzilla42/Makefile.common head/devel/bugzilla42/Makefile.options head/russian/bugzilla42/Makefile head/russian/bugzilla42/distinfo Modified: head/devel/bugzilla/Makefile ============================================================================== --- head/devel/bugzilla/Makefile Thu Jun 20 21:22:57 2013 (r321427) +++ head/devel/bugzilla/Makefile Thu Jun 20 21:54:02 2013 (r321428) @@ -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 Modified: head/devel/bugzilla/Makefile.common ============================================================================== --- head/devel/bugzilla/Makefile.common Thu Jun 20 21:22:57 2013 (r321427) +++ head/devel/bugzilla/Makefile.common Thu Jun 20 21:54:02 2013 (r321428) @@ -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 Modified: head/devel/bugzilla/Makefile.options ============================================================================== --- head/devel/bugzilla/Makefile.options Thu Jun 20 21:22:57 2013 (r321427) +++ head/devel/bugzilla/Makefile.options Thu Jun 20 21:54:02 2013 (r321428) @@ -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 ( 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 + Modified: head/devel/bugzilla3/Makefile ============================================================================== --- head/devel/bugzilla3/Makefile Thu Jun 20 21:22:57 2013 (r321427) +++ head/devel/bugzilla3/Makefile Thu Jun 20 21:54:02 2013 (r321428) @@ -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 Modified: head/devel/bugzilla3/Makefile.common ============================================================================== --- head/devel/bugzilla3/Makefile.common Thu Jun 20 21:22:57 2013 (r321427) +++ head/devel/bugzilla3/Makefile.common Thu Jun 20 21:54:02 2013 (r321428) @@ -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 Modified: head/devel/bugzilla3/Makefile.options ============================================================================== --- head/devel/bugzilla3/Makefile.options Thu Jun 20 21:22:57 2013 (r321427) +++ head/devel/bugzilla3/Makefile.options Thu Jun 20 21:54:02 2013 (r321428) @@ -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 ( 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 + Modified: head/devel/bugzilla42/Makefile ============================================================================== --- head/devel/bugzilla42/Makefile Thu Jun 20 21:22:57 2013 (r321427) +++ head/devel/bugzilla42/Makefile Thu Jun 20 21:54:02 2013 (r321428) @@ -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 Modified: head/devel/bugzilla42/Makefile.common ============================================================================== --- head/devel/bugzilla42/Makefile.common Thu Jun 20 21:22:57 2013 (r321427) +++ head/devel/bugzilla42/Makefile.common Thu Jun 20 21:54:02 2013 (r321428) @@ -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 Modified: head/devel/bugzilla42/Makefile.options ============================================================================== --- head/devel/bugzilla42/Makefile.options Thu Jun 20 21:22:57 2013 (r321427) +++ head/devel/bugzilla42/Makefile.options Thu Jun 20 21:54:02 2013 (r321428) @@ -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 ( 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 + Modified: head/russian/bugzilla42/Makefile ============================================================================== --- head/russian/bugzilla42/Makefile Thu Jun 20 21:22:57 2013 (r321427) +++ head/russian/bugzilla42/Makefile Thu Jun 20 21:54:02 2013 (r321428) @@ -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 Modified: head/russian/bugzilla42/distinfo ============================================================================== --- head/russian/bugzilla42/distinfo Thu Jun 20 21:22:57 2013 (r321427) +++ head/russian/bugzilla42/distinfo Thu Jun 20 21:54:02 2013 (r321428) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306202154.r5KLs3BY092581>