svn commit: r301627 - in head/german: . bugzilla bugzilla/files bugzilla3 bugzilla42

Fri Jul 27 22:25:15 UTC 2012

Author: ohauer
Date: Fri Jul 27 22:25:14 2012
New Revision: 301627
URL: http://svn.freebsd.org/changeset/ports/301627

Log:
  - new port german/bugzilla42
  - add patch to german/bugzilla so it reflects the security update
  - adjust version number in tempplates (3,6,10 / 4.0.7)

Added:
  head/german/bugzilla/files/
  head/german/bugzilla/files/patch-de__default__global__confirm-user-match.html.tmpl   (contents, props changed)
  head/german/bugzilla42/
     - copied from r301625, head/german/bugzilla/
Modified:
  head/german/Makefile   (contents, props changed)
  head/german/bugzilla/Makefile   (contents, props changed)
  head/german/bugzilla3/Makefile   (contents, props changed)
  head/german/bugzilla42/Makefile   (contents, props changed)
  head/german/bugzilla42/distinfo   (contents, props changed)
  head/german/bugzilla42/pkg-plist   (contents, props changed)

Modified: head/german/Makefile
==============================================================================

--- head/german/Makefile	Fri Jul 27 22:10:22 2012	(r301626)
+++ head/german/Makefile	Fri Jul 27 22:25:14 2012	(r301627)
@@ -14,6 +14,7 @@
     SUBDIR += bsdpaste
     SUBDIR += bugzilla
     SUBDIR += bugzilla3
+    SUBDIR += bugzilla42
     SUBDIR += calligra-l10n
     SUBDIR += dict
     SUBDIR += digibux

Modified: head/german/bugzilla/Makefile
==============================================================================
--- head/german/bugzilla/Makefile	Fri Jul 27 22:10:22 2012	(r301626)
+++ head/german/bugzilla/Makefile	Fri Jul 27 22:25:14 2012	(r301627)
@@ -7,7 +7,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	4.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -18,6 +18,8 @@ COMMENT=	German localization for Bugzill
 
 RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla
 
+LATEST_LINK=	${PKGNAMEPREFIX}bugzilla${PKGNAMESUFFIX}
+
 NO_WRKSUBDIR=	yes
 
 .include "${.CURDIR}/../../devel/bugzilla/Makefile.common"
@@ -26,9 +28,10 @@ LANGDIR=	${WWWDIR}/template/de
 
 # german template checks the bugzilla version number and displays
 # non supported bugzilla version, however there are no relevant
-# changes in the templates between 4.0.5 and 4.0.6
+# changes in the templates between 4.0.5 and 4.0.7
 post-patch:
