Author: thomasp Date: 2005-08-12 22:00:53 -0600 (Fri, 12 Aug 2005) New Revision: 571
Modified: x86/trunk/packages/cvs/Makefile x86/trunk/packages/device-mapper/Makefile x86/trunk/packages/dialog/Makefile x86/trunk/packages/eject/Makefile x86/trunk/packages/gtk2/Makefile x86/trunk/packages/imlib2/Makefile x86/trunk/packages/mutt/Makefile x86/trunk/packages/nALFS/Makefile x86/trunk/packages/nfs-utils/Makefile x86/trunk/packages/openssh/Makefile x86/trunk/packages/popt/Makefile x86/trunk/packages/ppp/Makefile x86/trunk/packages/rp-pppoe/Makefile x86/trunk/packages/samba/Makefile x86/trunk/packages/slrn/Makefile x86/trunk/packages/squashfs/Makefile x86/trunk/packages/tcpwrappers/Makefile x86/trunk/packages/xfce/Makefile Log: Fixed several typos. Updated nALFS Makefile to new format. Fixed xfce Makefile so it actually works. Modified: x86/trunk/packages/cvs/Makefile =================================================================== --- x86/trunk/packages/cvs/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/cvs/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -10,7 +10,7 @@ SHA-$(FILE)= 47f51a96b5a73e18c96f431f3c494735aa9c0236 PATCH1= $(DIR)-zlib-1.patch -URL-$(PATCH1)= $(HTTPBLFS)/A-C/$(PATCH) +URL-$(PATCH1)= $(HTTPBLFS)/A-C/$(PATCH1) SHA-$(PATCH1)= facc13bda7cc912db51f3994a5fe9f8374837394 # Targets Modified: x86/trunk/packages/device-mapper/Makefile =================================================================== --- x86/trunk/packages/device-mapper/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/device-mapper/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -6,7 +6,7 @@ DIR= $(NM).$(VRS) FILE= $(DIR).tgz -URL-$(FILE)= ftp://sources.redhat.com/pub/dm/$(FILE) +URL-$(FILE)= ftp://sources.redhat.com/pub/dm/old/$(FILE) SHA-$(FILE)= 388ea9cdd3fed3114068b63102d7d44371861229 # Targets Modified: x86/trunk/packages/dialog/Makefile =================================================================== --- x86/trunk/packages/dialog/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/dialog/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -12,6 +12,8 @@ # Targets # ============================================================================= +include $(ROOT)/scripts/functions + chroot: @chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' @@ -24,7 +26,7 @@ #============================================================================== # Configure commands below \/ #============================================================================== - ./configure --prefix=/usr --enable-nls >../$(DIR)[EMAIL PROTECTED] 2>&1 + @./configure --prefix=/usr --enable-nls >../$(DIR)[EMAIL PROTECTED] 2>&1 # #==Status Messages========================================== # Modified: x86/trunk/packages/eject/Makefile =================================================================== --- x86/trunk/packages/eject/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/eject/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -19,7 +19,7 @@ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' stage2: Makefile $(FILE) $(PATCH1) - @$(sep_dir_build) # Simple function to create a separate build directory + @$(std_build) compile-stage2: @$(call echo_message, Configuring) Modified: x86/trunk/packages/gtk2/Makefile =================================================================== --- x86/trunk/packages/gtk2/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/gtk2/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -12,6 +12,8 @@ # Targets #============================================================================== +include $(ROOT)/scripts/functions + chroot: @chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-gtk2 $(chbash-post-bash)' Modified: x86/trunk/packages/imlib2/Makefile =================================================================== --- x86/trunk/packages/imlib2/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/imlib2/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -5,7 +5,7 @@ VRS= 1.2.1 DIR= $(NM)-$(VRS) -FILE= $(DIR).tar.gz +FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTPBLFS)/I-K/$(FILE) SHA-$(FILE)= 3786f0a8ad1f0b419faa997bcb75b13f2f792e83 Modified: x86/trunk/packages/mutt/Makefile =================================================================== --- x86/trunk/packages/mutt/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/mutt/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -5,12 +5,12 @@ VRS= 1.4.2.1 DIR= $(NM)-$(VRS) -FILE= $(DIR)i.tar.gz +FILE= $(DIR)i.tar.bz2 URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE) SHA-$(FILE)= f56b36f8836ee624633858d903d153e9b6e3afad -PATCH1= patch-$(VRS).vvv.nntp -URL-$(PATCH1)= http://mutt.org.ua/download/mutt-$(VRS)/$(PATCH1).gz +PATCH1= patch-$(VRS).vvv.nntp.gz +URL-$(PATCH1)= http://mutt.org.ua/download/mutt-$(VRS)/$(PATCH1) SHA-$(PATCH1)= ac0ddf0831808b01c67ab27b3e3823ecf1ca131b # Targets @@ -31,7 +31,8 @@ # Configure commands below \/ #============================================================================== @groupadd mail - @patch -Np1 -i ../$(PATCH1) + @gunzip -c ../$(PATCH1) > ../patch-$(VRS).vvv.nntp + @patch -Np1 -i ../patch-$(VRS).vvv.nntp @./configure --prefix=/usr --sysconfdir=/etc --enable-imap \ --enable-pop --enable-nntp --with-ssl >../$(DIR)[EMAIL PROTECTED] 2>&1 # Modified: x86/trunk/packages/nALFS/Makefile =================================================================== --- x86/trunk/packages/nALFS/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/nALFS/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -1,29 +1,57 @@ # nALFS Makefile +#============================================================================== -# Package versions NM= nALFS VRS= 1.2.4 DIR= $(NM)-$(VRS) + FILE= $(DIR).tar.bz2 -URL= http://www.linuxfromscratch.org/alfs/downloads/stable/$(FILE) +URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) +SHA-$(FILE)= e9847c5830f2b1c5a89fe3bb7fa397648b4099e7 -#RULES +# Targets +# ============================================================================= -.PHONY: clean chroot stage2 +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/nALFS ] ; then unpack $(FILE) && cd $(DIR) && \ - ./configure --prefix=/usr --with-libxml2 --with-curl --with-ssl && \ - make -j3 && \ - make install ; fi - @make clean +stage2: Makefile $(FILE) + @$(std_build) +compile-stage2: + @$(call echo_message, Configuring) +#============================================================================== +# Configure commands below \/ +#============================================================================== + @./configure --prefix=/usr --with-libxml2 \ + --with-curl --with-ssl >../$(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: compile-stage1 clean chroot compile-stage2 Modified: x86/trunk/packages/nfs-utils/Makefile =================================================================== --- x86/trunk/packages/nfs-utils/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/nfs-utils/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -38,7 +38,7 @@ #============================================================================== # Make commands below \/ #============================================================================== - @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1 + @make >>../$(DIR)[EMAIL PROTECTED] 2>&1 # #==Status Messages=========================================== # Modified: x86/trunk/packages/openssh/Makefile =================================================================== --- x86/trunk/packages/openssh/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/openssh/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -2,7 +2,7 @@ #============================================================================== NM= openssh -VRS= 3.9p1 +VRS= 4.1p1 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 Modified: x86/trunk/packages/popt/Makefile =================================================================== --- x86/trunk/packages/popt/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/popt/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -10,7 +10,7 @@ SHA-$(FILE)= 5b9248195f3623a0fa88f3bf4d68aef4cabd619f PATCH1= $(NM)_$(VRS)-5.diff.bz2 -URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1) +URL-$(PATCH1)= $(HTTPBLFS)/M-P/$(PATCH1) SHA-$(PATCH1)= 774d7b2ea41128ca8b46bc834f3de1052c4fb9dc # Targets @@ -23,7 +23,7 @@ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' stage2: Makefile $(FILE) $(PATCH1) - @$(sep_build) + @$(std_build) compile-stage2: @$(call echo_message, Configuring) Modified: x86/trunk/packages/ppp/Makefile =================================================================== --- x86/trunk/packages/ppp/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/ppp/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -6,7 +6,7 @@ DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 -URL-$(FILE)= $(HTTPBLFS)/P-M/$(FILE) +URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE) SHA-$(FILE)= 7f3840464639f3575d08f9394cfbce65b1956aa8 # Targets Modified: x86/trunk/packages/rp-pppoe/Makefile =================================================================== --- x86/trunk/packages/rp-pppoe/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/rp-pppoe/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -10,7 +10,7 @@ SHA-$(FILE)= 4633964034e9a7819f2dca90068eed62a4d0028d PATCH1= $(DIR)-iproute2-1.patch -URL-$(PATCH1)= $(HTTPBLFS)/Q-S/$(PATCH) +URL-$(PATCH1)= $(HTTPBLFS)/Q-S/$(PATCH1) SHA-$(PATCH1)= 1b844a93855a52146832328c0109240c8e297b2a # Targets @@ -32,7 +32,7 @@ #============================================================================== @patch -Np1 -i ../$(PATCH1) @sed -i s@/usr/bin/logger@/bin/logger@ \ - scripts/adsl-{connect,setup,stop).in + scripts/adsl-{connect,setup,stop}.in @cd src ; ./configure >../../$(DIR)[EMAIL PROTECTED] 2>&1 # #==Status Messages========================================== Modified: x86/trunk/packages/samba/Makefile =================================================================== --- x86/trunk/packages/samba/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/samba/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -38,6 +38,7 @@ # Make commands below \/ #============================================================================== @cd source ; make >>../../$(DIR)[EMAIL PROTECTED] 2>&1 + @mkdir /etc/samba @install -m644 $(ROOT)/etc/samba/smb.conf /etc/samba @cd source/client ; \ gcc $(CFLAGS) -static mount.cifs.c -o mount.cifs \ Modified: x86/trunk/packages/slrn/Makefile =================================================================== --- x86/trunk/packages/slrn/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/slrn/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -7,7 +7,7 @@ FILE= $(DIR).tar.bz2 URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/$(NM)/$(FILE) -SHA-$(FILE)= 1502debf524b90eceb2b15202a6d3cd0f5dc6887 +SHA-$(FILE)= d8c3755403c9bb19b83123614cda05f94731027f # Targets # ============================================================================= Modified: x86/trunk/packages/squashfs/Makefile =================================================================== --- x86/trunk/packages/squashfs/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/squashfs/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -26,7 +26,7 @@ #============================================================================== # Make commands below \/ #============================================================================== - @cd $(NM)-tools ; make >../$(DIR)[EMAIL PROTECTED] 2>&1 + @cd $(NM)-tools ; make >../../$(DIR)[EMAIL PROTECTED] 2>&1 # #==Status Messages=========================================== # @@ -35,7 +35,7 @@ #============================================================================== # Install commands below \/ #============================================================================== - @cp -v mksquashfs $(WD)/bin >>../$(DIR)[EMAIL PROTECTED] 2>&1 + @cd $(NM)-tools ; cp -v mksquashfs $(WD)/bin >>../../$(DIR)[EMAIL PROTECTED] 2>&1 # #==Status Messages=========================================== # Modified: x86/trunk/packages/tcpwrappers/Makefile =================================================================== --- x86/trunk/packages/tcpwrappers/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/tcpwrappers/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -11,7 +11,7 @@ PATCH1= tcp_wrappers-$(VRS)-shared_lib_plus_plus-1.patch URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/downloads/tcp_wrappers/$(PATCH1) -SHA-$(PATCH1)= f1a4c86d1d4b6f6a1c47ad83f70bfff50a1bdb89 +SHA-$(PATCH1)= 915652d43c57f346d6f0a14eeaf706bbfed98ffa PATCH2= tcp_wrappers-$(VRS)-gcc34-1.patch URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/downloads/tcp_wrappers/$(PATCH2) Modified: x86/trunk/packages/xfce/Makefile =================================================================== --- x86/trunk/packages/xfce/Makefile 2005-08-12 05:28:48 UTC (rev 570) +++ x86/trunk/packages/xfce/Makefile 2005-08-13 04:00:53 UTC (rev 571) @@ -22,22 +22,19 @@ @$(std_build) compile-stage2: - @$(call echo_message, Configuring) -#============================================================================== -# Configure commands below \/ -#============================================================================== - @./configure --prefix=/usr --sysconfdir=/etc --enable-debug=no \ - --enable-panel --enable-startup-notification --libexecdir=/usr/sbin \ - >../$(DIR)[EMAIL PROTECTED] 2>&1 -# -#==Status Messages========================================== -# - @$(OK) @$(call echo_message, Making) #============================================================================== # Make commands below \/ #============================================================================== - @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1 + @echo "" > ../$(DIR)[EMAIL PROTECTED] + @cd src; for i in `cat ../../list`; \ + do unpack $$i.tar.gz ; \ + cd $$i ; ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-debug=no --enable-panel --enable-startup-notification \ + --libexecdir=/usr/sbin >>../../../$(DIR)[EMAIL PROTECTED] 2>&1 ; \ + make $(PM) >>../../../$(DIR)[EMAIL PROTECTED] 2>&1 ; \ + make install >> ../../../$(DIR)[EMAIL PROTECTED] 2>&1 ; cd .. ; done + # #==Status Messages=========================================== # @@ -46,13 +43,12 @@ #============================================================================== # Install commands below \/ #============================================================================== - @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1 @cp $(ROOT)/root/.xinitrc /root/ - @cp desktop-files/* /usr/share/applications + @cp ../desktop-files/* /usr/share/applications @sed -i -e 's/mozilla/firefox/' /etc/xdg/xfce4/desktop/menu.xml* @sed -i -e 's/Mozilla/Firefox/' /etc/xdg/xfce4/desktop/menu.xml* @rm -f `grep -L 'include type="system"' /etc/xdg/xfce4/desktop/menu.xml*` - @for f in /etc/xdg/xfce4/panel/contents.xml* ; do ./cleanup-panel.pl $$f ; done + @for f in /etc/xdg/xfce4/panel/contents.xml* ; do ../cleanup-panel.pl $$f ; done @sed -i -e '/Xft.dpi/d' /etc/xdg/xfce4/xinitrc # #==Status Messages=========================================== -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
