r1238 - in trunk: . etc etc/X11 etc/X11/app-defaults etc/fonts packages packages/Xorg packages/cdrtools packages/dialog packages/docbook-xsl packages/fonts-arphic packages/fonts-baekmuk packages/fonts-kochi packages/irssi packages/libidn packages/linux packages/lynx packages/nALFS packages/nano packages/tin packages/xfce/desktop-files

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Tue Dec 6 21:51:53 PST 2005


Author: alexander
Date: 2005-12-06 22:51:39 -0700 (Tue, 06 Dec 2005)
New Revision: 1238

Added:
   trunk/packages/fonts-arphic/
   trunk/packages/fonts-arphic/Makefile
   trunk/packages/fonts-baekmuk/
   trunk/packages/fonts-baekmuk/Makefile
   trunk/packages/fonts-kochi/
   trunk/packages/fonts-kochi/Makefile
   trunk/packages/libidn/
   trunk/packages/libidn/Makefile
Removed:
   trunk/packages/irssi/irssi-0.8.9-gcc4_fixes-1.patch
   trunk/packages/links/
   trunk/packages/xfce/desktop-files/glinks.desktop
   trunk/packages/xfce/desktop-files/links.desktop
Modified:
   trunk/Makefile
   trunk/etc/X11/app-defaults/XTerm
   trunk/etc/X11/xorg.conf
   trunk/etc/fonts/local.conf
   trunk/etc/nanorc
   trunk/etc/profile
   trunk/packages/Xorg/host.def
   trunk/packages/cdrtools/Makefile
   trunk/packages/dialog/Makefile
   trunk/packages/docbook-xsl/Makefile
   trunk/packages/irssi/Makefile
   trunk/packages/linux/Makefile
   trunk/packages/lynx/Makefile
   trunk/packages/nALFS/Makefile
   trunk/packages/nano/Makefile
   trunk/packages/tin/Makefile
Log:
Merged package modifications from utf8-newmake
Added fonts and libidn, removed links


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -263,12 +263,13 @@
 endif
 
 blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \
-	ch-screen ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
+	ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
 	ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype \
 	ch-fontconfig ch-Xorg ch-freefont ch-inputattach ch-fonts-dejavu \
-	update-fontsdir ch-libjpeg ch-libtiff ch-libart_lgpl ch-links \
-	ch-openssh ch-pkgconfig ch-glib2 ch-libungif ch-imlib ch-imlib2 \
+	ch-fonts-kochi ch-fonts-arphic ch-fonts-baekmuk \
+	update-fontsdir ch-libjpeg ch-libtiff ch-libart_lgpl \
+	ch-openssh ch-glib2 ch-libungif ch-imlib ch-imlib2 \
 	ch-gc ch-w3m ch-cairo \
 	ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-firefox \
 	ch-thunderbird ch-librsvg \
@@ -286,16 +287,16 @@
 	make ch-yaboot
 endif
 
-x86_64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-nano ch-joe ch-screen ch-curl \
+x86_64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-nano ch-joe ch-screen ch-pkgconfig ch-libidn ch-curl \
 	ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat ch-subversion ch-lfs-bootscripts \
 	ch-docbook-xml ch-libxslt ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-squashfs ch-cpio \
 	ch-linux ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-syslinux
 
 sparc64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano \
-	ch-joe ch-screen ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
+	ch-joe ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
 	ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
-	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-links ch-openssh \
-	ch-pkgconfig ch-glib2 ch-cvs ch-popt ch-samba ch-tcpwrappers \
+	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-openssh \
+	ch-glib2 ch-cvs ch-popt ch-samba ch-tcpwrappers \
 	ch-portmap ch-nfs-utils ch-traceroute ch-dialog ch-ncftp ch-pciutils \
 	ch-device-mapper ch-LVM2 ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe \
 	ch-libaal ch-reiser4progs ch-squashfs ch-cpio ch-mutt ch-msmtp ch-tin \

Modified: trunk/etc/X11/app-defaults/XTerm
===================================================================
--- trunk/etc/X11/app-defaults/XTerm	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/etc/X11/app-defaults/XTerm	2005-12-07 05:51:39 UTC (rev 1238)
@@ -70,7 +70,7 @@
 *vtMenu*altscreen*Label:  Show Alternate Screen
 
 ! The fonts below are not used at all on this CD