-	@${SED} -i '' -e 's|4.0.5|4.0.6|' ${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${SED} -i '' -e 's|4.0.5|4.0.7|' ${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${FIND} ${WRKDIR}/ -name \*.orig -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
@@ -40,7 +43,7 @@ do-install:
 .endif
 
 # Maintainer
-plist:	extract
+plist: patch
 	@( cd ${WRKDIR}/ && ${FIND} de -type f | ${AWK} '{print "%%WWWDIR%%/template/"$$1}' | ${SORT} > ${PLIST}.new )
 	@( cd ${WRKDIR}/ && ${FIND} de -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/template/"$$1}' | ${SORT} -r >> ${PLIST}.new )
 	@if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \

Added: head/german/bugzilla/files/patch-de__default__global__confirm-user-match.html.tmpl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/german/bugzilla/files/patch-de__default__global__confirm-user-match.html.tmpl	Fri Jul 27 22:25:14 2012	(r301627)
@@ -0,0 +1,24 @@
+--- ./de/default/global/confirm-user-match.html.tmpl.orig	2012-07-27 21:42:53.000000000 +0200
++++ ./de/default/global/confirm-user-match.html.tmpl	2012-07-27 21:44:33.000000000 +0200
+@@ -159,8 +159,6 @@
+                 [% ELSE %]
+                   passte zu
+                   <b>[% query.value.users.0.identity FILTER html %]</b>
+-                  <input type="hidden" name="[% field.key FILTER html %]"
+-                         value="[% query.value.users.0.login FILTER html %]">
+                 [% END %]
+             [% ELSE %]
+                 [% IF (query.key.length < 3) && !Param('emailsuffix') %]
+@@ -186,8 +184,10 @@
+ 
+ [% IF matchsuccess == 1 %]
+ 
+-  [% SET exclude_these =
+-           matches.keys.merge(['Bugzilla_login', 'Bugzilla_password']) %]
++  [% SET exclude_these = ['Bugzilla_login', 'Bugzilla_password'] %]
++  [% FOREACH key IN matches.keys %]
++    [% exclude_these.push(key) IF cgi.param(key) == '' %]
++  [% END %]
+   [% SET exclude = '^' _ exclude_these.join('|') _ '$' %]
+   [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %]
+ 

Modified: head/german/bugzilla3/Makefile
==============================================================================
--- head/german/bugzilla3/Makefile	Fri Jul 27 22:10:22 2012	(r301626)
+++ head/german/bugzilla3/Makefile	Fri Jul 27 22:25:14 2012	(r301627)
@@ -30,7 +30,8 @@ LANGDIR=	${WWWDIR}/template/de
 # non supported bugzilla version, however there are no relevant
 # changes in the template between 3.6.8 and 3.6.9
 post-patch:
-	@${SED} -i '' -e 's|3.6.8|3.6.9|' ${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${SED} -i '' -e 's|3.6.8|3.6.10|' ${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${FIND} ${WRKDIR}/ -name \*.orig -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
@@ -42,7 +43,7 @@ do-install:
 .endif
 
 # Maintainer
-plist:	extract
+plist: patch
 	@( cd ${WRKDIR}/ && ${FIND} de -type f | ${AWK} '{print "%%WWWDIR%%/template/"$$1}' | ${SORT} > ${PLIST}.new )
 	@( cd ${WRKDIR}/ && ${FIND} de -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/template/"$$1}' | ${SORT} -r >> ${PLIST}.new )
 	@if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \

Modified: head/german/bugzilla42/Makefile
==============================================================================
--- head/german/bugzilla/Makefile	Fri Jul 27 21:34:04 2012	(r301625)
+++ head/german/bugzilla42/Makefile	Fri Jul 27 22:25:14 2012	(r301627)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bugzilla
-PORTVERSION=	4.0.5
-PORTREVISION=	1
+PORTVERSION=	4.2.1
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -16,19 +15,20 @@ DISTNAME=	germzilla-${PORTVERSION}-1.utf
 MAINTAINER=	ohauer at FreeBSD.org
 COMMENT=	German localization for Bugzilla
 
-RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla
+RUN_DEPENDS=	bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla42
+
+LATEST_LINK=	${PKGNAMEPREFIX}bugzilla42${PKGNAMESUFFIX}
 
 NO_WRKSUBDIR=	yes
 
-.include "${.CURDIR}/../../devel/bugzilla/Makefile.common"
+.include "${.CURDIR}/../../devel/bugzilla42/Makefile.common"
 
 LANGDIR=	${WWWDIR}/template/de
 
 # german template checks the bugzilla version number and displays
-# non supported bugzilla version, however there are no relevant
-# changes in the templates between 4.0.5 and 4.0.6
+# non supported bugzilla version.
 post-patch:
-	@${SED} -i '' -e 's|4.0.5|4.0.6|' ${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${FIND} ${WRKDIR}/ -name \*.orig -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
@@ -40,7 +40,7 @@ do-install:
 .endif
 
 # Maintainer
-plist:	extract
+plist: patch
 	@( cd ${WRKDIR}/ && ${FIND} de -type f | ${AWK} '{print "%%WWWDIR%%/template/"$$1}' | ${SORT} > ${PLIST}.new )
 	@( cd ${WRKDIR}/ && ${FIND} de -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/template/"$$1}' | ${SORT} -r >> ${PLIST}.new )
 	@if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \

Modified: head/german/bugzilla42/distinfo
==============================================================================
--- head/german/bugzilla/distinfo	Fri Jul 27 21:34:04 2012	(r301625)
+++ head/german/bugzilla42/distinfo	Fri Jul 27 22:25:14 2012	(r301627)
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/germzilla-4.0.5-1.utf-8.tar.gz) = 4bb1b085e040eef4cef0612104cc7a03bb8db48f309644d69e6a716b5407572a
-SIZE (bugzilla/germzilla-4.0.5-1.utf-8.tar.gz) = 264181
+SHA256 (bugzilla/germzilla-4.2.1-1.utf-8.tar.gz) = 26e10c32bcdb53b9a3c8d33fca3d2e51c09a3f0e3b1393c66d86a48ed1c772d4
+SIZE (bugzilla/germzilla-4.2.1-1.utf-8.tar.gz) = 270855

Modified: head/german/bugzilla42/pkg-plist
==============================================================================
--- head/german/bugzilla/pkg-plist	Fri Jul 27 21:34:04 2012	(r301625)
+++ head/german/bugzilla42/pkg-plist	Fri Jul 27 22:25:14 2012	(r301627)
@@ -113,7 +113,6 @@
 %%WWWDIR%%/template/de/default/admin/versions/select-product.html.tmpl
 %%WWWDIR%%/template/de/default/admin/workflow/comment.html.tmpl
 %%WWWDIR%%/template/de/default/admin/workflow/edit.html.tmpl
-%%WWWDIR%%/template/de/default/attachment/cancel-create-dupe.html.tmpl
 %%WWWDIR%%/template/de/default/attachment/choose.html.tmpl
 %%WWWDIR%%/template/de/default/attachment/confirm-delete.html.tmpl
 %%WWWDIR%%/template/de/default/attachment/create.html.tmpl
@@ -133,7 +132,6 @@
 %%WWWDIR%%/template/de/default/bug/choose.html.tmpl
 %%WWWDIR%%/template/de/default/bug/comments.html.tmpl
 %%WWWDIR%%/template/de/default/bug/create/comment-guided.txt.tmpl
-%%WWWDIR%%/template/de/default/bug/create/confirm-create-dupe.html.tmpl
 %%WWWDIR%%/template/de/default/bug/create/create-guided.html.tmpl
 %%WWWDIR%%/template/de/default/bug/create/create.html.tmpl
 %%WWWDIR%%/template/de/default/bug/create/created.html.tmpl
@@ -146,6 +144,7 @@
 %%WWWDIR%%/template/de/default/bug/field.html.tmpl
 %%WWWDIR%%/template/de/default/bug/format_comment.txt.tmpl
 %%WWWDIR%%/template/de/default/bug/knob.html.tmpl
+%%WWWDIR%%/template/de/default/bug/link.html.tmpl
 %%WWWDIR%%/template/de/default/bug/navigate.html.tmpl
 %%WWWDIR%%/template/de/default/bug/process/bugmail.html.tmpl
 %%WWWDIR%%/template/de/default/bug/process/confirm-duplicate.html.tmpl
@@ -157,11 +156,13 @@
 %%WWWDIR%%/template/de/default/bug/show-multiple.html.tmpl
 %%WWWDIR%%/template/de/default/bug/show.html.tmpl
 %%WWWDIR%%/template/de/default/bug/summarize-time.html.tmpl
+%%WWWDIR%%/template/de/default/email/bugmail-common.txt.tmpl
+%%WWWDIR%%/template/de/default/email/bugmail-header.txt.tmpl
+%%WWWDIR%%/template/de/default/email/bugmail.html.tmpl
+%%WWWDIR%%/template/de/default/email/bugmail.txt.tmpl
 %%WWWDIR%%/template/de/default/email/lockout.txt.tmpl
-%%WWWDIR%%/template/de/default/email/newchangedmail.txt.tmpl
 %%WWWDIR%%/template/de/default/email/sanitycheck.txt.tmpl
 %%WWWDIR%%/template/de/default/email/sudo.txt.tmpl
-%%WWWDIR%%/template/de/default/email/votes-removed.txt.tmpl
 %%WWWDIR%%/template/de/default/email/whine.txt.tmpl
 %%WWWDIR%%/template/de/default/filterexceptions.pl
 %%WWWDIR%%/template/de/default/flag/list.html.tmpl
@@ -185,6 +186,7 @@
 %%WWWDIR%%/template/de/default/global/tabs.html.tmpl
 %%WWWDIR%%/template/de/default/global/useful-links.html.tmpl
 %%WWWDIR%%/template/de/default/global/user-error.html.tmpl
+%%WWWDIR%%/template/de/default/global/value-descs.none.tmpl
 %%WWWDIR%%/template/de/default/global/variables.none.tmpl
 %%WWWDIR%%/template/de/default/index.html.tmpl
 %%WWWDIR%%/template/de/default/list/change-columns.html.tmpl
@@ -199,9 +201,7 @@
 %%WWWDIR%%/template/de/default/pages/linked.html.tmpl
 %%WWWDIR%%/template/de/default/pages/linkify.html.tmpl
 %%WWWDIR%%/template/de/default/pages/quicksearch.html.tmpl
-%%WWWDIR%%/template/de/default/pages/quicksearchhack.html.tmpl
 %%WWWDIR%%/template/de/default/pages/sudo.html.tmpl
-%%WWWDIR%%/template/de/default/pages/voting.html.tmpl
 %%WWWDIR%%/template/de/default/reports/chart.csv.tmpl
 %%WWWDIR%%/template/de/default/reports/chart.html.tmpl
 %%WWWDIR%%/template/de/default/reports/chart.png.tmpl
@@ -223,19 +223,19 @@
 %%WWWDIR%%/template/de/default/request/email.txt.tmpl
 %%WWWDIR%%/template/de/default/request/queue.html.tmpl
 %%WWWDIR%%/template/de/default/search/boolean-charts.html.tmpl
+%%WWWDIR%%/template/de/default/search/field.html.tmpl
 %%WWWDIR%%/template/de/default/search/form.html.tmpl
 %%WWWDIR%%/template/de/default/search/knob.html.tmpl
 %%WWWDIR%%/template/de/default/search/search-advanced.html.tmpl
 %%WWWDIR%%/template/de/default/search/search-create-series.html.tmpl
-%%WWWDIR%%/template/de/default/search/search-help.html.tmpl
 %%WWWDIR%%/template/de/default/search/search-plugin.xml.tmpl
 %%WWWDIR%%/template/de/default/search/search-report-graph.html.tmpl
 %%WWWDIR%%/template/de/default/search/search-report-select.html.tmpl
 %%WWWDIR%%/template/de/default/search/search-report-table.html.tmpl
 %%WWWDIR%%/template/de/default/search/search-specific.html.tmpl
 %%WWWDIR%%/template/de/default/search/tabs.html.tmpl
+%%WWWDIR%%/template/de/default/search/type-select.html.tmpl
 %%WWWDIR%%/template/de/default/setup/strings.txt.pl
-%%WWWDIR%%/template/de/default/sidebar.xul.tmpl
 %%WWWDIR%%/template/de/default/welcome-admin.html.tmpl
 %%WWWDIR%%/template/de/default/whine/mail.html.tmpl
 %%WWWDIR%%/template/de/default/whine/mail.txt.tmpl

