Author: alexander
Date: 2005-12-05 21:32:48 -0700 (Mon, 05 Dec 2005)
New Revision: 1226
Added:
trunk/packages/glibc/glibc-2.3.6-supported_locales-2.patch
trunk/packages/groff-1.19/
trunk/packages/groff-1.19/Makefile
trunk/packages/man-db/
trunk/packages/man-db/Makefile
Removed:
trunk/packages/kbd/kbd-1.12-backspace-1.patch
Modified:
trunk/Makefile
trunk/packages/coreutils/Makefile
trunk/packages/diffutils/Makefile
trunk/packages/glibc/Makefile
trunk/packages/grep/Makefile
trunk/packages/groff/Makefile
trunk/packages/grub/Makefile
trunk/packages/kbd/Makefile
trunk/packages/man/Makefile
trunk/packages/ncurses/Makefile
trunk/packages/psmisc/Makefile
trunk/packages/readline/Makefile
trunk/packages/sysklogd/Makefile
trunk/packages/sysvinit/sysvinit-2.86-reexec06-1.patch
trunk/packages/texinfo/Makefile
trunk/packages/vim/Makefile
Log:
Merged all LFS packages from utf8-newmake except linux and lfs-bootscripts.
WARNING: untested.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -236,12 +236,13 @@
pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages \
ch-glibc re-adjust-toolchain ch-binutils ch-gcc ch-coreutils \
ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk \
- ch-m4 ch-bison ch-gpm ch-ncurses ch-readline ch-vim ch-less ch-groff \
+ ch-m4 ch-bison ch-gpm ch-ncurses ch-readline ch-vim ch-less \
+ ch-gdbm ch-groff ch-groff-1.19 \
ch-sed ch-flex ch-gettext ch-inetutils ch-iproute2 ch-perl ch-texinfo \
ch-autoconf ch-automake ch-bash
post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs \
- ch-grep ch-grub ch-gzip ch-hotplug ch-man ch-make \
+ ch-grep ch-grub ch-gzip ch-hotplug ch-man ch-man-db ch-make \
ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow \
ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux final-environment
@@ -249,11 +250,12 @@
lfs-dejagnu-scpt lfs-perl-scpt lfs-texinfo-scpt ch-linux-libc-headers \
ch-man-pages ch-glibc-32 ch-glibc adjusting-toolchain ch-binutils
ch-gcc \
ch-coreutils ch-zlib ch-iana-etc ch-findutils ch-gawk ch-ncurses
ch-readline \
- ch-vim ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex ch-gettext
ch-inetutils \
+ ch-vim ch-m4 ch-bison ch-less ch-gdbm ch-groff ch-groff-1.19 ch-sed \
+ ch-flex ch-gettext ch-inetutils \
ch-perl ch-iproute2 ch-texinfo ch-autoconf ch-automake ch-bash
cross-post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs \
- ch-grep ch-gzip ch-man ch-make ch-module-init-tools ch-patch ch-procps \
+ ch-grep ch-gzip ch-man ch-man-db ch-make ch-module-init-tools ch-patch
ch-procps \
ch-psmisc ch-shadow ch-sysklogd ch-sysvinit ch-tar ch-util-linux
ch-udev \
ch-hotplug final-environment
ifeq ($(LFS-ARCH),x86_64)
@@ -276,7 +278,7 @@
ch-traceroute ch-rsync ch-jhalfs ch-sudo \
ch-dialog ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
- ch-squashfs ch-cpio ch-gdbm ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
+ ch-squashfs ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
ch-bin86 ch-lilo ch-syslinux ch-nALFS-profile
Modified: trunk/packages/coreutils/Makefile
===================================================================
--- trunk/packages/coreutils/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/coreutils/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -16,6 +16,10 @@
URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
SHA-$(PATCH2)= 6a0098315fa9b7cb80d17dd1b146ac91fa187606
+PATCH50= $(DIR)-i18n-1.patch
+URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
+SHA-$(PATCH50)= 13e3a734aea39bfcb9bc24d295ee26bdf370b03c
+
# Targets
include $(ROOT)/scripts/functions
@@ -44,9 +48,9 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH50)
$(std_build)
- cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/
+ cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH50)} $(LFSSRC)/
compile-stage2:
ifeq ($(LFS-ARCH),x86)
@@ -56,6 +60,7 @@
patch -Np1 -i ../$(PATCH1)
endif
patch -Np1 -i ../$(PATCH2)
+ patch -Np1 -i ../$(PATCH50)
ifndef CROSS
./configure --prefix=/usr
else
Modified: trunk/packages/diffutils/Makefile
===================================================================
--- trunk/packages/diffutils/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/diffutils/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -8,6 +8,10 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= b01fd84ae885fef426e6ccf157ae7184fb9a79a4
+PATCH50= $(DIR)-i18n-1.patch
+URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
+SHA-$(PATCH50)= 2d88d693ab572f04990a3a28deb5e743e288b9da
+
# Targets
include $(ROOT)/scripts/functions
@@ -30,10 +34,12 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH50)
$(std_build)
+ cp $(SRC)/$(PATCH50) $(LFSSRC)
compile-stage2:
+ patch -Np1 -i ../$(PATCH50)
ifndef CROSS
./configure --prefix=/usr
else
Modified: trunk/packages/glibc/Makefile
===================================================================
--- trunk/packages/glibc/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/glibc/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -17,6 +17,12 @@
SHA-$(FILE)= 47753ac9e13fd955c77c3e2b2bbb278d009dcbc5
endif
+ifndef CROSS
+FILE2= $(NM)-libidn-$(VRS).tar.bz2
+URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
+SHA-$(FILE2)= 95d3a98495d4bd7138149fd312db88da56e735db
+endif
+
PATCH30= $(DIR)-sparc_tls-1.patch
URL-$(PATCH30)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH30)
SHA-$(PATCH30)= 5100d3728f58bc40f7f61de10c0b7a202b876aa5
@@ -32,6 +38,8 @@
STAGE1_DEPS= $(FILE) $(PATCH40)
STAGE2_DEPS= $(FILE) $(PATCH41)
+PATCH50= $(DIR)-supported_locales-2.patch
+
# Targets
include $(ROOT)/scripts/functions
@@ -58,11 +66,12 @@
$(WD)/include/bits
ifndef CROSS
-stage1: $(FILE)
+stage1: $(FILE) $(FILE2)
$(sep_dir_build)
- cp $(SRC)/$(FILE) $(LFSSRC)/
+ cp $(SRC)/{$(FILE),$(FILE2)} $(LFSSRC)/
compile-stage1:
+ cd ../$(DIR) ; unpack ../$(FILE2)
../$(DIR)/configure --prefix=$(WD) --disable-profile \
--enable-add-ons --enable-kernel=2.6.0 --with-binutils=$(WD)/bin \
--without-gd --with-headers=$(WD)/include --without-selinux
@@ -126,6 +135,13 @@
touch $@
compile-stage2:
+ cd ../$(DIR) ; unpack ../$(FILE2)
+# The vi_VN.TCVN locale doesn't work, testcase: "LC_ALL=vi_VN.TCVN bash"
+# Result: the prompt never comes back, CPU utilization is 100%
+# (this may be a bash bug)
+ sed -i '/vi_VN.TCVN/d' ../$(DIR)/localedata/SUPPORTED
+# LiveCD specific locale additions
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH50)
../$(DIR)/configure --prefix=/usr --disable-profile \
--enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
PARALLELMFLAGS="$(PM)" make
@@ -146,6 +162,17 @@
ifeq ($(LFS-ARCH),sparc64)
cd ../$(DIR) ; patch -Np1 -i ../$(PATCH30)
endif
+# FIXME: is the following still true?
+# The no_NO alias doesn't work, testcase: "LC_ALL=no_NO locale"
+# Result: locale: Cannot set LC_CTYPE to default locale: No such file or
directory
+# The solution is to use the nb_NO locale instead of no_NO
+ sed -i '/no_NO/d' ../$(DIR)/intl/locale.alias
+# The vi_VN.TCVN locale doesn't work, testcase: "LC_ALL=vi_VN.TCVN bash"
+# Result: the prompt never comes back, CPU utilization is 100%
+# (this may be a bash bug)
+ sed -i '/vi_VN.TCVN/d' ../$(DIR)/localedata/SUPPORTED
+# LiveCD specific locale additions
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH50)
echo "slibdir=/lib64" >> configparms
CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
../$(DIR)/configure --prefix=/usr \
Added: trunk/packages/glibc/glibc-2.3.6-supported_locales-2.patch
===================================================================
--- trunk/packages/glibc/glibc-2.3.6-supported_locales-2.patch 2005-12-05
14:15:10 UTC (rev 1225)
+++ trunk/packages/glibc/glibc-2.3.6-supported_locales-2.patch 2005-12-06
04:32:48 UTC (rev 1226)
@@ -0,0 +1,74 @@
+Submitted by: Alexander E. Patrakov
+Date: 2005-08-13
+Initial Package Version: 2.3.5
+Upstream Status: LiveCD specific. Nearly equivalent to adding "localedef" to
Makefile.
+Origin: Combined RedHat, ALT Linux and Debian changes
+Description: Alters the list of supported locales
+
+Adds some ISO-8859-15 locales (RedHat)
+Adds ru_RU.CP1251, uk_UA.CP1251 for Windows compatibility (ALT Linux)
+Changes "russian" alias to point to the de-facto ru_RU.KOI8-R standard (Debian)
+
+diff -ur glibc-2.3.5.orig/intl/locale.alias glibc-2.3.5/intl/locale.alias
+--- glibc-2.3.5.orig/intl/locale.alias 2005-08-13 14:06:12.910337376 +0600
++++ glibc-2.3.5/intl/locale.alias 2005-08-13 14:07:42.435727448 +0600
+@@ -63,7 +63,7 @@
+ polish pl_PL.ISO-8859-2
+ portuguese pt_PT.ISO-8859-1
+ romanian ro_RO.ISO-8859-2
+-russian ru_RU.ISO-8859-5
++russian ru_RU.KOI8-R
+ slovak sk_SK.ISO-8859-2
+ slovene sl_SI.ISO-8859-2
+ slovenian sl_SI.ISO-8859-2
+diff -ur glibc-2.3.5.orig/localedata/SUPPORTED glibc-2.3.5/localedata/SUPPORTED
+--- glibc-2.3.5.orig/localedata/SUPPORTED 2005-08-13 14:06:32.316387208
+0600
++++ glibc-2.3.5/localedata/SUPPORTED 2005-08-13 14:10:11.836015152 +0600
+@@ -63,6 +63,7 @@
+ cy_GB/ISO-8859-14 \
+ da_DK.UTF-8/UTF-8 \
+ da_DK/ISO-8859-1 \
++da_DK.ISO-8859-15/ISO-8859-15 \
+ de_AT.UTF-8/UTF-8 \
+ de_AT/ISO-8859-1 \
+ [EMAIL PROTECTED]/ISO-8859-15 \
+@@ -89,6 +90,7 @@
+ en_DK/ISO-8859-1 \
+ en_GB.UTF-8/UTF-8 \
+ en_GB/ISO-8859-1 \
++en_GB.ISO-8859-15/ISO-8859-15 \
+ en_HK.UTF-8/UTF-8 \
+ en_HK/ISO-8859-1 \
+ en_IE.UTF-8/UTF-8 \
+@@ -103,6 +105,7 @@
+ en_SG/ISO-8859-1 \
+ en_US.UTF-8/UTF-8 \
+ en_US/ISO-8859-1 \
++en_US.ISO-8859-15/ISO-8859-15 \
+ en_ZA.UTF-8/UTF-8 \
+ en_ZA/ISO-8859-1 \
+ en_ZW.UTF-8/UTF-8 \
+@@ -257,6 +260,7 @@
+ ro_RO.UTF-8/UTF-8 \
+ ro_RO/ISO-8859-2 \
+ ru_RU.KOI8-R/KOI8-R \
++ru_RU.CP1251/CP1251 \
+ ru_RU.UTF-8/UTF-8 \
+ ru_RU/ISO-8859-5 \
+ ru_UA.UTF-8/UTF-8 \
+@@ -280,6 +284,7 @@
+ [EMAIL PROTECTED]/ISO-8859-15 \
+ sv_SE.UTF-8/UTF-8 \
+ sv_SE/ISO-8859-1 \
++sv_SE.ISO-8859-15/ISO-8859-15 \
+ ta_IN/UTF-8 \
+ te_IN/UTF-8 \
+ tg_TJ/KOI8-T \
+@@ -293,6 +298,7 @@
+ tr_TR/ISO-8859-9 \
+ tt_RU.UTF-8/UTF-8 \
+ uk_UA.UTF-8/UTF-8 \
++uk_UA.CP1251/CP1251 \
+ uk_UA/KOI8-U \
+ ur_PK/UTF-8 \
+ uz_UZ/ISO-8859-1 \
Modified: trunk/packages/grep/Makefile
===================================================================
--- trunk/packages/grep/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/grep/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -1,5 +1,8 @@
# Grep Makefile
+# Do not update this package before RedHat! Some of the fixes are scheduled
+# for grep-2.5.3, not 2.5.2
+
NM= grep
VRS= 2.5.1a
DIR= $(NM)-$(VRS)
@@ -8,20 +11,24 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 2cd082775d30be463c0ac674a00595eb56fda22e
+PATCH50= $(DIR)-redhat_fixes-1.patch
+URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
+SHA-$(PATCH50)= cd2f9c8efeed69efb98bebbb07a104b1c842cfb0
+
# Targets
include $(ROOT)/scripts/functions
stage1: $(FILE)
$(std_build) # See the scripts/functions file for functions like this
- cp $(SRC)/$(FILE) $(LFSSRC) # Copy LFS-Base packages to safe location
+ cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
ifndef CROSS
./configure --prefix=$(WD) --disable-perl-regexp
else
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --host=$(LFS_TARGET) --disable-perl-regexp
+ --host=$(LFS_TARGET) --disable-perl-regexp
endif
make $(PM)
make install
@@ -30,10 +37,12 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH50)
$(std_build)
+ cp $(SRC)/$(PATCH50) $(LFSSRC)
compile-stage2:
+ patch -Np1 -i ../$(PATCH50)
ifndef CROSS
./configure --prefix=/usr --bindir=/bin
else
Modified: trunk/packages/groff/Makefile
===================================================================
--- trunk/packages/groff/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/groff/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -1,13 +1,22 @@
# Groff Makefile
+# ascii8 and nippon devices exist only for groff-1.18.1.1 as a patch
+# rejected upstream.
+# Do not upgrade this package before Debian does it!
+# http://bugs.debian.org/196762
+
NM= groff
-VRS= 1.19.2
+VRS= 1.18.1.1
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= b7303af986de7b7c7722c2dbad07844fac6b6343
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://ftp.gnu.org/gnu/$(NM)/$(FILE)
+SHA-$(FILE)= 19c8c83e6ee29dd6041dae0daf1c1d0debd3d32a
+PATCH= groff_1.18.1.1-8.diff.gz
+URL-$(PATCH)= http://ftp.debian.org/debian/pool/main/g/$(NM)/$(PATCH)
+SHA-$(PATCH)= 6423b528127de74e3242428d8e3c102f40e966d1
+
# Targets
include $(ROOT)/scripts/functions
@@ -16,22 +25,25 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH)
$(std_build)
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
+ zcat ../$(PATCH) | patch -Np1
+ sed -i 's,2010,002D,' font/devutf8/R.proto
+ sed -i 's,2212,002D,' font/devutf8/R.proto
ifndef CROSS
- PAGE=$(pagesize) ./configure --prefix=/usr
+ PAGE=$(pagesize) ./configure --prefix=/usr --enable-multibyte
else
PAGE=$(pagesize) CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
- ./configure --prefix=/usr --libdir=/usr/lib64
+ ./configure --prefix=/usr --libdir=/usr/lib64 --enable-multibyte
endif
make
make install
- ln -s soelim /usr/bin/zsoelim
- ln -s eqn /usr/bin/geqn
- ln -s tbl /usr/bin/gtbl
+ ln -sf soelim /usr/bin/zsoelim
+ ln -sf eqn /usr/bin/geqn
+ ln -sf tbl /usr/bin/gtbl
clean:
-rm -rf $(DIR)
Added: trunk/packages/groff-1.19/Makefile
===================================================================
--- trunk/packages/groff-1.19/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/groff-1.19/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -0,0 +1,26 @@
+# Groff Makefile
+
+NM= groff
+VRS= 1.19.2
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= b7303af986de7b7c7722c2dbad07844fac6b6343
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-pre-bash) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+
+stage2: Makefile $(FILE)
+ echo "This package is needed only for non-UTF-8 builds"
+ cp $(SRC)/$(FILE) $(LFSSRC)
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot
Modified: trunk/packages/grub/Makefile
===================================================================
--- trunk/packages/grub/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/grub/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -26,7 +26,6 @@
make $(PM)
make install
endif
-
ifeq ($(LFS-ARCH),x86_64)
CC="gcc $(32FLAGS)" ./configure --prefix=/usr
make $(PM)
Modified: trunk/packages/kbd/Makefile
===================================================================
--- trunk/packages/kbd/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/kbd/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -12,7 +12,12 @@
URL-$(BELARUSIAN_FILE)= http://www.mova.org/bellinux/$(BELARUSIAN_FILE)
SHA-$(BELARUSIAN_FILE)= c0026a915fff58cdc3b68bb57de4eec35a220c43
+THAI_FILE= thai-console-data_cvs20051001.tar.bz2
+URL-$(THAI_FILE)=
http://linux.thai.net/pub/thailinux/software/snapshots/thai-console-data/$(THAI_FILE)
+SHA-$(THAI_FILE)= 2d5e8f4d6cf488987600d455078fe8f5d4199217
+
PATCH1= $(DIR)-backspace-1.patch
+URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1)
SHA-$(PATCH1)= 39e332e42d5145dfc47786dba5eff63cda91d0ba
PATCH30= $(DIR)-sparc_kbdrate-1.patch
@@ -23,11 +28,12 @@
URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
SHA-$(PATCH3)= 93ec9885a79ff79088f1533ec52f1a87dae69500
-STAGE2-DEPS = $(FILE) $(BELARUSIAN_FILE) $(PATCH1) $(PATCH3)
+STAGE2-DEPS = $(FILE) $(BELARUSIAN_FILE) $(THAI_FILE) $(PATCH1) $(PATCH3)
ifeq ($(LFS-ARCH),sparc64)
STAGE2-DEPS += $(PATCH30)
endif
+
# Targets
include $(ROOT)/scripts/functions
@@ -41,7 +47,7 @@
cp $(SRC)/{$(FILE),$(PATCH3)} $(LFSSRC)
compile-stage2:
- cd .. ; unpack $(BELARUSIAN_FILE)
+ cd .. ; unpack $(BELARUSIAN_FILE) ; unpack $(THAI_FILE)
zcat ../bellinux/console/keymaps/by2_win.kmap.gz >
data/keymaps/i386/qwerty/by2_win.map
sed -i -e 's/\(50 = 0x.\)A/\1C/' data/keymaps/i386/qwerty/by2_win.map
patch -Np1 -i ../$(PATCH1)
@@ -56,9 +62,22 @@
endif
make $(PM)
make install
+ # Turkish fixup
+ cp /usr/share/kbd/consoletrans/cp857_to_uni.trans
/usr/share/kbd/unimaps/cp857.uni
+ # Thai fonts and keymaps
+ gzip ../thai-console-data/consolefonts/*.psf
+ install -m644 ../thai-console-data/consolefonts/*.psf.gz
/usr/share/kbd/consolefonts
+ install -m644 ../thai-console-data/consoletrans/tis620.acm
/usr/share/kbd/consoletrans/tis620_to_uni.trans
+ for a in ../thai-console-data/keymaps/*.kmap \
+ ../thai-console-data/keymaps/experimental/*.kmap ; do \
+ mv $${a} $${a%kmap}map ; done
+ sed -i 's,\+U,U,g' ../thai-console-data/keymaps/experimental/*.map
+ gzip ../thai-console-data/keymaps/*.map
../thai-console-data/keymaps/experimental/*.map
+ install -m644 ../thai-console-data/keymaps/*.map.gz
../thai-console-data/keymaps/experimental/*uni*.map.gz
/usr/share/kbd/keymaps/i386/qwerty
clean:
-rm -rf $(DIR)
-rm -rf bellinux
+ -rm -rf thai-console-data
.PHONY: clean chroot compile-stage2
Deleted: trunk/packages/kbd/kbd-1.12-backspace-1.patch
===================================================================
--- trunk/packages/kbd/kbd-1.12-backspace-1.patch 2005-12-05 14:15:10 UTC
(rev 1225)
+++ trunk/packages/kbd/kbd-1.12-backspace-1.patch 2005-12-06 04:32:48 UTC
(rev 1226)
@@ -1,232 +0,0 @@
-Submitted By: Alexander E. Patrakov
-Date: 2005-05-16
-Initial Package Version: 1.12
-Upstream Status: Not submitted, possibly incomplete
-Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
-Obsoletes the /etc/kbd/bs-sends-del file for i386.
-
-diff -urN kbd-1.12.orig/data/keymaps/i386/dvorak/dvorak-l.map
kbd-1.12/data/keymaps/i386/dvorak/dvorak-l.map
---- kbd-1.12.orig/data/keymaps/i386/dvorak/dvorak-l.map 2002-10-11
17:08:51.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/dvorak/dvorak-l.map 2005-05-16
19:54:48.000000000 +0600
-@@ -43,7 +43,7 @@
- keycode 11 = three numbersign
- keycode 12 = two at
- keycode 13 = one exclam
-- keycode 14 = BackSpace Delete
-+ keycode 14 = Delete Delete
- ! --------------------------------------------------------------------------
- ! Row 3
- ! --------------------------------------------------------------------------
-diff -urN kbd-1.12.orig/data/keymaps/i386/dvorak/dvorak-r.map
kbd-1.12/data/keymaps/i386/dvorak/dvorak-r.map
---- kbd-1.12.orig/data/keymaps/i386/dvorak/dvorak-r.map 2002-10-11
17:08:51.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/dvorak/dvorak-r.map 2005-05-16
19:54:48.000000000 +0600
-@@ -43,7 +43,7 @@
- keycode 11 = slash question
- keycode 12 = bracketleft braceleft
- keycode 13 = bracketright braceright
-- keycode 14 = BackSpace Delete
-+ keycode 14 = Delete Delete
- ! --------------------------------------------------------------------------
- ! Row 3
- ! --------------------------------------------------------------------------
-diff -urN kbd-1.12.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map
kbd-1.12/data/keymaps/i386/fgGIod/tr_f-latin5.map
---- kbd-1.12.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2002-10-13
06:21:12.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/fgGIod/tr_f-latin5.map 2005-05-16
19:54:48.000000000 +0600
-@@ -51,7 +51,7 @@
- alt keycode 12 = Meta_minus
- keycode 13 = minus underscore
- alt keycode 13 = Meta_equal
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab Tab
- alt keycode 15 = Meta_Tab
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/lt.l4.map
kbd-1.12/data/keymaps/i386/qwerty/lt.l4.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/lt.l4.map 2002-10-13
05:59:51.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/lt.l4.map 2005-05-16
19:54:48.000000000 +0600
-@@ -205,7 +205,7 @@
- # edit this if you want the key above <Enter> to delete symbols above
- # cursor, not before.
- keycode 14 = \
-- BackSpace BackSpace BackSpace BackSpace \
-+ Delete Delete Delete Delete \
- Delete Delete Delete Delete \
- Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete
-@@ -506,7 +506,7 @@
-
- # Edit this if you want strict VT100 emulation.
- string F111 = "\033[3$"
--keycode 111 = Delete F111 Delete F111 \
-+keycode 111 = Remove F111 Remove F111 \
- Remove Remove Remove Remove \
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete \
- Boot Boot Boot Boot
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/lt.map
kbd-1.12/data/keymaps/i386/qwerty/lt.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/lt.map 2002-10-13
06:00:25.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/lt.map 2005-05-16 19:54:48.000000000
+0600
-@@ -204,7 +204,7 @@
- # edit this if you want the key above <Enter> to delete symbols above
- # cursor, not before.
- keycode 14 = \
-- BackSpace BackSpace BackSpace BackSpace \
-+ Delete Delete Delete Delete \
- Delete Delete Delete Delete \
- Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete
-@@ -505,7 +505,7 @@
-
- # Edit this if you want strict VT100 emulation.
- string F111 = "\033[3$"
--keycode 111 = Delete F111 Delete F111 \
-+keycode 111 = Remove F111 Remove F111 \
- Remove Remove Remove Remove \
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete \
- Boot Boot Boot Boot
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/no-latin1.map
kbd-1.12/data/keymaps/i386/qwerty/no-latin1.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/no-latin1.map 2002-10-11
17:08:49.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/no-latin1.map 2005-05-16
19:54:48.000000000 +0600
-@@ -3,7 +3,7 @@
- # Send comments to Kjetil T. Homme <[EMAIL PROTECTED]>
- include "linux-with-alt-and-altgr"
- plain keycode 83 = KP_Comma
-- plain keycode 111 = Delete # "Remove" originally, weird...
-+ plain keycode 111 = Remove
- strings as usual
-
- keycode 1 = Escape
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ru-ms.map
kbd-1.12/data/keymaps/i386/qwerty/ru-ms.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/ru-ms.map 2002-10-13
06:07:05.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/ru-ms.map 2005-05-16
19:54:48.000000000 +0600
-@@ -89,8 +89,8 @@
- altgr alt keycode 13 = Meta_equal
- shift alt keycode 13 = Meta_plus
- altgr shift alt keycode 13 = Meta_plus
-- keycode 14 = BackSpace BackSpace BackSpace BackSpace
--# keycode 14 = Delete Delete Delete Delete
-+# keycode 14 = BackSpace BackSpace BackSpace BackSpace
-+ keycode 14 = Delete Delete Delete Delete
- alt keycode 14 = Meta_Delete
- altgr alt keycode 14 = Meta_Delete
- keycode 15 = Tab Tab Tab Tab
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ru.map
kbd-1.12/data/keymaps/i386/qwerty/ru.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/ru.map 2002-10-13
06:02:19.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/ru.map 2005-05-16 19:56:08.000000000
+0600
-@@ -37,7 +37,7 @@
- alt keycode 12 = Meta_minus
- keycode 13 = equal plus equal plus
- alt keycode 13 = Meta_equal
-- keycode 14 = BackSpace BackSpace BackSpace BackSpace
-+ keycode 14 = Delete Delete Delete Delete
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab Tab Tab Tab
- alt keycode 15 = Meta_Tab
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ru1.map
kbd-1.12/data/keymaps/i386/qwerty/ru1.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/ru1.map 2002-10-13
06:02:30.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/ru1.map 2005-05-16 19:55:32.000000000
+0600
-@@ -143,8 +143,8 @@
-
- # The keycode "0xFF" is too dangerous for many programs (including emacs).
- # So let it be bracket instead of Hard Sign.
--# altgr keycode 27 = +0xDF
--# altgr shift keycode 27 = +0xFF
-+altgr keycode 27 = +0xDF
-+altgr shift keycode 27 = +0xFF
- control keycode 27 = Control_bracketright
- altgr control keycode 27 = Control_bracketright
- alt keycode 27 = Meta_bracketright
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ru2.map
kbd-1.12/data/keymaps/i386/qwerty/ru2.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/ru2.map 2002-10-13
06:05:47.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/ru2.map 2005-05-16 19:56:52.000000000
+0600
-@@ -46,7 +46,7 @@
- alt keycode 12 = Meta_minus
- keycode 13 = equal plus equal plus
- alt keycode 13 = Meta_equal
-- keycode 14 = BackSpace BackSpace BackSpace BackSpace
-+ keycode 14 = Delete Delete Delete Delete
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab Tab Tab Tab
- alt keycode 15 = Meta_Tab
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/se-ir209.map
kbd-1.12/data/keymaps/i386/qwerty/se-ir209.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/se-ir209.map 2002-10-13
06:12:48.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/se-ir209.map 2005-05-16
19:54:48.000000000 +0600
-@@ -345,7 +345,7 @@
- keycode 109 = Next Scroll_Forward
- keycode 110 = Insert
-
-- keycode 111 = Delete # "Remove" originally, weird...
-+ keycode 111 = Remove
- control alt keycode 111 = Boot
- control altgr keycode 111 = Boot
-
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/se-lat6.map
kbd-1.12/data/keymaps/i386/qwerty/se-lat6.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/se-lat6.map 2002-10-13
06:13:01.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/se-lat6.map 2005-05-16
19:54:48.000000000 +0600
-@@ -374,6 +374,6 @@
- keycode 109 = Next Scroll_Forward
- keycode 110 = Insert
-
-- keycode 111 = Delete # "Remove" originally, weird...
-+ keycode 111 = Remove
- control alt keycode 111 = Boot
- control altgr keycode 111 = Boot
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/tr_q-latin5.map
kbd-1.12/data/keymaps/i386/qwerty/tr_q-latin5.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2002-10-11
17:08:49.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/tr_q-latin5.map 2005-05-16
19:54:48.000000000 +0600
-@@ -49,7 +49,7 @@
- alt keycode 12 = Meta_minus
- keycode 13 = minus underscore
- alt keycode 13 = Meta_equal
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab Tab
- alt keycode 15 = Meta_Tab
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ua-utf-ws.map
kbd-1.12/data/keymaps/i386/qwerty/ua-utf-ws.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2002-10-13
06:07:56.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/ua-utf-ws.map 2005-05-16
19:54:48.000000000 +0600
-@@ -260,7 +260,7 @@
- shift ctrll ctrlr keycode 13 = plus
- alt ctrll ctrlr keycode 13 = Meta_equal
- shift alt ctrll ctrlr keycode 13 = Meta_plus
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- control keycode 14 = BackSpace
- alt keycode 14 = Meta_Delete
- ctrlr keycode 14 = BackSpace
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ua-utf.map
kbd-1.12/data/keymaps/i386/qwerty/ua-utf.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/ua-utf.map 2002-10-13
06:08:07.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/ua-utf.map 2005-05-16
19:54:48.000000000 +0600
-@@ -250,7 +250,7 @@
- shift ctrll ctrlr keycode 13 = plus
- alt ctrll ctrlr keycode 13 = Meta_equal
- shift alt ctrll ctrlr keycode 13 = Meta_plus
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- control keycode 14 = BackSpace
- alt keycode 14 = Meta_Delete
- ctrlr keycode 14 = BackSpace
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ua-ws.map
kbd-1.12/data/keymaps/i386/qwerty/ua-ws.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/ua-ws.map 2002-10-13
06:08:19.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/ua-ws.map 2005-05-16
19:54:48.000000000 +0600
-@@ -260,7 +260,7 @@
- shift ctrll ctrlr keycode 13 = plus
- alt ctrll ctrlr keycode 13 = Meta_equal
- shift alt ctrll ctrlr keycode 13 = Meta_plus
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- control keycode 14 = BackSpace
- alt keycode 14 = Meta_Delete
- ctrlr keycode 14 = BackSpace
-diff -urN kbd-1.12.orig/data/keymaps/i386/qwerty/ua.map
kbd-1.12/data/keymaps/i386/qwerty/ua.map
---- kbd-1.12.orig/data/keymaps/i386/qwerty/ua.map 2002-10-13
06:08:31.000000000 +0600
-+++ kbd-1.12/data/keymaps/i386/qwerty/ua.map 2005-05-16 19:54:48.000000000
+0600
-@@ -249,7 +249,7 @@
- shift ctrll ctrlr keycode 13 = plus
- alt ctrll ctrlr keycode 13 = Meta_equal
- shift alt ctrll ctrlr keycode 13 = Meta_plus
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- control keycode 14 = BackSpace
- alt keycode 14 = Meta_Delete
- ctrlr keycode 14 = BackSpace
Modified: trunk/packages/man/Makefile
===================================================================
--- trunk/packages/man/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/man/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -17,21 +17,10 @@
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE)
- $(std_build)
+ echo "This package is needed only for non-UTF-8 builds"
cp $(SRC)/$(FILE) $(LFSSRC)
-compile-stage2:
- sed -i '[EMAIL PROTECTED]@&[EMAIL PROTECTED]' configure
- sed -i '[EMAIL PROTECTED]/usr/[EMAIL PROTECTED]&@g' src/man.conf.in
-ifndef CROSS
- ./configure -confdir=/etc
-else
- CC="gcc $(64FLAGS)" ./configure -confdir=/etc
-endif
- make
- make install
-
clean:
-rm -rf $(DIR)
-.PHONY: clean chroot compile-stage2
+.PHONY: clean chroot
Added: trunk/packages/man-db/Makefile
===================================================================
--- trunk/packages/man-db/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/man-db/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -0,0 +1,44 @@
+# man-db Makefile
+
+NM= man-db
+VRS= 2.4.3
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://savannah.nongnu.org/download/$(NM)/$(FILE)
+SHA-$(FILE)= a9f6ac22ccd97186005920cedb5f6611df13d4fa
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-post-bash) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) $(PATCH1)
+ $(std_build)
+
+compile-stage2:
+ mv man/de{_DE.88591,}
+ mv man/es{_ES.88591,}
+ mv man/it{_IT.88591,}
+ mv man/ja{_JP.eucJP,}
+ sed -i 's,\*_\*,??,' man/Makefile.in
+ echo '#define WEB_BROWSER "exec /usr/bin/lynx"' >>include/manconfig.h.in
+ echo '#define COL "/usr/bin/col"' >>include/manconfig.h.in
+ echo '#define VGRIND "/usr/bin/vgrind"' >>include/manconfig.h.in
+ echo '#define GRAP "/usr/bin/grap"' >>include/manconfig.h.in
+ sed -i '/\t\/usr\/man/d' src/man_db.conf.in
+ifndef CROSS
+ ./configure --prefix=/usr --enable-mb-groff --disable-setuid
+else
+ CC="gcc $(64FLAGS)" ./configure --prefix=/usr --enable-mb-groff
--disable-setuid
+endif
+ make $(PM)
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Modified: trunk/packages/ncurses/Makefile
===================================================================
--- trunk/packages/ncurses/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/ncurses/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -22,9 +22,9 @@
--without-ada --enable-overwrite
else
CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \
- ./configure --prefix=$(WD) --with-shared \
- --host=$(LFS_TARGET) --without-debug --without-ada \
- --enable-overwrite --with-build-cc=gcc --libdir=$(WD)/lib64
+ ./configure --prefix=$(WD) --with-shared \
+ --host=$(LFS_TARGET) --without-debug --without-ada \
+ --enable-overwrite --with-build-cc=gcc --libdir=$(WD)/lib64
endif
make sources
make $(PM)
@@ -34,34 +34,36 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
$(std_build)
compile-stage2:
+# The non-wide library is for commercial software only => not for the Live CD
ifndef CROSS
- ./configure --prefix=/usr --with-shared --without-debug --with-gpm
+ ./configure --prefix=/usr --with-shared \
+ --without-debug --enable-widec --without-cxx-binding
else
CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
- ./configure --prefix=/usr --libdir=/lib64 --with-shared --without-debug
+ ./configure --prefix=/usr --libdir=/usr/lib64 --with-shared \
+ --without-debug --enable-widec --without-cxx-binding
endif
+ # FIXME: still needed?
make sources
make $(PM)
make install
-ifndef CROSS
- chmod 755 /usr/lib/*.$(VRS)
- chmod 644 /usr/lib/libncurses++.a
- mv /usr/lib/libncurses.so.5* /lib
- ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
- ln -sf libncurses.so /usr/lib/libcurses.so
-else
- mv /lib64/lib{panel,menu,form,ncurses,ncurses++}.a /usr/lib64
- rm /lib64/lib{ncurses,menu,panel,form}.so
- ln -sf ../../lib64/libncurses.so.5 /usr/lib64/libncurses.so
- ln -sf ../../lib64/libmenu.so.5 /usr/lib64/libmenu.so
- ln -sf ../../lib64/libpanel.so.5 /usr/lib64/libpanel.so
- ln -sf ../../lib64/libform.so.5 /usr/lib64/libform.so
- chmod 755 /lib64/lib{panel,menu,form,ncurses}.so.$(VRS)
-endif
+ chmod 755 /usr/$(LIB_MAYBE54)/*.$(VRS)
+ mv /usr/$(LIB_MAYBE64)/libncursesw.so.5* /$(LIB_MAYBE64)
+ ln -sf ../../$(LIB_MAYBE64)/libncursesw.so.5
/usr/$(LIB_MAYBE64)/libncursesw.so
+ for lib in curses ncurses form panel menu ; do \
+ rm -f /usr/$(LIB_MAYBE64)/lib$${lib}.so ; \
+ echo "INPUT(-l$${lib}w)" >/usr/$(LIB_MAYBE64)/lib$${lib}.so ; \
+ ln -sf lib$${lib}w.a /usr/$(LIB_MAYBE64)/lib$${lib}.a ; \
+ done
+ rm -f /usr/$(LIB_MAYBE64)/libcursesw.so
+ echo "INPUT(-lncursesw)" >/usr/$(LIB_MAYBE64)/libcursesw.so
+ ln -sf libncurses.so /usr/$(LIB_MAYBE64)/libcurses.so
+ ln -sf libncursesw.a /usr/$(LIB_MAYBE64)/libcursesw.a
+ ln -sf libncurses.a /usr/$(LIB_MAYBE64)/libcurses.a
clean:
-rm -rf $(DIR)
Modified: trunk/packages/psmisc/Makefile
===================================================================
--- trunk/packages/psmisc/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/psmisc/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -25,7 +25,7 @@
./configure --prefix=/usr --exec-prefix=""
else
CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --exec-prefix=""
+ --exec-prefix=""
endif
make $(PM)
make install
Modified: trunk/packages/readline/Makefile
===================================================================
--- trunk/packages/readline/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/readline/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -12,6 +12,10 @@
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= 085d0d973d1a39707c26454db1d414957a85e2d0
+PATCH50= $(DIR)-redhat_fixes-1.patch
+URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
+SHA-$(PATCH50)= e3840c242c397e3b8a777043de72e56d8cfa7f18
+
# Targets
include $(ROOT)/scripts/functions
@@ -20,12 +24,13 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH50)
$(std_build)
- cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+ cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH50)} $(LFSSRC)
compile-stage2:
patch -Np1 -i ../$(PATCH1)
+ patch -Np1 -i ../$(PATCH50)
ifndef CROSS
./configure --prefix=/usr --libdir=/lib
else
Modified: trunk/packages/sysklogd/Makefile
===================================================================
--- trunk/packages/sysklogd/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/sysklogd/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -8,10 +8,14 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 2439b0ce3c3e0c98e5a03cee13a112cff9a801d2
-PATCH1=$(DIR)-fixes-1.patch
+PATCH1= $(DIR)-fixes-1.patch
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= 4fbd5e56c212c8e37f363eb48ba86a5ecea21f4a
+PATCH50= $(DIR)-8bit-1.patch
+URL-$(PATCH50)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH50)
+SHA-$(PATCH50)= edc01eceb4ae7af3d6a02e23a4dace8fee50f3eb
+
# Targets
include $(ROOT)/scripts/functions
@@ -20,17 +24,19 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH50)
$(std_build)
- cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+ cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH50)} $(LFSSRC)
compile-stage2:
- patch -Np1 -i $(SRC)/$(PATCH1)
+ patch -Np1 -i ../$(PATCH1)
+ patch -Np1 -i ../$(PATCH2)
ifndef CROSS
make $(PM)
else
make $(PM) CC="gcc $(64FLAGS)"
endif
+ make $(PM)
make install
cp -ra $(ROOT)/etc/syslog.conf /etc
Modified: trunk/packages/sysvinit/sysvinit-2.86-reexec06-1.patch
===================================================================
--- trunk/packages/sysvinit/sysvinit-2.86-reexec06-1.patch 2005-12-05
14:15:10 UTC (rev 1225)
+++ trunk/packages/sysvinit/sysvinit-2.86-reexec06-1.patch 2005-12-06
04:32:48 UTC (rev 1226)
@@ -1,3 +1,11 @@
+Submitted By: Alexander E. Patrakov
+Date: 2005-08-12
+Initial Package Version: 2.86
+Upstream Status: LiveCD specific
+Origin: Alexander E. Patrakov
+Description: Makes the "init u" command work even if the system is already in
+runlevel 0 or 6. This is needed in order to free the root filesystem.
+
diff -ur sysvinit-2.86.orig/src/init.c sysvinit-2.86/src/init.c
--- sysvinit-2.86.orig/src/init.c 2004-07-30 18:16:20.000000000 +0600
+++ sysvinit-2.86/src/init.c 2005-06-08 14:57:03.000000000 +0600
Modified: trunk/packages/texinfo/Makefile
===================================================================
--- trunk/packages/texinfo/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/texinfo/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -13,6 +13,10 @@
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= ac721310cbe17f1661173598954d20484be6c767
+PATCH50= $(DIR)-multibyte-1.patch
+URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
+SHA-$(PATCH50)= cb7f2c85a6f0ed73e8c4d1772e20b886a8c0de96
+
# Targets
include $(ROOT)/scripts/functions
@@ -30,12 +34,13 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH50)
$(std_build)
- cp $(SRC)/$(PATCH1) $(LFSSRC)
+ cp $(SRC)/{$(PATCH1),$(PATCH50)} $(LFSSRC)
compile-stage2:
patch -Np1 -i ../$(PATCH1)
+ patch -Np1 -i ../$(PATCH50)
ifndef CROSS
./configure --prefix=/usr
else
Modified: trunk/packages/vim/Makefile
===================================================================
--- trunk/packages/vim/Makefile 2005-12-05 14:15:10 UTC (rev 1225)
+++ trunk/packages/vim/Makefile 2005-12-06 04:32:48 UTC (rev 1226)
@@ -39,6 +39,8 @@
endif
make $(PM)
make install
+ rm -f /usr/share/vim/$(DIR)/tutor/tutor.{gr,pl,ru,sk}
+ rm -f /usr/share/vim/$(DIR)/tutor/tutor.??.*
ln -sf vim /usr/bin/vi
cp $(ROOT)/etc/vimrc /etc
@@ -52,6 +54,8 @@
./configure --prefix=/usr --with-features=huge
make $(PM)
make install
+ rm -f /usr/share/vim/$(DIR)/tutor/tutor.{gr,pl,ru,sk}
+ rm -f /usr/share/vim/$(DIR)/tutor/tutor.??.*
ln -sf vim /usr/bin/vi
cp $(ROOT)/etc/vimrc /etc
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