-! because of "locale mode" and Xft
+! because of "locale mode"
 *fontMenu.Label:  VT Fonts
 *fontMenu*fontdefault*Label:	Default
 *fontMenu*font1*Label:	Unreadable
@@ -96,7 +96,7 @@
 *fontMenu*utf8-mode*Label:	UTF-8
 
 *VT100.utf8Fonts.font2:	-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
-*VT100.utf8Fonts.font:	-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
+*VT100.utf8Fonts.font:	-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
 *VT100.utf8Fonts.font3:	-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
 *VT100.utf8Fonts.font4:	-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
 *VT100.utf8Fonts.font5:	-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
@@ -122,8 +122,11 @@
 ! LiveCD specific customizations are below this line
 
 *VT100*locale: true
-*VT100*faceName: Monospace
 *title: LFS LiveCD
+*background: black
+*foreground: white
 *VT100*scrollBar: true
 *VT100*scrollKey: true
 *VT100*rightScrollBar: true
+*ptyInitialErase: true
+*backarrowKeyIsErase: true

Modified: trunk/etc/X11/xorg.conf
===================================================================
--- trunk/etc/X11/xorg.conf	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/etc/X11/xorg.conf	2005-12-07 05:51:39 UTC (rev 1238)
@@ -28,12 +28,9 @@
 	Driver		"kbd"
 	Option		"CoreKeyboard"
 	Option		"XkbRules"	"xorg"
-	Option		"XkbModel"	"pc104"
-	# Adjust the layout for your country
-	Option		"XkbLayout"	"us"
-	# Example for Russia:
-	# Option	"XkbLayout"	"us,ru(winkeys)"
-	# Option	"XkbOptions"	"grp:alt_shift_toggle,grp_led:scroll"
+	Option		"XkbModel"	"pc105"
+	Option		"XkbLayout"	"en_US"
+	Option	"XkbOptions"	"grp:alt_shift_toggle,compose:menu,grp_led:scroll"
 EndSection
 
 Section "InputDevice"

Modified: trunk/etc/fonts/local.conf
===================================================================
--- trunk/etc/fonts/local.conf	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/etc/fonts/local.conf	2005-12-07 05:51:39 UTC (rev 1238)
@@ -2,6 +2,33 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/local.conf file for local customizations -->
 <fontconfig>
+<!--  Use the Autohinter instead of bytecode interpreter because European
+      fonts on the CD have poor native hints for non-ASCII characters -->
+  <match target="font">
+    <edit name="autohint" mode="assign"><bool>true</bool></edit>
+  </match>
+<!-- CJK characters should not be antialiased below 20 px
+     FIXME: is it possible to achieve using character
+     ranges instead of font names? -->
+  <match target="font">
+    <test target="font" name="family" qual="any">
+	<string>AR PL KaitiM Big5</string>
+	<string>AR PL KaitiM GB</string>
+	<string>AR PL Mingti2L Big5</string>
+	<string>AR PL SungtiL GB</string>
+	<string>Baekmuk Gulim</string>
+	<string>Baekmuk Dotum</string>
+	<string>Baekmuk Batang</string>
+	<string>Baekmuk Headline</string>
+	<string>Kochi Gothic</string>
+	<string>Kochi Mincho</string>
+    </test>
+    <test name="pixelsize" compare="less">
+	<double>16.0</double>
+    </test>
+    <edit name="antialias" mode="assign"><bool>false</bool></edit>
+    <edit name="autohint" mode="assign"><bool>false</bool></edit>
+  </match>
 <!--
   Enable sub-pixel rendering
 	<match target="font">
@@ -12,5 +39,4 @@
 	</match>
 -->
 <dir>/usr/X11R6/lib/X11/fonts/TTF</dir>
-<dir>/usr/X11R6/lib/X11/fonts/Type1</dir>
 </fontconfig>

