X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=2487b94abca78f60bf20a5cf5b0bb851b3bc6786;hb=69dcc42551e024d0a63a1d6749fb512c67c6b1ff;hp=769366102a57b4a8159749bf96f3492088242cef;hpb=9594506f99ee7e6f72932ad59fa304bbb761d467;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index 769366102a..2487b94abc 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"				# Software name
 SNAME="ipfire"			# Short name
-VERSION="2.0a3"			# Version number
+VERSION="2.0t4"			# Version number
 SLOGAN="www.ipfire.org"		# Software slogan
 CONFIG_ROOT=/var/ipfire		# Configuration rootdir
 NICE=10				# Nice level
@@ -333,11 +333,10 @@ buildipfire() {
   ipfiremake fcdslsl		SMP=1
   ipfiremake fcdslusb		SMP=1
   ipfiremake fcdslslusb	SMP=1
-  ipfiremake fcpci			SMP=1
 #  ipfiremake promise-sata-300-tx	SMP=1
   ipfiremake zaptel			SMP=1
   ipfiremake fuse				SMP=1
-  ipfiremake linux			XEN=1
+  #ipfiremake linux			XEN=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake fcdsl
@@ -345,7 +344,6 @@ buildipfire() {
   ipfiremake fcdslsl
   ipfiremake fcdslusb
   ipfiremake fcdslslusb
-  ipfiremake fcpci
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
   ipfiremake fuse
@@ -374,6 +372,7 @@ buildipfire() {
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake libxml2
+  ipfiremake libxslt
   ipfiremake BerkeleyDB
   ipfiremake mysql
   ipfiremake cyrus-sasl
@@ -413,7 +412,8 @@ buildipfire() {
   ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
-#  ipfiremake isdn4k-utils # What about mISDN???
+  ipfiremake isdn4k-utils
+  ipfiremake mISDN
   ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
@@ -421,7 +421,6 @@ buildipfire() {
   ipfiremake misc-progs
   ipfiremake mtools
   ipfiremake nano
-  ipfiremake nash
   ipfiremake nasm
   ipfiremake URI
   ipfiremake HTML-Tagset
@@ -506,6 +505,7 @@ buildipfire() {
   ipfiremake lame
   ipfiremake sox
   ipfiremake gnump3d
+  ipfiremake ctorrent
   ipfiremake applejuice
   ipfiremake ocaml
   ipfiremake mldonkey
@@ -525,6 +525,8 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
+  ipfiremake alsa
+  ipfiremake mp3blaster
 }
 
 buildinstaller() {
@@ -625,6 +627,7 @@ buildpackages() {
 }
 
 ipfirepackages() {
+  ipfiredist alsa
 #  ipfiredist amavisd
 #  ipfiredist applejuice
 #  ipfiredist asterisk
@@ -634,8 +637,11 @@ ipfirepackages() {
 #  ipfiredist fetchmail
 #  ipfiredist gnump3d
 #  ipfiredist java
+  ipfiredist libogg
+  ipfiredist libvorbis
 #  ipfiredist mailx
 #  ipfiredist mldonkey
+  ipfiredist mp3blaster
   ipfiredist mpg123
 #  ipfiredist nfs
   ipfiredist openldap
@@ -952,7 +958,7 @@ upload)
 	  iso)
 		echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
 		cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH/$SVN_REVISION
+mkdir -p $FTP_ISO_PATH$SVN_REVISION
 ls -lah
 quit
 EOF
@@ -980,7 +986,7 @@ EOF
 		;;
 	  paks)
 		cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH/$SVN_REVISION/paks
+mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks
 ls -lah
 quit
 EOF