make krb-impl selectable in config.ent - move warning about mit there too
various whitespace fixes
"--" vs "--" fixes in alsa-tools.xml
although the emacs version is 21.4a the directory dosnt include the a
mplayer patch starts MP not Mp ;-)
--
Jasmine Iwanek
diff -urN trunk/BLFS.xml trunk.new/BLFS.xml
--- trunk/BLFS.xml 2005-09-27 13:20:05.000000000 +0000
+++ trunk.new/BLFS.xml 2005-10-04 21:29:05.000000000 +0000
@@ -63,10 +63,7 @@
<xi:include href="chapter04/iptables.xml" />
<xi:include href="chapter04/gnupg.xml" />
<xi:include href="chapter04/tripwire.xml" />
- <xi:include href="chapter04/heimdal.xml" />
- <!-- MIT kerberos is more or less deprecated in BLFS 6.1 -->
- <!-- If you wish to build MIT krb uncomment the following xinclude -->
- <!-- <xi:include href="chapter04/mitkrb.xml" /> -->
+ <xi:include href="chapter04/&krb-impl;.xml" />
<xi:include href="chapter04/cyrus-sasl.xml"/>
<xi:include href="chapter04/stunnel.xml" />
</stage>
diff -urN trunk/chapter37/alsa-tools.xml trunk.new/chapter37/alsa-tools.xml
--- trunk/chapter37/alsa-tools.xml 2005-10-03 15:11:15.000000000 +0000
+++ trunk.new/chapter37/alsa-tools.xml 2005-10-04 21:23:17.000000000 +0000
@@ -64,7 +64,7 @@
<base>&build_dir;/&alsa-tools-directory;/echomixer</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make />
<make>
@@ -79,7 +79,7 @@
<base>&build_dir;/&alsa-tools-directory;/envy24control</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make />
<make>
@@ -94,7 +94,7 @@
<base>&build_dir;/&alsa-tools-directory;/hdspconf</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make/>
<make>
@@ -121,7 +121,7 @@
<base>&build_dir;/&alsa-tools-directory;/hdspmixer</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make/>
<make>
@@ -197,7 +197,7 @@
<base>&build_dir;/&alsa-tools-directory;/rmedigicontrol</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make/>
<make>
@@ -212,7 +212,7 @@
<base>&build_dir;/&alsa-tools-directory;/qlo10k1</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make/>
<make>
diff -urN trunk/config/config.ent trunk.new/config/config.ent
--- trunk/config/config.ent 2005-09-27 13:20:05.000000000 +0000
+++ trunk.new/config/config.ent 2005-10-04 21:34:19.000000000 +0000
@@ -73,6 +73,7 @@
<!-- Kerberos implementation -->
<!-- MIT-krb 5 (mitkrb) or Heimdal (heimdal) -->
+<!-- MIT-krb 5 is all but depreciated in BLFS-6.1 -->
<!ENTITY krb-impl "heimdal">
<!-- Java implementation -->
diff -urN trunk/config/packages/ch06.ent trunk.new/config/packages/ch06.ent
--- trunk/config/packages/ch06.ent 2005-09-14 16:50:53.000000000 +0000
+++ trunk.new/config/packages/ch06.ent 2005-10-04 21:26:45.000000000 +0000
@@ -11,8 +11,8 @@
<!ENTITY vim-security-fix-patch "vim-&vim-version;-security_fix-1.patch">
<!ENTITY vim-security-fix-patch-md5 "ef9a421f1d29993ce5bbd709cece4624">
-<!ENTITY emacs-version "21.4a">
-<!ENTITY emacs-package "emacs-&emacs-version;.tar.bz2">
+<!ENTITY emacs-version "21.4">
+<!ENTITY emacs-package "emacs-&emacs-version;a.tar.bz2">
<!ENTITY emacs-md5 "5ec2c01f7604cf207628de0e82181647">
<!ENTITY emacs-directory "emacs-&emacs-version;">
diff -urN trunk/config/packages/ch31.ent trunk.new/config/packages/ch31.ent
--- trunk/config/packages/ch31.ent 2005-07-21 14:22:02.000000000 +0000
+++ trunk.new/config/packages/ch31.ent 2005-10-04 21:27:46.000000000 +0000
@@ -1,4 +1,5 @@
<!--************* packages for chapter 31 *************-->
+
<!ENTITY libgnomecups-version "0.2.0">
<!ENTITY libgnomecups-package "libgnomecups-&libgnomecups-version;.tar.bz2">
<!ENTITY libgnomecups-md5 "227cb2b119412b164bece23b287a130d">
diff -urN trunk/config/packages/ch39.ent trunk.new/config/packages/ch39.ent
--- trunk/config/packages/ch39.ent 2005-08-01 09:37:00.000000000 +0000
+++ trunk.new/config/packages/ch39.ent 2005-10-04 21:37:24.000000000 +0000
@@ -19,7 +19,7 @@
<!ENTITY mplayer-md5 "5fadd6957d3aab989cd760ff38fb8fdf">
<!ENTITY mplayer-directory "mplayer-&mplayer-version;">
-<!ENTITY mplayer-patch "Mplayer-&mplayer-version;-kernel_2.6-1.patch">
+<!ENTITY mplayer-patch "MPlayer-&mplayer-version;-kernel_2.6-1.patch">
<!ENTITY mplayer-skin-package "Mplayer-Blue-1.4.tar.bz2">
<!ENTITY mplayer-skin-md5 "3006f514cf0c9a8f832cfb1abee276bf">
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