Modified: trunk/etc/nanorc
===================================================================
--- trunk/etc/nanorc	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/etc/nanorc	2005-12-07 05:51:39 UTC (rev 1238)
@@ -108,7 +108,7 @@
 color blue "//.*"
 color blue start="/\*" end="\*/"
 color brightblue start="/\*\*" end="\*/"
-color brightgreen,brightgreen "[ 	]+$"
+color brightgreen,green "[ 	]+$"
 
 ## Here is an example for your .nanorc
 ##
@@ -140,7 +140,7 @@
 color yellow "<i>"
 color cyan "<str>"
 color brightred "Section" "EndSection" "SubSection" "EndSubSection"
-color yellow "\<(InputDevice|Screen|Identifier|FontPath|RgbPath|ModulePath|Load|Driver|Device|Option|VendorName|ModelName|HorizSync|VertRefresh|Modeline|DisplaySize|BoardName|Monitor|DefaultDepth|)\>
+color yellow "\<(InputDevice|Screen|Identifier|FontPath|RgbPath|ModulePath|Load|Driver|Device|Option|VendorName|ModelName|HorizSync|VertRefresh|Modeline|DisplaySize|BoardName|Monitor|DefaultDepth|)\>"
 color brightblue "^#.*" "^;.*" "^!.*" "[[:space:]]#.*" "[[\t]]#.*"
 
 syntax "bash" "\.sh$"

Modified: trunk/etc/profile
===================================================================
--- trunk/etc/profile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/etc/profile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -14,7 +14,15 @@
 
 TERMCMD=Terminal
 
+XMODIFIERS=@im=SCIM
+
+# Make sure that VTE uses antialiasing/hinting settings from fontconfig
+VTE_USE_XFT=0
+VTE_USE_FT2=0
+VTE_USE_PANGO=1
+
 export PATH INPUTRC G_FILENAME_ENCODING PKG_CONFIG_PATH XML_CATALOG_FILES
-export WWW_HOME NNTPSERVER TERMCMD
+export WWW_HOME NNTPSERVER TERMCMD XMODIFIERS
+export VTE_USE_XFT VTE_USE_FT2 VTE_USE_PANGO
 
 source /etc/bashrc

Modified: trunk/packages/Xorg/host.def
===================================================================
--- trunk/packages/Xorg/host.def	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/Xorg/host.def	2005-12-07 05:51:39 UTC (rev 1238)
@@ -11,4 +11,11 @@
 #define XprtServer		NO
 #define BuildXprintClients	NO
 
+/* Courier confuses font substitution logic in VTE for greek letters */
+#define BuildType1Fonts		NO
+
+/* Strictly speaking, TrueType fonts that come with the X server
+   don't add any Unicode coverage. I keep them because some people
+   prefer Luxi, but that font is useless for me -- Alexander E. Patrakov */
+
 /* End Xorg host.def file */

Modified: trunk/packages/cdrtools/Makefile
===================================================================
--- trunk/packages/cdrtools/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/cdrtools/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -8,6 +8,15 @@
 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
 SHA-$(FILE)= f94cfe51dd512d4e0b9106b986bde12d4f7967ce
 
+# Strictly speaking, this is not needed for making the LFS Live CD because
+# filenames on the LiveCD don't contain non-ASCII characters, but
+# without this patch you can't make a Windows-readabe CD with non-ASCII
+# filenames in UTF-8 locale.
+
+PATCH1= $(DIR)-mkisofs_iconv-10.patch
+URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1)
+SHA-$(PATCH1)= 4a4d6a784e57678a865844021f52fe5fad3623bb
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -16,10 +25,21 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
 	$(std_build)
 
 compile-stage2:
+	# downconvert messages from ISO-8859-1 to ASCII to make
+	# sure that they are readable everywhere
+	#
+	# RedHat's cdrtools-2.01a27-UTF8.patch changes the same
+	# messages, but converts them to UTF-8 instead since
+	# encodings other than UTF-8 are not supported by RedHat
+	for F in cdrecord/cdrecord.c cdrecord/diskid.c cdrecord/sector.c \
+	         readcd/readcd.c scgcheck/scgcheck.c scgskeleton/skel.c ; do \
+	    LC_ALL=de_DE iconv -f ISO-8859-1 -t US-ASCII//TRANSLIT $$F >tmp ; \
+	    mv tmp $$F ; done
+	patch -Np1 -i ../$(PATCH1)
 	make $(PM) INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root
 	make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install
 

