--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,

chap-linux still describes the installation of Acrobat Reader 4, the
attached patch updates the chapter to reflect the installation of
Acrobat Reader 7 (and the supporting suse* packages). And 'SuSE'
is named 'SUSE' these days.

-- Daniel

--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="chap-linux.xml-acroread7.diff"

Index: chap-linux.xml
===================================================================
RCS file: /cvsroot/htdocs/guide/en/chap-linux.xml,v
retrieving revision 1.15
diff -b -u -r1.15 chap-linux.xml
--- chap-linux.xml	25 Aug 2006 10:19:40 -0000	1.15
+++ chap-linux.xml	3 Jan 2007 12:40:32 -0000
@@ -3,7 +3,7 @@
 <chapter id="chap-linux">
   <title>Linux emulation</title>
 
-  <para>The &os; port for i386, alpha, mac68k, macppc and many others
+  <para>The &os; port for i386, alpha, mac68k, macppc, and many others
     can execute a great number of native
     Linux programs, using the Linux emulation layer.
     Generally, when you think about emulation you imagine something
@@ -20,7 +20,7 @@
 
   <para>This chapter explains how to configure the Linux emulation with
     an example: the installation of the well known
-    <application>Acrobat Reader</application> version 4 program.</para>
+    <application>Acrobat Reader</application> version 7 program.</para>
 
   <!-- ============================================================= -->
 
@@ -59,6 +59,14 @@
       <programlisting>option COMPAT_LINUX
 option EXEC_ELF32</programlisting>
 
+      <para>
+	or the following options if you are going to use 64-bit ELF
+	binaries:
+      </para>
+
+      <programlisting>option COMPAT_LINUX
+option EXEC_ELF64</programlisting>
+
       <para>when you have compiled a kernel with the previous options you can
         start installing the necessary software.</para>
 
@@ -74,14 +82,14 @@
         You can get the shared libraries from any Linux distribution,
         provided it's not too old, but the suggested method is to use the
         package system and install the libraries automatically (which
-        uses SuSE libraries).
+        uses SUSE libraries).
         When you install the libraries, the following happens:</para>
 
       <itemizedlist>
         <listitem>
           <para>A <emphasis>secondary root directory</emphasis> is created
             which will be used for Linux programs.
-            This directory is <filename>/emul/linux/</filename>.
+            This directory is <filename>/emul/linux</filename>.
             The Linux programs in emulation mode will use this directory
             as their root directory and use files there. If a required
             file is not found, it will be searched with
@@ -100,16 +108,15 @@
             the necessary libraries on the system.
             For example, for <application>Acrobat Reader</application>,
             if you go to the
-            <filename>/usr/pkgsrc/print/acroread</filename> and give the
-            <command>make depends</command> command, you get the
-            following message:</para>
-
-          <screen>===>  acroread-4.0 requires Linux glibc2 libraries - see &man.compat.linux.8;.</screen>
+            <filename>/usr/pkgsrc/print/acroread7</filename> and give the
+            <command>make depends</command> command, pkgsrc will fetch
+	    and install all dependencies for <application>Acrobat
+	    Reader</application>.</para>
         </listitem>
       </itemizedlist>
 
       <para>Both operations will be handled automatically by the package
-        system, without the need of manual intervention from the user (I
+        system, without the need of manual intervention from the user (we
         suppose that, by now, you have already begun to love the package
         system...). Note that this section describes manual installation
         of the Linux libraries.</para>
@@ -117,28 +124,30 @@
       <para>To install the libraries, a program must be installed that
         handles the <acronym>RPM</acronym> format: it is
         <filename>rpm</filename>, which will be used to extract the
-        SuSE libraries. Execute <command>make</command> and
+        SUSE libraries. Execute <command>make</command> and
         <command>make install</command> in the
         <filename>/usr/pkgsrc/misc/rpm/</filename> directory to
         build and install <command>rpm</command>.</para>
 
-      <para>Next the <filename>suse_base</filename> package must be
+      <para>Next the <filename>suse100_base</filename> package must be
         installed.
-        The SuSE RPM files can be downloaded by the package system or, if
-        you have a SuSE CD, you can copy them in the
-        <filename>/usr/pkgsrc/distfiles/suse</filename> directory and then run
-        <command>make</command> and <command>make install</command>
-        after going to the <filename>/usr/pkgsrc/emulators/suse_base</filename>
+        The SUSE RPM files can be downloaded by the package system or, if
+        you have a SUSE CD, you can copy them in the
+        <filename>/usr/pkgsrc/distfiles/suse100</filename> directory and
+        then run <command>make</command> and <command>make install</command>
+        after going to the
+	<filename>/usr/pkgsrc/emulators/suse100_base</filename>
         directory.</para>
 
-      <para>With the same method install <filename>suse_compat</filename>
-        and <filename>suse_x11</filename>.
+      <para>With the same method install <filename>suse100_compat</filename>
+        and <filename>suse100_x11</filename>.
         The final configuration is:</para>
 
       <screen>&rprompt; <userinput>pkg_info -a | grep suse</userinput>
-suse_base-7.3nb5    Linux compatibility package
-suse_x11-7.3nb2     Linux compatibility package for X11 binaries
-suse_compat-7.3     Linux compatibility package with old shared libraries </screen>
+suse_base-10.0nb3   Linux compatibility package
+suse_compat-10.0nb1 Linux compatibility package with old shared libraries
+suse_x11-10.0nb2    Linux compatibility package for X11 binaries
+      </screen>
     </sect2>
 
     <!-- ........................................................... -->
@@ -150,7 +159,7 @@
         <application>Acrobat Reader</application> program (or other Linux
         programs).
         Change to
-        <filename>/usr/pkgsrc/print/acroread</filename> and give the
+        <filename>/usr/pkgsrc/print/acroread7</filename> and give the
         usual commands.</para>
 
       <screen>&rprompt; <userinput>make</userinput>
@@ -178,19 +187,15 @@
       directories have been created:</para>
 
     <literallayout>bin/
-boot/
-cdrom/
 dev/
 etc/
-floppy/
-home/
 lib/
-mnt/
 opt/
 proc/
 root/
 sbin/
-usr/</literallayout>
+usr/
+var/</literallayout>
 
     <note>
       <para>Please always refer to <filename>/emul/linux</filename> and not
@@ -200,12 +205,12 @@
     </note>
 
     <para>How much space is required for the Linux emulation software?
-      On my system I get the following figure:</para>
+      On one system we got the following figure:</para>
 
     <screen>&rprompt; <userinput>cd /usr/pkg/emul</userinput>
-&rprompt; <userinput>du -k linux</userinput>
+&rprompt; <userinput>du -k /emul/linux/</userinput>
 ...
-214049   linux/</screen>
+127804  /emul/linux/</screen>
 
     <para><application>Acrobat Reader</application>, the program, has been
       installed in the usual directory for package binaries:

--zYM0uCDKw75PZbzx--