r2881 - in trunk: BOOK BOOK/general/genlib BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Thu Oct 28 22:00:29 PDT 2004


Author: randy
Date: 2004-10-28 23:00:27 -0600 (Thu, 28 Oct 2004)
New Revision: 2881

Removed:
   trunk/patches/guile-1.6.4-fhs_docs-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/guile.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to Guile-1.6.5

Modified: trunk/BOOK/general/genlib/guile.xml
===================================================================
--- trunk/BOOK/general/genlib/guile.xml	2004-10-28 23:58:12 UTC (rev 2880)
+++ trunk/BOOK/general/genlib/guile.xml	2004-10-29 05:00:27 UTC (rev 2881)
@@ -6,9 +6,9 @@
 
 <!ENTITY guile-download-http "http://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
 <!ENTITY guile-download-ftp "ftp://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
-<!ENTITY guile-size "2.8 MB">
-<!ENTITY guile-buildsize "30 MB">
-<!ENTITY guile-time "0.79 SBU">
+<!ENTITY guile-size "3.0 MB">
+<!ENTITY guile-buildsize "36.5 MB">
+<!ENTITY guile-time "0.87 SBU">
 ]>
 
 <sect1 id="guile" xreflabel="Guile-&guile-version;">
@@ -40,7 +40,7 @@
 &guile-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title>Additional downloads</title>
+<!-- <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch (if building the HTML Reference Guide): <ulink 
 url="&patch-root;/guile-&guile-version;-fhs_docs-1.patch"/></para></listitem>
@@ -52,7 +52,7 @@
 <itemizedlist spacing='compact'>
 <listitem><para><xref linkend="pst-typesetting-tex"/></para></listitem>
 </itemizedlist></sect4>
-</sect3>
+</sect3> -->
 
 </sect2>
 
@@ -62,19 +62,19 @@
 <para>Install <application>Guile</application> by running the following
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../guile-&guile-version;-fhs_docs-1.patch &&
-./configure --prefix=/usr &&
-make &&
-sed -i -e "s/&guile-version;/1.6/" guile-tools &&
+<screen><userinput><command>./configure --prefix=/usr &&
+LD_LIBRARY_PATH="$PWD/libguile-ltdl/.libs" make &&
 make install</command></userinput></screen>
 
 </sect2>
 
-<sect2><title>Command Explanations</title>
-<para><command>sed -i -e "s/1.6.4/1.6/" guile-tools</command>: Imbedded in the 
-<command>guile-tools</command> script is an incorrect path to the 
-<application>Guile</application> scripts and modules. This command installs the 
-correct path.</para>
+<sect2>
+<title>Command Explanations</title>
+
+<para><command>LD_LIBRARY_PATH="$PWD/libguile-ltdl/.libs" make</command>: 
+Something is broken in the Autotools chain. Passing this variable allows the 
+build to finish successfully.</para>
+
 </sect2>
 
 <sect2>
@@ -84,8 +84,9 @@
 libraries, the <application>Guile</application> package contains
 <command>guile</command>,
 <command>guile-config</command>, 
-<command>guile-snarf</command> and  
-<command>guile-tools</command>.
+<command>guile-snarf</command>, 
+<command>guile-tools</command> and 
+numerous <application>Guile</application> scripts.
 </para>
 
 </sect2>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-10-28 23:58:12 UTC (rev 2880)
+++ trunk/BOOK/general.ent	2004-10-29 05:00:27 UTC (rev 2881)
@@ -1,4 +1,4 @@
-<!ENTITY day          "28">
+<!ENTITY day          "29">
 <!ENTITY month        "10">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -72,7 +72,7 @@
 <!ENTITY libesmtp-version             "1.0.3r1">
 <!ENTITY aspell-version               "0.60">
 <!ENTITY ispell-version               "3.2.06.epa7">
-<!ENTITY guile-version                "1.6.4">
+<!ENTITY guile-version                "1.6.5">
 <!ENTITY slib-version                 "3a1">
 <!ENTITY gwrap-version                "1.3.4">
 <!ENTITY LZO-version                  "1.08">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-10-28 23:58:12 UTC (rev 2880)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-10-29 05:00:27 UTC (rev 2881)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>October 29th, 2004 [randy]: Updated to
+Guile-1.6.5.</para></listitem>
+
 <listitem><para>October 28th, 2004 [larry]: Updated to
 FLAC-1.1.1.</para></listitem>
 

