Author: alexander
Date: 2005-09-26 01:33:26 -0600 (Mon, 26 Sep 2005)
New Revision: 787
Added:
x86/branches/utf8-newmake/packages/Terminal/
x86/branches/utf8-newmake/packages/Terminal/Makefile
x86/branches/utf8-newmake/packages/Terminal/terminalrc
x86/branches/utf8-newmake/packages/XML-Parser/
x86/branches/utf8-newmake/packages/XML-Parser/Makefile
x86/branches/utf8-newmake/packages/exo/
x86/branches/utf8-newmake/packages/exo/Makefile
x86/branches/utf8-newmake/packages/vte/
x86/branches/utf8-newmake/packages/vte/Makefile
Modified:
x86/branches/utf8-newmake/Makefile
x86/branches/utf8-newmake/packages/docbook-xsl/Makefile
x86/branches/utf8-newmake/packages/docbook-xsl/install
x86/branches/utf8-newmake/packages/ion/Makefile
x86/branches/utf8-newmake/packages/util-linux/Makefile
Log:
Added Xfce Terminal and all its dependencies
Updated util-linux to 2.12r
Added docbook-xsl documentation
Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile 2005-09-26 06:51:51 UTC (rev 786)
+++ x86/branches/utf8-newmake/Makefile 2005-09-26 07:33:26 UTC (rev 787)
@@ -213,7 +213,8 @@
ch-fonts-kochi ch-fonts-arphic update-fontsdir ch-libjpeg ch-libtiff
ch-openssh \
ch-glib2 ch-libungif ch-imlib ch-imlib2 ch-gc ch-w3m ch-pango ch-atk
ch-gtk2 \
ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
- ch-startup-notification ch-vim ch-xfce stop-here ch-lua ch-ion ch-irssi
\
+ ch-startup-notification ch-vim ch-xfce ch-vte ch-exo ch-XML-Parser \
+ ch-Terminal ch-lua ch-ion stop-here ch-irssi \
ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
Added: x86/branches/utf8-newmake/packages/Terminal/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/Terminal/Makefile 2005-09-26
06:51:51 UTC (rev 786)
+++ x86/branches/utf8-newmake/packages/Terminal/Makefile 2005-09-26
07:33:26 UTC (rev 787)
@@ -0,0 +1,32 @@
+# Terminal Makefile
+
+NM= Terminal
+VRS= 0.2.4
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://www.os-works.com/files/projects/terminal/0.2/$(FILE)
+SHA-$(FILE)= 8787f574469ec47cba9786d64fa5803fd28dd3b3
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) $(PATCH1)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr --libexecdir=/usr/sbin
+ make $(PM)
+ make install
+ mkdir /etc/xdg/Terminal
+ install -m644 ../terminalrc /etc/xdg/Terminal/terminalrc
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2
Added: x86/branches/utf8-newmake/packages/Terminal/terminalrc
===================================================================
--- x86/branches/utf8-newmake/packages/Terminal/terminalrc 2005-09-26
06:51:51 UTC (rev 786)
+++ x86/branches/utf8-newmake/packages/Terminal/terminalrc 2005-09-26
07:33:26 UTC (rev 787)
@@ -0,0 +1,12 @@
+# HACK: we don't use the Bitstream Vera font below for non-latin1,
+# we rely upon its substitutions
+
+[Configuration]
+CommandUpdateRecords=FALSE
+FontName=Bitstream Vera Sans Mono 14
+MiscCursorBlinks=TRUE
+ShortcutsNoMenukey=TRUE
+ShortcutsNoMnemonics=TRUE
+TitleInitial=LFS LiveCD
+HelperWebbrowser=firefox
+HelperMailreader=thunderbird
Added: x86/branches/utf8-newmake/packages/XML-Parser/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/XML-Parser/Makefile 2005-09-26
06:51:51 UTC (rev 786)
+++ x86/branches/utf8-newmake/packages/XML-Parser/Makefile 2005-09-26
07:33:26 UTC (rev 787)
@@ -0,0 +1,30 @@
+# XML-Parser Makefile
+
+NM= XML-Parser
+VRS= 2.34
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://www.cpan.org/authors/id/M/MS/MSERGEANT/$(FILE)
+SHA-$(FILE)= 253cb641057d929616622408de5a572ab37a8df9
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) $(PATCH1)
+ $(std_build)
+
+compile-stage2:
+ perl Makefile.PL
+ make $(PM)
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2
Modified: x86/branches/utf8-newmake/packages/docbook-xsl/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/docbook-xsl/Makefile 2005-09-26
06:51:51 UTC (rev 786)
+++ x86/branches/utf8-newmake/packages/docbook-xsl/Makefile 2005-09-26
07:33:26 UTC (rev 787)
@@ -8,6 +8,10 @@
URL-$(FILE)= $(HTTPBLFS)/D-E/$(FILE)
SHA-$(FILE)= aaabf0e274609134e187a6c36d2be23f3471f507
+FILE1= $(NM)-doc-$(VRS).tar.bz2
+URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
+SHA-$(FILE1)= 2844c94d3127a9c517462b6efd9a4a9a38c5d9ba
+
# Targets
include $(ROOT)/scripts/functions
@@ -16,10 +20,11 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(FILE1)
$(std_build)
compile-stage2:
+ cd .. ; unpack $(FILE1)
../install
ln -s xsl-stylesheets-$(VRS)
/usr/share/xml/docbook/xsl-stylesheets-current
Modified: x86/branches/utf8-newmake/packages/docbook-xsl/install
===================================================================
--- x86/branches/utf8-newmake/packages/docbook-xsl/install 2005-09-26
06:51:51 UTC (rev 786)
+++ x86/branches/utf8-newmake/packages/docbook-xsl/install 2005-09-26
07:33:26 UTC (rev 787)
@@ -1,11 +1,12 @@
-#!/bin/sh
-install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-1.69.1 &&
+#!/bin/bash
+
+install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.69.1 &&
cp -v -R VERSION common eclipse extensions fo html \
htmlhelp images javahelp lib manpages params \
profiling slides template website xhtml \
/usr/share/xml/docbook/xsl-stylesheets-1.69.1 &&
-#install -v -m755 -d /usr/share/doc/docbook-xsl-1.69.1 &&
-#cp -v -R doc/* /usr/share/doc/docbook-xsl-1.69.1 &&
+install -v -m755 -d /usr/share/doc/docbook-xsl-1.69.1 &&
+cp -v -R doc/* /usr/share/doc/docbook-xsl-1.69.1 &&
if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi &&
if [ ! -f /etc/xml/catalog ]; then
xmlcatalog --noout --create /etc/xml/catalog
@@ -25,4 +26,12 @@
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current"; \
"/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
+ /etc/xml/catalog &&
+xmlcatalog --noout --add "rewriteSystem" \
+ "http://docbook.sourceforge.net/release/xsl/1.67.2"; \
+ "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+ /etc/xml/catalog &&
+xmlcatalog --noout --add "rewriteURI" \
+ "http://docbook.sourceforge.net/release/xsl/1.67.2"; \
+ "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
/etc/xml/catalog
Added: x86/branches/utf8-newmake/packages/exo/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/exo/Makefile 2005-09-26 06:51:51 UTC
(rev 786)
+++ x86/branches/utf8-newmake/packages/exo/Makefile 2005-09-26 07:33:26 UTC
(rev 787)
@@ -0,0 +1,30 @@
+# libexo Makefile
+
+NM= exo
+VRS= 0.3.0
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://www.os-works.com/files/projects/libexo/0.3/$(FILE)
+SHA-$(FILE)= 724715b157b6b4a664516459f6c3be10ae82cc4b
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) $(PATCH1)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr --disable-python
+ make $(PM)
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2
Modified: x86/branches/utf8-newmake/packages/ion/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/ion/Makefile 2005-09-26 06:51:51 UTC
(rev 786)
+++ x86/branches/utf8-newmake/packages/ion/Makefile 2005-09-26 07:33:26 UTC
(rev 787)
@@ -20,7 +20,8 @@
$(std_build)
compile-stage2:
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+ --disable-xfree86-textprop-bug-workaround --enable-Xutf8
make $(PM)
make install
Modified: x86/branches/utf8-newmake/packages/util-linux/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/util-linux/Makefile 2005-09-26
06:51:51 UTC (rev 786)
+++ x86/branches/utf8-newmake/packages/util-linux/Makefile 2005-09-26
07:33:26 UTC (rev 787)
@@ -1,25 +1,17 @@
# Util-Linux Makefile
NM= util-linux
-VRS= 2.12q
+VRS= 2.12r
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 8a7d0a4a9f3637e17c618bc1641f91606ef2efaf
+SHA-$(FILE)= 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4
PATCH1= $(DIR)-cramfs-1.patch
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= 00f5192493b939c2c996df9c1f3f769abfa3fa8c
-PATCH2= $(DIR)-reiser_crash-2.patch
-URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= 91a03ae31e1a842f0da3aefdbaa74d76c927c465
-
-PATCH3= $(DIR)-umount_fix-1.patch
-URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
-SHA-$(PATCH3)= 28671233f1fb3e8d094ada6536cac26bf98ba103
-
# Targets
include $(ROOT)/scripts/functions
@@ -40,16 +32,14 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
- cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)/
+ cp $(SRC)/$(PATCH1) $(LFSSRC)/
compile-stage2:
sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/lib/hwclock/[EMAIL
PROTECTED]' hwclock/hwclock.c
mkdir -p /var/lib/hwclock
patch -Np1 -i ../$(PATCH1)
- patch -Np1 -i ../$(PATCH2)
- patch -Np1 -i ../$(PATCH3)
./configure
make $(PM) HAVE_KILL=yes HAVE_SLN=yes
make HAVE_KILL=yes HAVE_SLN=yes install
Added: x86/branches/utf8-newmake/packages/vte/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/vte/Makefile 2005-09-26 06:51:51 UTC
(rev 786)
+++ x86/branches/utf8-newmake/packages/vte/Makefile 2005-09-26 07:33:26 UTC
(rev 787)
@@ -0,0 +1,31 @@
+# vte Makefile
+
+NM= vte
+VRS= 0.11.15
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://ftp.gnome.org/pub/GNOME/sources/$(NM)/0.11/$(FILE)
+SHA-$(FILE)= 89cf28e721317ffe6fd62f4037469c70eeee03f8
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) $(PATCH1)
+ $(std_build)
+
+compile-stage2:
+ sed -i -e 's%\\177:%&kh=\\EOH:@7=\\EOF:%g' termcaps/xterm
+ ./configure --prefix=/usr --disable-python --libexecdir=/usr/sbin
+ make $(PM)
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
