Author: justin
Date: 2005-10-04 10:49:46 -0600 (Tue, 04 Oct 2005)
New Revision: 858
Added:
trunk/packages/cairo/
trunk/packages/cairo/Makefile
Modified:
trunk/Makefile
trunk/packages/rp-pppoe/Makefile
Log:
Added cairo to trunk, fixed error in rp-pppoe install since script was renamed.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-10-04 14:03:27 UTC (rev 857)
+++ trunk/Makefile 2005-10-04 16:49:46 UTC (rev 858)
@@ -204,7 +204,8 @@
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-links ch-openssh \
- ch-pkgconfig ch-glib2 ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 \
+ ch-pkgconfig ch-glib2 ch-libungif ch-imlib2 ch-cairo ch-pango \
+ ch-atk ch-gtk2 \
ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
ch-startup-notification chroot-gvim ch-xfce ch-lua ch-ion ch-irssi \
ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
Added: trunk/packages/cairo/Makefile
===================================================================
--- trunk/packages/cairo/Makefile 2005-10-04 14:03:27 UTC (rev 857)
+++ trunk/packages/cairo/Makefile 2005-10-04 16:49:46 UTC (rev 858)
@@ -0,0 +1,30 @@
+# cairo Makefile
+
+NM= cairo
+VRS= 1.0.0
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/$(FILE)
+SHA-$(FILE)= abc50d6a657cba15b3956c8c3aaea080b71172bb
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-gtk2 $(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/rp-pppoe/Makefile
===================================================================
--- trunk/packages/rp-pppoe/Makefile 2005-10-04 14:03:27 UTC (rev 857)
+++ trunk/packages/rp-pppoe/Makefile 2005-10-04 16:49:46 UTC (rev 858)
@@ -26,7 +26,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
sed -i s@/usr/bin/logger@/bin/logger@ \
- scripts/adsl-{connect,setup,stop}.in
+ scripts/pppoe-{connect,setup,stop}.in
cd src ; ./configure
cd src ; make
cd src ; make install
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
