PERFORCE change 196905 for review
Rene Ladan
rene at FreeBSD.org
Sat Jul 30 09:54:08 UTC 2011
http://p4web.freebsd.org/@@196905?ac=10
Change 196905 by rene at rene_acer on 2011/07/30 09:53:35
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#22 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#33 integrate
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR.pm#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/MIME.pm#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/Patch.pm#2 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#22 (text+ko) ====
@@ -1,6 +1,6 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.106 2011/07/28 15:15:51 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.107 2011/07/29 09:39:30 blackend Exp $
-->
<chapter id="desktop">
@@ -280,7 +280,7 @@
</step>
<step>
- <title>For Firefox 3.6 and 5.0</title>
+ <title>For Firefox 3.6 and 5.0<anchor id="moz-java-plugin-5"></title>
<para>Install <application>OpenJDK 6</application>
through the Ports Collection by typing:</para>
@@ -456,13 +456,28 @@
<para>To install the Linux version of
<application>Opera</application>, substitute
<literal>linux-opera</literal> in place of
- <literal>opera</literal> in the examples above. The Linux
- version is useful in situations requiring the use of plug-ins
- that are only available for Linux, such as <application>Adobe
- &acrobat.reader;</application>. In all other respects, the
- FreeBSD and Linux versions should be functionally
- identical.</para>
+ <literal>opera</literal> in the example above.</para>
+
+ <para>The &adobe; &flash; plugin is not available for &os;.
+ However, a &linux; version of the plugin exists. To install
+ this version, the <filename
+ role="package">www/linux-f10-flashplugin10</filename> port has
+ to be installed, then install the port <filename
+ role="package">www/opera-linuxplugins</filename>:</para>
+
+ <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin10</userinput>
+&prompt.root; <userinput>make install clean</userinput>
+&prompt.root; <userinput>cd /usr/ports/www/opera-linuxplugins</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+ <para>You can check the presence of the plugin: start your
+ browser, enter <literal>opera:plugins</literal> in the
+ location bar and press <keycap>Enter</keycap>. A list should
+ appear with all the currently available plugins.</para>
+ <para>To add the <application>&java;</application> plugin,
+ follow the <link linkend="moz-java-plugin-5">instructions for
+ Firefox</link>.</para>
</sect2>
<sect2>
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#33 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Dutch Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.28 2011/05/12 16:50:14 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.29 2011/07/28 21:14:37 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
%SRCID% 1.106
==== //depot/projects/docproj_nl/www/en/cgi/GnatsPR.pm#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: www/en/cgi/GnatsPR.pm,v 1.2 2011/07/21 02:09:02 shaun Exp $
+# $FreeBSD: www/en/cgi/GnatsPR.pm,v 1.4 2011/07/29 22:59:32 shaun Exp $
#------------------------------------------------------------------------------
package GnatsPR;
@@ -204,7 +204,7 @@
#$ismulti = ($2 and $2 eq "\n");
# It's multi-liners from here on in
- $key eq 'Description'
+ $key eq 'Organization'
and $ismulti = 1;
} else {
# Hmm...
@@ -539,7 +539,12 @@
# UUencoded file. Characteristics:
# - Has header and footer.
$$text =~ /^begin \d\d\d (.*)/m
- and return {start => $-[0], type => 'uuencoded'};
+ and return {start => $-[0], type => 'uuencoded', name => $1};
+
+ # Base64 encoded file. Characteristics:
+ # - Has header and footer.
+ $$text =~ /^begin-base64 \d\d\d (.*)/m
+ and return {start => $-[0], type => 'base64', name => $1};
return undef;
}
@@ -583,6 +588,9 @@
} elsif ($pi->{type} eq 'uuencoded') {
$$text =~ /^end$/m
and $pi->{size} = $+[0];
+ } elsif ($pi->{type} eq 'base64') {
+ $$text =~ /^====$/m
+ and $pi->{size} = $+[0];
}
if ($pi->{size} == 0) {
==== //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/MIME.pm#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: www/en/cgi/GnatsPR/Section/MIME.pm,v 1.2 2011/07/23 02:42:59 shaun Exp $
+# $FreeBSD: www/en/cgi/GnatsPR/Section/MIME.pm,v 1.3 2011/07/29 21:27:44 shaun Exp $
#------------------------------------------------------------------------------
package GnatsPR::Section::MIME;
@@ -300,6 +300,11 @@
$self->{headers}->{$key} =~ s/;.*$//;
}
+
+ # Normalise
+
+ $self->{headers}->{'content-type'} =
+ lc $self->{headers}->{'content-type'};
}
==== //depot/projects/docproj_nl/www/en/cgi/GnatsPR/Section/Patch.pm#2 (text+ko) ====
@@ -24,11 +24,14 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: www/en/cgi/GnatsPR/Section/Patch.pm,v 1.1 2011/07/20 22:23:23 shaun Exp $
+# $FreeBSD: www/en/cgi/GnatsPR/Section/Patch.pm,v 1.2 2011/07/29 22:59:32 shaun Exp $
#------------------------------------------------------------------------------
package GnatsPR::Section::Patch;
+use MIME::Base64; # ports/converters/p5-MIME-Base64
+use Convert::UU qw(uudecode uuencode); # ports/converters/p5-Convert-UU
+
use strict;
require 5.006;
@@ -53,6 +56,8 @@
my $self = {
text => '',
filename => 'patch.txt',
+ binary => 0,
+ encoded => 0,
type => 'unknown'
};
@@ -63,6 +68,17 @@
$self->{filename} = $filename if $filename;
$self->{type} = $type if $type;
+ $self->{filename} =~ '(?:\.gz|\.bz2|\.zip|\.tar)$'
+ and $self->{binary} = 1;
+
+ if ($self->{type} eq 'uuencoded') {
+ $self->{encoded} = 1;
+ $self->{decoded_text} = uudecode($self->{text});
+ } elsif ($self->{type} eq 'base64') {
+ $self->{encoded} = 1;
+ $self->{decoded_text} = decode_base64($self->{text});
+ }
+
return $self;
}
@@ -97,7 +113,7 @@
{
my $self = shift;
- return length($self->{text});
+ return length($self->{encoded} ? $self->{decoded_text} : $self->{text});
}
@@ -114,7 +130,7 @@
{
my $self = shift;
- return $self->{text};
+ return $self->{encoded} ? $self->{decoded_text} : $self->{text};
}
@@ -165,7 +181,7 @@
{
my $self = shift;
- return 0;
+ return $self->{binary};
}
More information about the p4-projects
mailing list