Modified: trunk/packages/dialog/Makefile
===================================================================
--- trunk/packages/dialog/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/dialog/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -20,7 +20,8 @@
 	$(std_build)
 
 compile-stage2:
-	./configure --prefix=/usr --enable-nls
+	./configure --prefix=/usr --enable-nls \
+	    --enable-widec --with-ncursesw
 	make $(PM)
 	make install
 

Modified: trunk/packages/docbook-xsl/Makefile
===================================================================
--- trunk/packages/docbook-xsl/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/docbook-xsl/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -26,7 +26,7 @@
 compile-stage2:
 	cd .. ; unpack $(FILE1)
 	../install
-	ln -s xsl-stylesheets-$(VRS) /usr/share/xml/docbook/xsl-stylesheets-current
+	ln -sf xsl-stylesheets-$(VRS) /usr/share/xml/docbook/xsl-stylesheets-current
 
 clean:
 	-rm -rf $(DIR)

Added: trunk/packages/fonts-arphic/Makefile
===================================================================
--- trunk/packages/fonts-arphic/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/fonts-arphic/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -0,0 +1,36 @@
+# Arphic fonts Makefile
+
+NM= fonts-arphic
+LOCATION= /usr/X11R6/lib/X11/fonts/TTF
+BASE= http://cle.linux.org.tw/fonts/Arphic
+
+FILE1= bkai00mp.ttf
+FILE2= bsmi00lp.ttf
+FILE3= gbsn00lp.ttf
+FILE4= gkai00mp.ttf
+
+URL-$(FILE1)= $(BASE)/$(FILE1)
+URL-$(FILE2)= $(BASE)/$(FILE2)
+URL-$(FILE3)= $(BASE)/$(FILE3)
+URL-$(FILE4)= $(BASE)/$(FILE4)
+
+SHA-$(FILE1)= 82fa51badf5eeab60b795d686741b32d46cedc65
+SHA-$(FILE2)= f9ac121e172e900b04235039339588200d7e4145
+SHA-$(FILE3)= 443db42f54904757ed82622e3896d378fff9e57a
+SHA-$(FILE4)= 8f0322c8a1be38e78dd492c2923b2551fd5665c4
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE1) $(FILE2) $(FILE3) $(FILE4)
+	cp -Hv $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(LOCATION)
+	touch $@
+
+clean:
+
+.PHONY: clean chroot compile-stage2