Deleted: trunk/patches/guile-1.6.4-fhs_docs-1.patch
===================================================================
--- trunk/patches/guile-1.6.4-fhs_docs-1.patch	2004-10-28 23:58:12 UTC (rev 2880)
+++ trunk/patches/guile-1.6.4-fhs_docs-1.patch	2004-10-29 05:00:27 UTC (rev 2881)
@@ -1,83 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2004-08-17
-Initial Package Version: 1.6.4
-Upstream Status:         Not submitted (LFS/FHS compliance)
-Origin:                  Self-created
-Description:             Changes the HTML Reference Manual installation from 
-			 $prefix/html/guile to $prefix/share/doc/guile
-
-$LastChangedBy$
-$Date$
-
-diff -Naur guile-1.6.4-orig/doc/goops/Makefile.am guile-1.6.4/doc/goops/Makefile.am
---- guile-1.6.4-orig/doc/goops/Makefile.am	2002-12-07 22:41:28.000000000 +0000
-+++ guile-1.6.4/doc/goops/Makefile.am	2004-08-18 02:50:24.824763240 +0000
-@@ -31,7 +31,7 @@
- 
- if HTMLDOC
- 
--htmldir = $(prefix)/html/guile-$(VERSION)
-+htmldir = $(prefix)/share/doc/guile-$(VERSION)
- 
- html_DATA = goops_toc.html $(shell ls goops_*.html 2>/dev/null)
- 
-diff -Naur guile-1.6.4-orig/doc/goops/Makefile.in guile-1.6.4/doc/goops/Makefile.in
---- guile-1.6.4-orig/doc/goops/Makefile.in	2003-04-21 17:02:48.000000000 +0000
-+++ guile-1.6.4/doc/goops/Makefile.in	2004-08-18 02:50:54.003327424 +0000
-@@ -183,7 +183,7 @@
- 
- 
- # Optionally support building an HTML version of the manual.
-- at HTMLDOC_TRUE@htmldir = $(prefix)/html/guile-$(VERSION)
-+ at HTMLDOC_TRUE@htmldir = $(prefix)/share/doc/guile-$(VERSION)
- 
- @HTMLDOC_TRUE at html_DATA = goops_toc.html $(shell ls goops_*.html 2>/dev/null)
- 
-diff -Naur guile-1.6.4-orig/doc/ref/Makefile.am guile-1.6.4/doc/ref/Makefile.am
---- guile-1.6.4-orig/doc/ref/Makefile.am	2003-02-01 05:15:08.000000000 +0000
-+++ guile-1.6.4/doc/ref/Makefile.am	2004-08-18 02:48:01.378570376 +0000
-@@ -50,7 +50,7 @@
- 
- if HTMLDOC
- 
--htmldir = $(prefix)/html/guile-$(VERSION)
-+htmldir = $(prefix)/share/doc/guile-$(VERSION)
- 
- html_DATA = guile_toc.html $(shell ls guile_*.html 2>/dev/null)
- 
-diff -Naur guile-1.6.4-orig/doc/ref/Makefile.in guile-1.6.4/doc/ref/Makefile.in
---- guile-1.6.4-orig/doc/ref/Makefile.in	2003-04-21 17:02:49.000000000 +0000
-+++ guile-1.6.4/doc/ref/Makefile.in	2004-08-18 02:48:53.147700272 +0000
-@@ -198,7 +198,7 @@
- 
- 
- # Optionally support building an HTML version of the reference manual.
-- at HTMLDOC_TRUE@htmldir = $(prefix)/html/guile-$(VERSION)
-+ at HTMLDOC_TRUE@htmldir = $(prefix)/share/doc/guile-$(VERSION)
- 
- @HTMLDOC_TRUE at html_DATA = guile_toc.html $(shell ls guile_*.html 2>/dev/null)
- 
-diff -Naur guile-1.6.4-orig/doc/tutorial/Makefile.am guile-1.6.4/doc/tutorial/Makefile.am
---- guile-1.6.4-orig/doc/tutorial/Makefile.am	2002-12-07 22:41:30.000000000 +0000
-+++ guile-1.6.4/doc/tutorial/Makefile.am	2004-08-18 02:49:19.656670296 +0000
-@@ -29,7 +29,7 @@
- 
- if HTMLDOC
- 
--htmldir = $(prefix)/html/guile-$(VERSION)
-+htmldir = $(prefix)/share/doc/guile-$(VERSION)
- 
- html_DATA = guile-tut_toc.html $(shell ls guile-tut_*.html 2>/dev/null)
- 
-diff -Naur guile-1.6.4-orig/doc/tutorial/Makefile.in guile-1.6.4/doc/tutorial/Makefile.in
---- guile-1.6.4-orig/doc/tutorial/Makefile.in	2003-04-21 17:02:49.000000000 +0000
-+++ guile-1.6.4/doc/tutorial/Makefile.in	2004-08-18 02:49:52.875620248 +0000
-@@ -181,7 +181,7 @@
- 
- 
- # Optionally support building an HTML version of the reference manual.
-- at HTMLDOC_TRUE@htmldir = $(prefix)/html/guile-$(VERSION)
-+ at HTMLDOC_TRUE@htmldir = $(prefix)/share/doc/guile-$(VERSION)
- 
- @HTMLDOC_TRUE at html_DATA = guile-tut_toc.html $(shell ls guile-tut_*.html 2>/dev/null)
- subdir = doc/tutorial




More information about the blfs-book mailing list