Author: justin Date: 2005-08-02 14:12:07 -0600 (Tue, 02 Aug 2005) New Revision: 506
Modified: x86/trunk/packages/isoinfo/Makefile x86/trunk/packages/joe/Makefile x86/trunk/todo-list Log: Updated joe isoinfo,joe Makefiles. Modified: x86/trunk/packages/isoinfo/Makefile =================================================================== --- x86/trunk/packages/isoinfo/Makefile 2005-08-02 20:11:12 UTC (rev 505) +++ x86/trunk/packages/isoinfo/Makefile 2005-08-02 20:12:07 UTC (rev 506) @@ -1,29 +1,58 @@ # isoinfo Makefile +#============================================================================== -# Package versions NM= isoinfo VRS= 0.03.02 DIR= $(NM)-$(VRS) + FILE= $(DIR).tar.gz -URL= ftp://metalab.unc.edu/pub/Linux/utils/disk-management/$(FILE) +URL-$(FILE)= ftp://metalab.unc.edu/pub/Linux/utils/disk-management/$(FILE) +SHA-$(FILE)= 64d4ac5b7a2fe2c1d1787fdb3202634343647d11 -#RULES +# Targets +# ============================================================================= -.PHONY: clean chroot klibc-isoinfo +include $(ROOT)/scripts/functions chroot: - @chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' + @chroot "$(MP)" $(chenv-blfs) \ + 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -klibc-isoinfo: - @echo "" - @echo "=====> Building $(NM) in chroot" - @echo "" - @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi - @if [ ! -f /usr/lib/klibc/bin/isoinfo ] ; then unpack $(FILE) && cd $(DIR) && \ - patch -Np1 -i ../../klibc/$(NM)-$(VRS)-fixes-1.patch && \ - make CC="klcc -shared" -f Makefile.Linux isoinfo && \ - install isoinfo /usr/lib/klibc/bin ; fi - @make clean +stage2: Makefile $(FILE) + @$(std_build) +compile-stage2: + @$(call echo_message, Configuring) +#============================================================================== +# Configure commands below \/ +#============================================================================== + @patch -Np1 -i ../../klibc/$(NM)-$(VRS)-fixes-1.patch \ + >../$(DIR)[EMAIL PROTECTED] 2>&1 +# +#==Status Messages========================================== +# + @$(OK) + @$(call echo_message, Making) +#============================================================================== +# Make commands below \/ +#============================================================================== + @make CC="klcc -shared" -f Makefile.Linux isoinfo \ + >>../$(DIR)[EMAIL PROTECTED] 2>&1 +# +#==Status Messages=========================================== +# + @$(OK) + @$(call echo_message, Installing) +#============================================================================== +# Install commands below \/ +#============================================================================== + @install isoinfo /usr/lib/klibc/bin >>../$(DIR)[EMAIL PROTECTED] 2>&1 +# +#==Status Messages=========================================== +# + @$(OK) + clean: @-rm -rf $(DIR) + +.PHONY: clean chroot compile-stage2 Modified: x86/trunk/packages/joe/Makefile =================================================================== --- x86/trunk/packages/joe/Makefile 2005-08-02 20:11:12 UTC (rev 505) +++ x86/trunk/packages/joe/Makefile 2005-08-02 20:12:07 UTC (rev 506) @@ -1,28 +1,56 @@ # Joe Makefile +#============================================================================== -# Package versions NM= joe -VRS= 3.1 +VRS= 3.3 DIR= $(NM)-$(VRS) -FILE= $(DIR).tar.gz -URL= http://easynews.dl.sourceforge.net/sourceforge/joe-editor/$(FILE) -#RULES +FILE= $(DIR).tar.bz2 +URL-$(FILE)= $(HTTPBLFS)/I-K/$(FILE) +SHA-$(FILE)= 2e07b494b22a176ceac3742088ddbcc10690e56d -.PHONY: clean chroot stage2 +# Targets +# ============================================================================= +include $(ROOT)/scripts/functions + chroot: - @chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' + @chroot "$(MP)" $(chenv-blfs) \ + 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: - @echo "" - @echo "=====> Building $(NM) in chroot" - @echo "" - @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi - @if [ ! -f /usr/bin/joe ] ; then unpack $(FILE) && cd $(DIR) && \ - ./configure --prefix=/usr --sysconfdir=/etc && \ - make -j3 && make install ; fi - @make clean +stage2: Makefile $(FILE) + @$(std_build) +compile-stage2: + @$(call echo_message, Configuring) +#============================================================================== +# Configure commands below \/ +#============================================================================== + @./configure --prefix=/usr --sysconfdir=/etc >../$(DIR)[EMAIL PROTECTED] 2>&1 +# +#==Status Messages========================================== +# + @$(OK) + @$(call echo_message, Making) +#============================================================================== +# Make commands below \/ +#============================================================================== + @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1 +# +#==Status Messages=========================================== +# + @$(OK) + @$(call echo_message, Installing) +#============================================================================== +# Install commands below \/ +#============================================================================== + @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1 +# +#==Status Messages=========================================== +# + @$(OK) + clean: @-rm -rf $(DIR) + +.PHONY: clean chroot compile-stage2 Modified: x86/trunk/todo-list =================================================================== --- x86/trunk/todo-list 2005-08-02 20:11:12 UTC (rev 505) +++ x86/trunk/todo-list 2005-08-02 20:12:07 UTC (rev 506) @@ -2,8 +2,6 @@ packages/grub packages/hotplug packages/inputattach -packages/isoinfo -packages/joe packages/lfs-bootscripts packages/libIDL packages/libaal -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
