Attachment 117595 Details for Bug 159694 – file.diff

[patch] file.diff

file.diff (text/plain), 3.88 KB, created by Jason Helfman on 2011-08-11 17:40:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Helfman

Created: 2011-08-11 17:40:09 UTC

Size: 3.88 KB

patch

obsolete

>Index: books/porters-handbook/book.sgml
>===================================================================
>RCS file: /home/jhelfman/ncvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v
>retrieving revision 1.1113
>diff -u -r1.1113 book.sgml
>--- books/porters-handbook/book.sgml	20 Jul 2011 04:26:06 -0000	1.1113
>+++ books/porters-handbook/book.sgml	11 Aug 2011 05:37:06 -0000
>@@ -6170,8 +6170,8 @@
> 	      <entry>List of space-separated suitable Java versions for
> 		the port.  An optional <literal>"+"</literal> allows you to
> 		specify a range of versions (allowed values:
>-		<literal>1.1[+] 1.2[+] 1.3[+] 1.4[+] 1.5[+]
>-		1.6[+]</literal>).</entry>
>+		<literal>1.5[+] 1.6[+] 1.7[+]
>+		</literal>).</entry>
> 	    </row>
> 
> 	    <row>
>@@ -6185,7 +6185,7 @@
> 	      <entry><makevar>JAVA_VENDOR</makevar></entry>
> 	      <entry>List of space-separated suitable JDK port vendors for
> 		the port (allowed values: <literal>freebsd bsdjava sun
>-		blackdown openjdk</literal>).</entry>
>+		openjdk</literal>).</entry>
> 	    </row>
> 
> 	    <row>
>@@ -6242,13 +6242,13 @@
> 	    <row>
> 	      <entry><makevar>JAVA_PORT</makevar></entry>
> 	      <entry>The name of the JDK port (e.g.
>-		<literal>'java/jdk14'</literal>).</entry>
>+		<literal>'java/diablo-jdk16'</literal>).</entry>
> 	    </row>
> 
> 	    <row>
> 	      <entry><makevar>JAVA_PORT_VERSION</makevar></entry>
> 	      <entry>The full version of the JDK port (e.g.
>-		<literal>'1.4.2'</literal>). If you only need the first
>+		<literal>'1.6.0'</literal>). If you only need the first
> 		two digits of this version number, use
> 		<makevar>${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/}</makevar>.</entry>
> 	    </row>
>@@ -6256,19 +6256,19 @@
> 	    <row>
> 	      <entry><makevar>JAVA_PORT_OS</makevar></entry>
> 	      <entry>The operating system used by the JDK port (e.g.
>-		<literal>'linux'</literal>).</entry>
>+		<literal>'native'</literal>).</entry>
> 	    </row>
> 
> 	    <row>
> 	      <entry><makevar>JAVA_PORT_VENDOR</makevar></entry>
> 	      <entry>The vendor of the JDK port (e.g.
>-		<literal>'sun'</literal>).</entry>
>+		<literal>'freebsd'</literal>).</entry>
> 	    </row>
> 
> 	    <row>
> 	      <entry><makevar>JAVA_PORT_OS_DESCRIPTION</makevar></entry>
> 	      <entry>Description of the operating system used by the JDK port
>-		(e.g. <literal>'Linux'</literal>).</entry>
>+		(e.g. <literal>'Native'</literal>).</entry>
> 	    </row>
> 
> 	    <row>
>@@ -6280,34 +6280,34 @@
> 	    <row>
> 	      <entry><makevar>JAVA_HOME</makevar></entry>
> 	      <entry>Path to the installation directory of the JDK (e.g.
>-		<filename>'/usr/local/jdk1.3.1'</filename>).</entry>
>+		<filename>'/usr/local/diablo-jdk1.6.0'</filename>).</entry>
> 	    </row>
> 
> 	    <row>
> 	      <entry><makevar>JAVAC</makevar></entry>
> 	      <entry>Path to the Java compiler to use (e.g.
>-		<filename>'/usr/local/jdk1.3.1/bin/javac'</filename> or
>+		<filename>'/usr/local/diablo-jdk1.6.0/bin/javac'</filename> or
> 		<filename>'/usr/local/bin/jikes'</filename>).</entry>
> 	    </row>
> 
> 	    <row>
> 	      <entry><makevar>JAR</makevar></entry>
> 	      <entry>Path to the <command>jar</command> tool to use (e.g.
>-		<filename>'/usr/local/jdk1.3.1/bin/jar'</filename> or
>+		<filename>'/usr/local/diablo-jdk1.6.0/bin/jar'</filename> or
> 		<filename>'/usr/local/bin/fastjar'</filename>).</entry>
> 	    </row>
> 
> 	    <row>
> 	      <entry><makevar>APPLETVIEWER</makevar></entry>
> 	      <entry>Path to the <command>appletviewer</command> utility (e.g.
>-		<filename>'/usr/local/linux-jdk1.3.1/bin/appletviewer'</filename>).</entry>
>+		<filename>'/usr/local/diablo-jdk1.6.0/bin/appletviewer'</filename>).</entry>
> 	    </row>
> 
> 	    <row>
> 	      <entry><makevar>JAVA</makevar></entry>
> 	      <entry>Path to the <command>java</command> executable. Use
> 		this for executing Java programs (e.g.
>-		<filename>'/usr/local/jdk1.3.1/bin/java'</filename>).</entry>
>+		<filename>'/usr/local/diablo-jdk1.6.0/bin/java'</filename>).</entry>
> 	    </row>
> 
> 	    <row>

Actions: View | Diff

Attachments on bug 159694: 117595