- update german and russian bugzilla templates to official new versions

- remove hotfixes from german templates

Feature safe: yes

3 files changed, 7 insertions, 63 deletions

diff --git a/german/bugzilla/Makefile b/german/bugzilla/Makefile
index 151f080710e1..915f61b19cf2 100644
--- a/german/bugzilla/Makefile
+++ b/german/bugzilla/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugzilla
-PORTVERSION=	4.0.8
-PORTREVISION=	1
+PORTVERSION=	4.0.9
 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/4.0.8/4.0.9/' \
-		${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/4.0.8/4.0.9/' \
+#		${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/bugzilla/distinfo b/german/bugzilla/distinfo
index 988572b97f49..6822f54b24b1 100644
--- a/german/bugzilla/distinfo
+++ b/german/bugzilla/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/germzilla-4.0.8-1.utf-8.tar.gz) = f2dd6da68562c39feb1c06dfeab53501e721f4a7bca0d09525e0052a598e737e
-SIZE (bugzilla/germzilla-4.0.8-1.utf-8.tar.gz) = 264182
+SHA256 (bugzilla/germzilla-4.0.9-1.utf-8.tar.gz) = 83ed6a1b14aa3c9a5d2fcc4924c68610c950d13c86ed10e45e166eb737de3f9f
+SIZE (bugzilla/germzilla-4.0.9-1.utf-8.tar.gz) = 264170
diff --git a/german/bugzilla/files/patch-4.0.8_4.0.9 b/german/bugzilla/files/patch-4.0.8_4.0.9
deleted file mode 100644
index ad9ba21aec96..000000000000
--- a/german/bugzilla/files/patch-4.0.8_4.0.9
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./de/default/bug/create/create.html.tmpl.orig
-+++ ./de/default/bug/create/create.html.tmpl
-@@ -252,7 +252,7 @@
-       <script type="text/javascript">
-        <!--
-          [%+ INCLUDE "bug/field-events.js.tmpl"
--                    field = bug_fields.component %]
-+                    field = bug_fields.component product = product %]
-        //-->
-        </script>
-     </td>
---- ./de/default/bug/field.html.tmpl.orig
-+++ ./de/default/bug/field.html.tmpl
-@@ -156,7 +156,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
-+++ ./de/default/filterexceptions.pl
-@@ -224,7 +224,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
-+++ ./de/default/global/code-error.html.tmpl
-@@ -268,8 +268,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
-+++ ./de/default/global/confirm-user-match.html.tmpl
-@@ -209,7 +209,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 %]