- update german and russian bugzilla templates to official new versions

- remove hotfixes from german templates

Feature safe: yes

3 files changed, 7 insertions, 52 deletions

diff --git a/german/bugzilla3/Makefile b/german/bugzilla3/Makefile
index 03e84d0e0c4c..bca38dbb68c3 100644
--- a/german/bugzilla3/Makefile
+++ b/german/bugzilla3/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugzilla
-PORTVERSION=	3.6.11
-PORTREVISION=	1
+PORTVERSION=	3.6.12
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -21,10 +20,10 @@ NO_WRKSUBDIR=	yes
 
 LANGDIR=	${WWWDIR}/template/de
 
-post-patch:
-	@${REINPLACE_CMD} -i '' -e 's/3.6.11/3.6.12/' \
-		${WRKDIR}/de/default/global/gzversion.html.tmpl
-	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
+#post-patch:
+#	@${REINPLACE_CMD} -i '' -e 's/3.6.11/3.6.12/' \
+#		${WRKDIR}/de/default/global/gzversion.html.tmpl
+#	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
diff --git a/german/bugzilla3/distinfo b/german/bugzilla3/distinfo
index b6b1d944e4dc..a2b7e7706de9 100644
--- a/german/bugzilla3/distinfo
+++ b/german/bugzilla3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/germzilla-3.6.11-1.utf-8.tar.gz) = fac8eaa0259f11c6ff33be9b94ec4969ef01fb49ac590f8be2d766ac5a6e5713
-SIZE (bugzilla/germzilla-3.6.11-1.utf-8.tar.gz) = 262453
+SHA256 (bugzilla/germzilla-3.6.12-1.utf-8.tar.gz) = 0621cc36d2b117bff3b234dc88c3317fa9a30a396b85483c36ffb23fc7d477c0
+SIZE (bugzilla/germzilla-3.6.12-1.utf-8.tar.gz) = 262455
diff --git a/german/bugzilla3/files/patch-3.6.11_3.6.12 b/german/bugzilla3/files/patch-3.6.11_3.6.12
deleted file mode 100644
index 4205c901b4f1..000000000000
--- a/german/bugzilla3/files/patch-3.6.11_3.6.12
+++ /dev/null
@@ -1,44 +0,0 @@
---- ./de/default/bug/field.html.tmpl.orig	2012-11-14 20:59:42.000000000 +0100
-+++ ./de/default/bug/field.html.tmpl	2012-11-14 21:00:52.000000000 +0100
-@@ -173,7 +173,7 @@
-         <script type="text/javascript">
-         <!--
-           initHidingOptionsForIE('[% field.name FILTER js %]');
--          [%+ INCLUDE "bug/field-events.js.tmpl" field = field %]
-+          [%+ INCLUDE "bug/field-events.js.tmpl" field = field product = bug.product_obj %]
-         //-->
-         </script>
- 
---- ./de/default/filterexceptions.pl.orig	2012-11-14 20:59:42.000000000 +0100
-+++ ./de/default/filterexceptions.pl	2012-11-14 21:01:14.000000000 +0100
-@@ -229,7 +229,6 @@
- 
- 'global/confirm-user-match.html.tmpl' => [
-   'script',
--  'fields.${field_name}.flag_type.name',
- ],
- 
- 'global/site-navigation.html.tmpl' => [
---- ./de/default/global/code-error.html.tmpl.orig	2012-11-14 20:59:42.000000000 +0100
-+++ ./de/default/global/code-error.html.tmpl	2012-11-14 21:01:59.000000000 +0100
-@@ -278,8 +278,7 @@
-     [%+ constants.bz_locations.localconfig FILTER html %].
- 
-   [% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
--    Anhang [% attach_id FILTER html %] (<em>[% description FILTER html %]</em>)
--    gehört zu [% terms.bug %] [%+ attach_bug_id FILTER html %],
-+    Anhang [% attach_id FILTER html %] gehört zu [% terms.bug %],
-     daher ist es nicht möglich, ihn während der Anlage eines
-     Anhangs zu einem anderen [% terms.bug %] (in Ihrem
-     Fall [% terms.bug %] [%+ my_bug_id FILTER html %]) als obsolet zu markieren.
---- ./de/default/global/confirm-user-match.html.tmpl.orig	2012-11-14 20:59:42.000000000 +0100
-+++ ./de/default/global/confirm-user-match.html.tmpl	2012-11-14 21:02:55.000000000 +0100
-@@ -204,7 +204,7 @@
-   [% ELSIF field_labels.$field_name %]
-     [% field_labels.$field_name FILTER html %]
-   [% ELSIF field_name.match("^requestee") %]
--    [% fields.${field_name}.flag_type.name %] Anfrager
-+    [% fields.${field_name}.flag_type.name FILTER html %] Anfrager
-   [% ELSE %]
-     [% field_name FILTER html %]
-   [% END %]