Added: trunk/packages/fonts-baekmuk/Makefile
===================================================================
--- trunk/packages/fonts-baekmuk/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/fonts-baekmuk/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -0,0 +1,29 @@
+# Baekmuk fonts Makefile
+
+NM= baekmuk-ttf
+VRS= 2.2
+DIR= $(NM)-$(VRS)
+LOCATION= /usr/X11R6/lib/X11/fonts/TTF
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://kldp.net/frs/download.php/1429/$(FILE)
+SHA-$(FILE)= afdee34f700007de6ea87b43c92a88b7385ba65b
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) 
+	$(std_build)
+
+compile-stage2:
+	cp -v ttf/*.ttf $(LOCATION)
+
+clean:
+	-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Added: trunk/packages/fonts-kochi/Makefile
===================================================================
--- trunk/packages/fonts-kochi/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/fonts-kochi/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -0,0 +1,29 @@
+# Kochi fonts Makefile
+
+NM= kochi-substitute
+VRS= 20030628
+DIR= $(NM)-$(VRS)
+LOCATION= /usr/X11R6/lib/X11/fonts/TTF
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://osdn.dl.sourceforge.jp/efont/4845/$(FILE)
+SHA-$(FILE)= b7e2eb45092779fd5f87a00cdc8faf1a625bbc74
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) 
+	$(std_build)
+
+compile-stage2:
+	cp -v ./*.ttf $(LOCATION)
+
+clean:
+	-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: trunk/packages/irssi/Makefile
===================================================================
--- trunk/packages/irssi/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/irssi/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -1,15 +1,13 @@
 # irssi Makefile
 
 NM= irssi
-VRS= 0.8.9
+VRS= 0.8.10-rc6
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.bz2
+FILE= $(DIR).tar.gz
 URL-$(FILE)= http://irssi.org/files/$(FILE)
-SHA-$(FILE)= 57799a1e99ac5f6694eb6fd049d39a4e2e51f576
+SHA-$(FILE)= 87c5ec8da11686e3eadb95fa5d7b25655add37bf
 
-PATCH1= $(DIR)-gcc4_fixes-1.patch
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -21,9 +19,11 @@
 stage2: Makefile $(FILE)
 	$(std_build)
 
+# WARNING: don't add --without-terminfo --with-ncurses to ./configure line!
+# This breaks non-ASCII input.
+
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
-	./configure --prefix=/usr
+	./configure --prefix=/usr --sysconfdir=/etc
 	make $(PM)
 	make install
 	cp -ra $(ROOT)/root/.irssi /root

Deleted: trunk/packages/irssi/irssi-0.8.9-gcc4_fixes-1.patch
===================================================================
--- trunk/packages/irssi/irssi-0.8.9-gcc4_fixes-1.patch	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/irssi/irssi-0.8.9-gcc4_fixes-1.patch	2005-12-07 05:51:39 UTC (rev 1238)
@@ -1,32 +0,0 @@
-Submitted By: Justin Knierim <justin at linuxfromscratch dot org>
-Date: 2005-09-24
-Initial Package Version: 0.8.9
-Upstream Status: "Fixed"
-Origin: Pawel Sikora <pluto at pld-linux dot org>
-Description: Fixes a compilation problem with gcc-4.0.x as described on http://bugs.irssi.org/?do=details&id=219.
-
-diff -Naur irssi-orig/src/core/misc.h irssi-0.8.9/src/core/misc.h
---- irssi-orig/src/core/misc.h	2003-01-30 20:10:02.000000000 -0800
-+++ irssi-0.8.9/src/core/misc.h	2005-09-24 17:19:14.000000000 -0700
-@@ -1,6 +1,10 @@
- #ifndef __MISC_H
- #define __MISC_H
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- /* `str' should be type char[MAX_INT_STRLEN] */
- #define ltoa(str, num) \
- 	g_snprintf(str, sizeof(str), "%d", num)
-diff -Naur irssi-orig/src/perl/module.h irssi-0.8.9/src/perl/module.h
---- irssi-orig/src/perl/module.h	2001-12-13 17:54:12.000000000 -0800
-+++ irssi-0.8.9/src/perl/module.h	2005-09-24 17:20:46.000000000 -0700
-@@ -1,3 +1,7 @@
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #ifdef NEED_PERL_H
- #  include <EXTERN.h>
- #  ifndef _SEM_SEMUN_UNDEFINED

Added: trunk/packages/libidn/Makefile
===================================================================
--- trunk/packages/libidn/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/libidn/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -0,0 +1,30 @@
+# libidn Makefile
+
+NM= libidn
+VRS= 0.5.19
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://josefsson.org/libidn/releases/$(FILE)
+SHA-$(FILE)= 5ae48379a40e7e6976c680d4fd1d977224d6c589
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+	$(std_build)
+
+compile-stage2:
+	 @./configure --prefix=/usr
+	make $(PM)
+	make install
+
+clean:
+	-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/linux/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -24,6 +24,10 @@
 
 PATCH2= squashfs2.2-patch
 
+PATCH50= $(NM)-2.6.12.5-utf8_input-2.patch
+URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
+SHA-$(PATCH50)= 72b51b7cf6b5eeecf79a07d3778670c64011397c
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -32,9 +36,9 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH50)
 	$(std_build)
-	cp $(SRC)/$(FILE) $(LFSSRC)/
+	cp $(SRC)/{$(FILE),$(PATCH50)} $(LFSSRC)/
 
 compile-stage2:
 ifeq ($(LFS-ARCH),x86)
@@ -54,6 +58,7 @@
 endif
 	patch -Np1 -i ../$(PATCH2)
 	cd $(ROOT) ; make -C $(PKG)/unionfs patch-kernel
