Index: . =================================================================== --- . (revision 307474) +++ . (working copy) Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /head:r307474* Index: german =================================================================== --- german (revision 307474) +++ german (working copy) Property changes on: german ___________________________________________________________________ Added: svn:mergeinfo Merged /head/german:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307425,307428-307430,307474* Index: german/bugzilla =================================================================== --- german/bugzilla (revision 307474) +++ german/bugzilla (working copy) Property changes on: german/bugzilla ___________________________________________________________________ Added: svn:mergeinfo Merged /head/german/bugzilla:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307425,307428-307430,307474 Index: german/bugzilla/Makefile =================================================================== --- german/bugzilla/Makefile (revision 307474) +++ german/bugzilla/Makefile (working copy) @@ -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 @@ 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} Index: german/bugzilla/distinfo =================================================================== --- german/bugzilla/distinfo (revision 307474) +++ german/bugzilla/distinfo (working copy) @@ -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 Index: german/bugzilla/files/patch-4.0.8_4.0.9 =================================================================== --- german/bugzilla/files/patch-4.0.8_4.0.9 (revision 307474) +++ german/bugzilla/files/patch-4.0.8_4.0.9 (working copy) @@ -1,55 +0,0 @@ ---- ./de/default/bug/create/create.html.tmpl.orig -+++ ./de/default/bug/create/create.html.tmpl -@@ -252,7 +252,7 @@ - - ---- ./de/default/bug/field.html.tmpl.orig -+++ ./de/default/bug/field.html.tmpl -@@ -156,7 +156,7 @@ - - ---- ./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 %] ([% description FILTER html %]) -- 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 %] Index: german/bugzilla3 =================================================================== --- german/bugzilla3 (revision 307474) +++ german/bugzilla3 (working copy) Property changes on: german/bugzilla3 ___________________________________________________________________ Added: svn:mergeinfo Merged /head/german/bugzilla3:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307425,307428-307430,307474 Index: german/bugzilla3/Makefile =================================================================== --- german/bugzilla3/Makefile (revision 307474) +++ german/bugzilla3/Makefile (working copy) @@ -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 @@ 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} Index: german/bugzilla3/distinfo =================================================================== --- german/bugzilla3/distinfo (revision 307474) +++ german/bugzilla3/distinfo (working copy) @@ -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 Index: german/bugzilla3/files/patch-3.6.11_3.6.12 =================================================================== --- german/bugzilla3/files/patch-3.6.11_3.6.12 (revision 307474) +++ german/bugzilla3/files/patch-3.6.11_3.6.12 (working copy) @@ -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 @@ - - ---- ./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 %] ([% description FILTER html %]) -- 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 %] Index: german/bugzilla42 =================================================================== --- german/bugzilla42 (revision 307474) +++ german/bugzilla42 (working copy) Property changes on: german/bugzilla42 ___________________________________________________________________ Added: svn:mergeinfo Merged /head/german/bugzilla42:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307425,307428-307430,307474 Index: german/bugzilla42/Makefile =================================================================== --- german/bugzilla42/Makefile (revision 307474) +++ german/bugzilla42/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= 4.2.4 CATEGORIES= german MASTER_SITES= SF MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION} @@ -21,10 +20,10 @@ LANGDIR= ${WWWDIR}/template/de -post-patch: - @${REINPLACE_CMD} -i '' -e 's/4.2.3/4.2.4/' \ - ${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.2.3/4.2.4/' \ +# ${WRKDIR}/de/default/global/gzversion.html.tmpl +# @${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete do-install: @-${MKDIR} ${LANGDIR} Index: german/bugzilla42/distinfo =================================================================== --- german/bugzilla42/distinfo (revision 307474) +++ german/bugzilla42/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/germzilla-4.2.3-1.utf-8.tar.gz) = 4eafbf1e16322c647c31a606c4007ea84bdff336362297bed5bd7eead50a0b2e -SIZE (bugzilla/germzilla-4.2.3-1.utf-8.tar.gz) = 271170 +SHA256 (bugzilla/germzilla-4.2.4-1.utf-8.tar.gz) = 02e2c3c4414002355e68797a2ac35bf59fd0a44b88e814f377881badf035297b +SIZE (bugzilla/germzilla-4.2.4-1.utf-8.tar.gz) = 271153 Index: german/bugzilla42/files/patch-4.2.3_4.2.4 =================================================================== --- german/bugzilla42/files/patch-4.2.3_4.2.4 (revision 307474) +++ german/bugzilla42/files/patch-4.2.3_4.2.4 (working copy) @@ -1,117 +0,0 @@ ---- ./de/default/bug/edit.html.tmpl.orig -+++ ./de/default/bug/edit.html.tmpl -@@ -32,8 +32,8 @@ - - [% PROCESS bug/time.html.tmpl %] - -- -+[%- END %] -+//--> -+ - -