Author: justin
Date: 2005-11-21 23:38:03 -0700 (Mon, 21 Nov 2005)
New Revision: 1132
Modified:
branches/6.1.1-newmake/packages/Terminal/Makefile
branches/6.1.1-newmake/packages/Terminal/terminalrc
branches/6.1.1-newmake/packages/fonts-dejavu/Makefile
branches/6.1.1-newmake/packages/gc/Makefile
Log:
Merged r1128 and r1129 from trunk to 6.1.1-newmake branch.
Modified: branches/6.1.1-newmake/packages/Terminal/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/Terminal/Makefile 2005-11-22 06:36:58 UTC
(rev 1131)
+++ branches/6.1.1-newmake/packages/Terminal/Makefile 2005-11-22 06:38:03 UTC
(rev 1132)
@@ -23,7 +23,7 @@
./configure --prefix=/usr --libexecdir=/usr/sbin
make $(PM)
make install
- mkdir /etc/xdg/Terminal
+ mkdir -p /etc/xdg/Terminal
install -m644 ../terminalrc /etc/xdg/Terminal/terminalrc
clean:
Modified: branches/6.1.1-newmake/packages/Terminal/terminalrc
===================================================================
--- branches/6.1.1-newmake/packages/Terminal/terminalrc 2005-11-22 06:36:58 UTC
(rev 1131)
+++ branches/6.1.1-newmake/packages/Terminal/terminalrc 2005-11-22 06:38:03 UTC
(rev 1132)
@@ -1,9 +1,9 @@
-# HACK: we don't use the Bitstream Vera font below for non-latin1,
-# we rely upon its substitutions
+# HACK: we use the DejaVu font below only for languages it supports,
+# and rely upon fontconfig to do the proper font substitution otherwise.
[Configuration]
CommandUpdateRecords=FALSE
-FontName=Bitstream Vera Sans Mono 14
+FontName=DejaVu Sans Mono 14
MiscCursorBlinks=TRUE
ShortcutsNoMenukey=TRUE
ShortcutsNoMnemonics=TRUE
Modified: branches/6.1.1-newmake/packages/fonts-dejavu/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/fonts-dejavu/Makefile 2005-11-22
06:36:58 UTC (rev 1131)
+++ branches/6.1.1-newmake/packages/fonts-dejavu/Makefile 2005-11-22
06:38:03 UTC (rev 1132)
@@ -1,14 +1,19 @@
# DejaVu fonts Makefile
NM= dejavu-ttf
-VRS= 1.14
+VRS= 2.0
DIR= $(NM)-$(VRS)
LOCATION= /usr/X11R6/lib/X11/fonts/TTF
FILE= $(DIR).tar.gz
URL-$(FILE)= http://heanet.dl.sourceforge.net/sourceforge/dejavu/$(FILE)
-SHA-$(FILE)= 51eab6407780e0d5b62395d11e205743c3949a3e
+SHA-$(FILE)= dd3025cf27282fb0c5b9579f5546a8c549efe874
+# Post-release bugfix for 2.0, should be unneeded after 2.1
+FILE1= DejaVuSansMono-BoldOb.ttf
+URL-$(FILE1)= http://www.srnet.cz/~stepan/temp/.dejavu/$(FILE1)
+SHA-$(FILE1)= afcfd07ee07cf3d1d24c80e4909af83f21329be1
+
# Targets
include $(ROOT)/scripts/functions
@@ -17,11 +22,12 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(FILE1)
$(std_build)
compile-stage2:
cp -v ./*.ttf $(LOCATION)
+ cp -v ../$(FILE1) $(LOCATION)
clean:
-rm -rf $(DIR)
Modified: branches/6.1.1-newmake/packages/gc/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/gc/Makefile 2005-11-22 06:36:58 UTC (rev
1131)
+++ branches/6.1.1-newmake/packages/gc/Makefile 2005-11-22 06:38:03 UTC (rev
1132)
@@ -16,13 +16,16 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
$(std_build)
compile-stage2:
- ./configure --prefix=/usr
+ sed -i "s|\$$(datadir)/@PACKAGE@|&-6.5|" doc/Makefile.in
+ ./configure --prefix=/usr --datadir=/usr/share/doc --enable-cplusplus
make $(PM)
make install
+ install -v -m644 doc/gc.man /usr/share/man/man3/gc_malloc.3
+ ln -sf gc_malloc.3 /usr/share/man/man3/gc.3
clean:
-rm -rf $(DIR)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