+	patch -Np1 -i ../$(PATCH50)
 	make mrproper
 	cp ../config.$(LFS-ARCH) .config
 	make $(PM)
@@ -74,6 +79,5 @@
 
 clean:
 	-rm -rf $(DIR)
-	-rm reiser4.patch
 
 .PHONY: clean chroot compile-stage2

Modified: trunk/packages/lynx/Makefile
===================================================================
--- trunk/packages/lynx/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/lynx/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -22,7 +22,7 @@
 compile-stage2:
 	./configure --prefix=/usr --libdir=/etc --with-zlib --with-bzlib \
 	    --enable-nls --with-ssl --enable-charset-choice \
-	    --enable-locale-charset
+	    --enable-locale-charset --with-screen=ncursesw
 	make $(PM)
 	make install
 	sed -i 's/#LOCALE_CHARSET:FALSE/LOCALE_CHARSET:TRUE/' /etc/lynx.cfg

Modified: trunk/packages/nALFS/Makefile
===================================================================
--- trunk/packages/nALFS/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/nALFS/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -8,6 +8,9 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= e9847c5830f2b1c5a89fe3bb7fa397648b4099e7
 
+PATCH1= $(DIR)-locale-1.patch
+URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1)
+SHA-$(PATCH1)= c3f4d4fb0584fabad532009c534f65181b7ea926
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -16,10 +19,11 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
 	$(std_build) 
 
 compile-stage2:
+	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=/usr --with-libxml2 \
 	 --with-curl --with-ssl
 	make $(PM)

Modified: trunk/packages/nano/Makefile
===================================================================
--- trunk/packages/nano/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/nano/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -1,12 +1,12 @@
 # Nano Makefile
 
 NM= nano
-VRS= 1.2.5
+VRS= 1.3.9
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
-SHA-$(FILE)= e78d9c3f7795aca3b4e03eb5cea00c4490a4fb44
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://www.nano-editor.org/dist/v1.3/$(FILE)
+SHA-$(FILE)= 3ed5fce2637a36c8053e6cf36f0f4ec8c0cd6dff
 
 # Targets
 
@@ -25,7 +25,7 @@
 	make $(PM)
 	make install
 	mkdir -p /usr/share/doc/nano/examples
-	cp nanorc.sample /usr/share/doc/nano/examples
+	cp doc/nanorc.sample /usr/share/doc/nano/examples
 	cp $(ROOT)/etc/nanorc /etc
 
 clean:

Modified: trunk/packages/tin/Makefile
===================================================================
--- trunk/packages/tin/Makefile	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/tin/Makefile	2005-12-07 05:51:39 UTC (rev 1238)
@@ -21,7 +21,7 @@
 
 compile-stage2:
 	./configure --prefix=/usr --enable-included-msgs \
-	 --with-mailer=/usr/bin/msmtp \
+	 --with-screen=ncursesw --with-mailer=/usr/bin/msmtp \
 	 --enable-nntp-only --disable-pgp-gpg --disable-printing
 	make $(PM) build
 	make install

Deleted: trunk/packages/xfce/desktop-files/glinks.desktop
===================================================================
--- trunk/packages/xfce/desktop-files/glinks.desktop	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/xfce/desktop-files/glinks.desktop	2005-12-07 05:51:39 UTC (rev 1238)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec="links -g"
-Name=Links (graphical)
-Terminal=0
-Comment=Links (graphical)
-Icon=html
-MimeType=text/html
-XClassHintResName=Links
-Categories=Application;Network;

Deleted: trunk/packages/xfce/desktop-files/links.desktop
===================================================================
--- trunk/packages/xfce/desktop-files/links.desktop	2005-12-07 05:45:17 UTC (rev 1237)
+++ trunk/packages/xfce/desktop-files/links.desktop	2005-12-07 05:51:39 UTC (rev 1238)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=links %u
-Name=Links
-Terminal=1
-Comment=Links
-Icon=html
-MimeType=text/html
-XClassHintResName=Links
-Categories=Application;Network;




More information about the livecd mailing list