Author: justin Date: 2005-11-03 10:54:29 -0700 (Thu, 03 Nov 2005) New Revision: 1042
Modified: branches/dm/packages/freefont/Makefile branches/dm/packages/libjpeg/Makefile branches/dm/packages/libtiff/Makefile branches/utf8-newmake/packages/freefont/Makefile branches/utf8-newmake/packages/libjpeg/Makefile branches/utf8-newmake/packages/libtiff/Makefile trunk/packages/freefont/Makefile trunk/packages/libjpeg/Makefile trunk/packages/libtiff/Makefile Log: Fixed sha1sums for libjpeg, freefont and libtiff. Fixed download location for libjpeg (directory is just jpeg) and freefont (package no longer available on gnu server). Modified: branches/dm/packages/freefont/Makefile =================================================================== --- branches/dm/packages/freefont/Makefile 2005-11-03 16:37:24 UTC (rev 1041) +++ branches/dm/packages/freefont/Makefile 2005-11-03 17:54:29 UTC (rev 1042) @@ -1,14 +1,13 @@ # FreeFont Makefile -NM= freefont -VRS= ttf +NM= freefont-ttf +VRS= 20050407 DIR= $(NM)-$(VRS) -FILE= $(DIR).tar.gz LOCATION= /usr/X11R6/lib/X11/fonts/TTF -FILE= $(DIR).tar.gz -URL-$(FILE)= http://ftp.gnu.org/savannah/files/freefont/$(FILE) -SHA-$(FILE)= bace5fc544871a646b63f94d4902be0fceca0b3e +FILE= $(DIR).tar.bz2 +URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) +SHA-$(FILE)= 0ea665c57a5dea77e9336538547d6996e5576961 # Targets @@ -21,12 +20,12 @@ stage2: Makefile $(FILE) mkdir $(DIR) cd $(DIR) ; unpack ../$(FILE) - make -C $(DIR) -f ../Makefile compile-$@ + make -C $(DIR) -f ../Makefile compile-$@ >$(DIR)[EMAIL PROTECTED] 2>&1 make clean touch $@ compile-stage2: - cp -v sfd/* $(LOCATION) + cp -v sfd/*.ttf $(LOCATION) clean: -rm -rf $(DIR) Modified: branches/dm/packages/libjpeg/Makefile =================================================================== --- branches/dm/packages/libjpeg/Makefile 2005-11-03 16:37:24 UTC (rev 1041) +++ branches/dm/packages/libjpeg/Makefile 2005-11-03 17:54:29 UTC (rev 1042) @@ -5,8 +5,8 @@ DIR= jpeg-$(VRS) FILE= jpegsrc.v$(VRS).tar.bz2 -URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 9064e88e8c8bde13fb7ba809f3b84fa0737a981d +URL-$(FILE)= $(HTTPBLFS)/jpeg/$(FILE) +SHA-$(FILE)= 0b4ef1e7dcee85e631a958b1ea493b6b0f2f2250 # Targets Modified: branches/dm/packages/libtiff/Makefile =================================================================== --- branches/dm/packages/libtiff/Makefile 2005-11-03 16:37:24 UTC (rev 1041) +++ branches/dm/packages/libtiff/Makefile 2005-11-03 17:54:29 UTC (rev 1042) @@ -6,7 +6,7 @@ FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 84c6fdc1c798c09b6831f870da20119d79d3b6d1 +SHA-$(FILE)= aec864e53c97f0cc4fa39e05894a6c1c2c313d50 # Targets Modified: branches/utf8-newmake/packages/freefont/Makefile =================================================================== --- branches/utf8-newmake/packages/freefont/Makefile 2005-11-03 16:37:24 UTC (rev 1041) +++ branches/utf8-newmake/packages/freefont/Makefile 2005-11-03 17:54:29 UTC (rev 1042) @@ -1,14 +1,13 @@ # FreeFont Makefile -NM= freefont -VRS= ttf +NM= freefont-ttf +VRS= 20050407 DIR= $(NM)-$(VRS) -FILE= $(DIR).tar.gz LOCATION= /usr/X11R6/lib/X11/fonts/TTF -FILE= $(DIR).tar.gz -URL-$(FILE)= http://ftp.gnu.org/savannah/files/freefont/$(FILE) -SHA-$(FILE)= bace5fc544871a646b63f94d4902be0fceca0b3e +FILE= $(DIR).tar.bz2 +URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) +SHA-$(FILE)= 0ea665c57a5dea77e9336538547d6996e5576961 # Targets Modified: branches/utf8-newmake/packages/libjpeg/Makefile =================================================================== --- branches/utf8-newmake/packages/libjpeg/Makefile 2005-11-03 16:37:24 UTC (rev 1041) +++ branches/utf8-newmake/packages/libjpeg/Makefile 2005-11-03 17:54:29 UTC (rev 1042) @@ -5,8 +5,8 @@ DIR= jpeg-$(VRS) FILE= jpegsrc.v$(VRS).tar.bz2 -URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 9064e88e8c8bde13fb7ba809f3b84fa0737a981d +URL-$(FILE)= $(HTTPBLFS)/jpeg/$(FILE) +SHA-$(FILE)= 0b4ef1e7dcee85e631a958b1ea493b6b0f2f2250 # Targets Modified: branches/utf8-newmake/packages/libtiff/Makefile =================================================================== --- branches/utf8-newmake/packages/libtiff/Makefile 2005-11-03 16:37:24 UTC (rev 1041) +++ branches/utf8-newmake/packages/libtiff/Makefile 2005-11-03 17:54:29 UTC (rev 1042) @@ -6,7 +6,7 @@ FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 84c6fdc1c798c09b6831f870da20119d79d3b6d1 +SHA-$(FILE)= aec864e53c97f0cc4fa39e05894a6c1c2c313d50 # Targets Modified: trunk/packages/freefont/Makefile =================================================================== --- trunk/packages/freefont/Makefile 2005-11-03 16:37:24 UTC (rev 1041) +++ trunk/packages/freefont/Makefile 2005-11-03 17:54:29 UTC (rev 1042) @@ -1,14 +1,13 @@ # FreeFont Makefile -NM= freefont -VRS= ttf +NM= freefont-ttf +VRS= 20050407 DIR= $(NM)-$(VRS) -FILE= $(DIR).tar.gz LOCATION= /usr/X11R6/lib/X11/fonts/TTF -FILE= $(DIR).tar.gz -URL-$(FILE)= http://ftp.gnu.org/savannah/files/freefont/$(FILE) -SHA-$(FILE)= bace5fc544871a646b63f94d4902be0fceca0b3e +FILE= $(DIR).tar.bz2 +URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) +SHA-$(FILE)= 0ea665c57a5dea77e9336538547d6996e5576961 # Targets @@ -21,12 +20,12 @@ stage2: Makefile $(FILE) mkdir $(DIR) cd $(DIR) ; unpack ../$(FILE) - make -C $(DIR) -f ../Makefile compile-$@ + make -C $(DIR) -f ../Makefile compile-$@ >$(DIR)[EMAIL PROTECTED] 2>&1 make clean touch $@ compile-stage2: - cp -v sfd/* $(LOCATION) + cp -v sfd/*.ttf $(LOCATION) clean: -rm -rf $(DIR) Modified: trunk/packages/libjpeg/Makefile =================================================================== --- trunk/packages/libjpeg/Makefile 2005-11-03 16:37:24 UTC (rev 1041) +++ trunk/packages/libjpeg/Makefile 2005-11-03 17:54:29 UTC (rev 1042) @@ -5,8 +5,8 @@ DIR= jpeg-$(VRS) FILE= jpegsrc.v$(VRS).tar.bz2 -URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 9064e88e8c8bde13fb7ba809f3b84fa0737a981d +URL-$(FILE)= $(HTTPBLFS)/jpeg/$(FILE) +SHA-$(FILE)= 0b4ef1e7dcee85e631a958b1ea493b6b0f2f2250 # Targets Modified: trunk/packages/libtiff/Makefile =================================================================== --- trunk/packages/libtiff/Makefile 2005-11-03 16:37:24 UTC (rev 1041) +++ trunk/packages/libtiff/Makefile 2005-11-03 17:54:29 UTC (rev 1042) @@ -6,7 +6,7 @@ FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 84c6fdc1c798c09b6831f870da20119d79d3b6d1 +SHA-$(FILE)= aec864e53c97f0cc4fa39e05894a6c1c2c313d50 # Targets -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
