From 316160b0f25bd314c019478a83f0215ef0955ebf Mon Sep 17 00:00:00 2001
From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Thu, 4 May 2006 10:50:41 +0000
Subject: [PATCH] =?utf8?q?Haupts=C3=A4chlich=20Quellenupdate.=20Apache=20-?=
 =?utf8?q?=20Bind=20-=20hddtemp=20-=20hdparm=20-=20lame=20Ghostscript=20un?=
 =?utf8?q?d=20CUPS=20aktiviert.=20Samba=20jetzt=20mit=20libcups-Support.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@112 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 doc/packages-list.txt | 3 +++
 lfs/apache            | 2 +-
 lfs/bind              | 2 +-
 lfs/hddtemp           | 4 ++--
 lfs/hdparm            | 2 +-
 lfs/lame              | 2 +-
 make.sh               | 6 ++++--
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 6cf305c552..fd3a205320 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -35,6 +35,7 @@
   * ccache-2.3
   * cdrtools-2.01
   * coreutils-5.93
+  * cups-1.1.23-source
   * cxacru-2003-10-05
   * cyrus-imapd-2.2.12
   * cyrus-sasl-2.1.21
@@ -72,6 +73,7 @@
   * glib-2.9.6
   * glibc-2.3.3-lfs-5.1
   * gmp-4.1.2
+  * gnump3d-2.9.8
   * gnupg-1.4.2
   * grep-2.5.1
   * groff-1.19
@@ -92,6 +94,7 @@
   * jpegsrc.v6b
   * kbd-1.12
   * kudzu-0.99.50
+  * lame-3.96.1
   * less-382
   * libcap-1.10
   * libnet-1.1.2.1
diff --git a/lfs/apache b/lfs/apache
index 346c6b2f8f..79d9742708 100644
--- a/lfs/apache
+++ b/lfs/apache
@@ -36,7 +36,7 @@ VER        = 1.3.34
 
 THISAPP    = apache_$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.apache.org/dist/httpd
+DL_FROM    = $(URL_IPCOP)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
diff --git a/lfs/bind b/lfs/bind
index 908ce38241..0d98d65910 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -36,7 +36,7 @@ VER        = 9.2.5
 
 THISAPP    = bind-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.isc.org/isc/bind9/$(VER)
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
diff --git a/lfs/hddtemp b/lfs/hddtemp
index c5eaeddc1c..a9dcdbfa75 100644
--- a/lfs/hddtemp
+++ b/lfs/hddtemp
@@ -36,7 +36,7 @@ VER        = 0.3-beta14
 
 THISAPP    = hddtemp-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = http://www.guzu.net/linux
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -85,4 +85,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure --with-db-path=/etc/hddtemp.db
 	cd $(DIR_APP) && make && make install
 	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
\ No newline at end of file
+	@$(POSTBUILD)
diff --git a/lfs/hdparm b/lfs/hdparm
index 2cbf5aac64..ca7a0b3720 100644
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -36,7 +36,7 @@ VER        = 6.3
 
 THISAPP    = hdparm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.ibiblio.org/pub/Linux/system/hardware
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
diff --git a/lfs/lame b/lfs/lame
index 254fd94397..b3b33f4996 100644
--- a/lfs/lame
+++ b/lfs/lame
@@ -36,7 +36,7 @@ VER        = 3.96.1
 
 THISAPP    = lame-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://prdownloads.sourceforge.net/lame
+DL_FROM    = $(URL_SFNET)/lame
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
diff --git a/make.sh b/make.sh
index b8aa5ccb26..b51d3b6ce2 100644
--- a/make.sh
+++ b/make.sh
@@ -659,6 +659,8 @@ buildipcop() {
   ipcopmake openldap
   ipcopmake saslauthd PASS=2
   ipcopmake xinetd
+  ipcopmake ghostscript
+  ipcopmake cups
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
@@ -675,8 +677,8 @@ buildipcop() {
   ipcopmake asterisk
   ipcopmake edonkeyclc
   ipcopmake sane
-  ipcopmake ghostscript
-  ipcopmake cups
+  ipcopmake lame
+  ipcopmake gnump3d
 #  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
 #  ipcopmake hddtemp
 # ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
-- 
2.39.2