MP3Blaster ist geflogen.

MPC dazugekommen.
Die Beschreibung aller Pakete entfernt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@863 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/packages/mp3blaster b/config/rootfiles/packages/mp3blaster
deleted file mode 100644 (file)
index 85fcd68..0000000
--- a/config/rootfiles/packages/mp3blaster
+++ /dev/null
@@ -1,18 +0,0 @@
-usr/bin/mp3blaster
-usr/bin/mp3tag
-usr/bin/nmixer
-usr/bin/splay
-#usr/share/man/man1/mp3blaster.1
-#usr/share/man/man1/nmixer.1
-#usr/share/man/man1/splay.1
-#usr/share/mp3blaster
-#usr/share/mp3blaster/charmap
-#usr/share/mp3blaster/charmap/README
-#usr/share/mp3blaster/charmap/chargen.c
-usr/share/mp3blaster/charmap/koi8-r
-#usr/share/mp3blaster/charmap/makefile.charmap
-#usr/share/mp3blaster/charmap/maketbl.c
-usr/share/mp3blaster/charmap/win1251
-#usr/share/mp3blaster/charmap/win2koi.tbl
-usr/share/mp3blaster/commands.txt
-#usr/share/mp3blaster/sample.mp3blasterrc

diff --git a/config/rootfiles/packages/mpc b/config/rootfiles/packages/mpc
new file mode 100644 (file)
index 0000000..7df3815
--- /dev/null
+++ b/config/rootfiles/packages/mpc
@@ -0,0 +1,10 @@
+usr/bin/mpc
+#usr/share/doc/mpc
+#usr/share/doc/mpc/AUTHORS
+#usr/share/doc/mpc/README
+#usr/share/doc/mpc/m3u-handler.sh
+#usr/share/doc/mpc/mpc-bashrc
+#usr/share/doc/mpc/mppledit
+#usr/share/doc/mpc/pls-handler.sh
+#usr/share/man/man1/mpc.1
+usr/share/mpc

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 7bc5623f7e827d9b9b26d8b4384f2613ff027d6e..99dcddc4cf2413a8629d02ae292c71d11cb32779 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -65,7 +65,6 @@
 * dhcp-3.0.4
 * dhcpcd-2.0.8
 * diffutils-2.8.1
-* dnsmasq-2.33
 * dnsmasq-2.40
 * dosfstools-2.11
 * e2fsprogs-1.39
@@ -172,6 +171,7 @@
 * mldonkey-2.9.0
 * module-init-tools-3.2.2
 * mp3blaster-3.2.3
+* mpc-0.12.1
 * mpd-0.13.0
 * mpfire-ipfire
 * mpg123-0.59r
@@ -205,7 +205,6 @@
 * pkg-config-0.20
 * popt-1.10.4
 * portmap_5beta
-* postfix-2.2.11
 * postfix-2.4.5
 * ppp-2.4.4
 * procps-3.2.6

diff --git a/lfs/Config b/lfs/Config
index b831c54952c8e5b174a7d1077d9b8c42c145e1d5..afa3a17cba078ee8c23735d0e90da8ef0f917135 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -195,8 +195,6 @@ define PAK
                        -e s/VER/$(VER)/g \
                        -e s/RELEASE/$(PAK_VER)/g \
                        -e s/DEPS/$(DEPS)/g \
-                       -e s/DESCDE/$(DESCDE)/g \
-                       -e s/DESCEN/$(DESCEN)/g \
                        -e s/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)-$(PAK_VER).ipfire | awk '{ print $$5 }'`/g \
          < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef

diff --git a/lfs/alsa b/lfs/alsa
index 65ac903e331009ed7ff0a61b810a147df55c8db5..a35ee488f6b13a3dd80a383bc6b1cb35bee3fb9c 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = alsa
 PAK_VER    = 1
 
-DESCDE     = "Alsa ist ein Linux-Sound-Server."
-DESCEN     = "Alsa is a linux sound server."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/amavisd b/lfs/amavisd
index 72caadc0450d3baf602fc861e583ff54a56c85a0..45b5cf176af68abd486a4d8dfad6af333f177446 100644 (file)
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = amavisd
 PAK_VER    = 1
 
-DESCDE     = "Ein Daemon zum scannen von Emails."
-DESCEN     = "A daemon for scanning emails."
 DEPS       = "clamav spamassassin"
 
 ###############################################################################

diff --git a/lfs/applejuice b/lfs/applejuice
index fc69e4fb3a950096d6c4e423c6a051ea79ce254c..18c3321aae02b10abd0f45a737ffe4c06a36b20e 100644 (file)
--- a/lfs/applejuice
+++ b/lfs/applejuice
@@ -35,8 +35,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = applejuice
 PAK_VER    = 1
 
-DESCDE     = "Applejuice ist ein (deutsches) P2P-Netzwerk."
-DESCEN     = "Applejuice is a german p2p-network."
 DEPS       = "java"
 
 ###############################################################################

diff --git a/lfs/asterisk b/lfs/asterisk
index 942eb234110611d77100eed95797e4644b1caf4f..ecf9c31bb168e8ac3b543455d67da55202baf733 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
 PAK_VER    = 1
 
-DESCDE     = "Asterisk ist eine Telefonsoftware für Linux."
-DESCEN     = "Asterisk is a Private Branch Exchange."
 DEPS       = "sox zaptel libpri spandsp libmad"
 
 ###############################################################################

diff --git a/lfs/backup b/lfs/backup
index 736f101be9a3ac7c13c79897434741d5fa11dbea..12e958ed17f31eae70d95c15a37f5f5aee124edb 100644 (file)
--- a/lfs/backup
+++ b/lfs/backup
@@ -32,8 +32,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = backup
 PAK_VER    = 1
 
-DESCDE     = "Im Paket Backup sind alle notwendigen Dateien für das Backup des IPFire enthalten."
-DESCEN     = "Backup contains all the files that are necessary for backing up the IPFire."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/bwm-ng b/lfs/bwm-ng
index e5ad3ff6a4fa077b1a6b2d491beec17311f57072..65f22a3aa3b236466659b174730d990a716deb95 100644 (file)
--- a/lfs/bwm-ng
+++ b/lfs/bwm-ng
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bwm-ng
 PAK_VER    = 1
 
-DESCDE     = "bwm-ng ist ein Bandbreitenmonitor."
-DESCEN     = "bwm-ng shows the bandwidth on all interfaces."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/cftp b/lfs/cftp
index 4fc29eb7dc3e474cd6e1a54c7aa2938bad794470..c2f2cef0f7a8fd44ad07697072cf4149e674a231 100644 (file)
--- a/lfs/cftp
+++ b/lfs/cftp
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cftp
 PAK_VER    = 1
 
-DESCDE     = "Eine grafischer FTP-Client."
-DESCEN     = "A graphical ftp client."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/clamav b/lfs/clamav
index a3e6ac485297479222a81509847d572a104283fd..9eba902592a281815420880535eda5b5b9997dee 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -34,6 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
 PAK_VER    = 1
 
+DEPS       = ""
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################

diff --git a/lfs/core-updates b/lfs/core-updates
index f6e616790bb471ab57e21908c71b87c1a9c0ee77..2eddfaf89e0b77af2ef9fecfe6d8c2c5946bd53a 100644 (file)
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -65,7 +65,5 @@ core/%:
                -e "s/VER/$(VERSION)/g" \
                -e "s/RELEASE/$$(basename $@)/g" \
                -e "s/DEPS/$(DEPS)/g" \
-               -e "s/DESCDE/$(DESCDE)/g" \
-               -e "s/DESCEN/$(DESCEN)/g" \
                -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-$(VERSION)-$$(basename $@).ipfire | awk '{ print $$5 }'`/g" \
                < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-$$(basename $@)

diff --git a/lfs/cups b/lfs/cups
index 8d6c1fa08dbe773cd1d08447d09c912da2ff9cb0..2f21aea21b35f60e6c835a4f23f98275b850fafe 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
 PAK_VER    = 2
 
-DESCDE     = "CUPS ist ein Linux-Druck-System."
-DESCEN     = "The Common Unix Printing System."
 DEPS       = "ghostscript"
 
 ###############################################################################

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 1e9151536780a4af75132772960af1d949a9689b..47d4b9874ab688448ff36181ee5cb98992e87ea7 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -39,6 +39,8 @@ else
        TARGET     = $(DIR_INFO)/$(THISAPP)-ldap
 endif
 
+DEPS       = ""
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -58,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist :
-       $(PAK)
+       @$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum

diff --git a/lfs/cyrusimap b/lfs/cyrusimap
index 24e7392ca1a367b5b019513c97775fe65dff0fe3..a05911fbf088c06f828c9a75cf7eeb506887f092 100644 (file)
--- a/lfs/cyrusimap
+++ b/lfs/cyrusimap
@@ -34,9 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrusimap
 PAK_VER    = 1
 
-DEPS = "cyrus-sasl"
-DESCDE = "Cyrus IMAPd ist ein MDA"
-DESCEN = "Cyrus IMAPd is an MDA"
+DEPS       = "cyrus-sasl"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/ethereal b/lfs/ethereal
index b73de014db93071663c62425e1e9095a0ab857c6..a8bcc82975dea510bf8015d31ddc00db02c455f0 100644 (file)
--- a/lfs/ethereal
+++ b/lfs/ethereal
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ethereal
 PAK_VER    = 1
 
-DESCDE     = "Ethereal ist ein Netzwerksniffer."
-DESCEN     = "Ethereal is a network sniffer."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/fetchmail b/lfs/fetchmail
index 2e6a6c92ed37a8064ab97e93a6dd2e5baf260c21..79cbb30365bc1288b00285d7d14ea91f896df8fa 100644 (file)
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = fetchmail
 PAK_VER    = 1
 
-DESCDE     = "fetchmail kann Emails von entfernten Mailservern abholen."
-DESCEN     = "fetchmail fetches emails from remote servers."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/foomatic b/lfs/foomatic
index 5b5e83a844cdaf2e760e17031222ef486462ebed..ac4ec78bc148ab1dc13fc645229d66c4d1a063b7 100644 (file)
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -35,8 +35,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = foomatic
 PAK_VER    = 1
 
-DESCDE     = "Foomatic beinhaltet Filter und Treiber für CUPS."
-DESCEN     = "Foomatic is a collection of filters and ppds for cups."
 DEPS       = "cups ghostscript"
 
 ###############################################################################

diff --git a/lfs/ghostscript b/lfs/ghostscript
index eb96010520bbfa450f7e9864149cb9b1bf5ef617..f76a1b6908034fcf462dd2fd3bc874cd53816c40 100644 (file)
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ghostscript
 PAK_VER    = 1
 
-DESCDE     = "Eine Adobe-Postscript-Alternative."
-DESCEN     = "An alternative to Adobe-Postscript."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/glib b/lfs/glib
index c9afd0504eafe73b1e4ff95e715c8bd2a612585c..461c9b6d67757381e6e6df9f9e4fc7801998b397 100644 (file)
--- a/lfs/glib
+++ b/lfs/glib
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = glib
 PAK_VER    = 1
 
-DESCDE     = "Glib ist eine grafische Bibliothek."
-DESCEN     = "Glib is a lib for graphic functions."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/gnump3d b/lfs/gnump3d
index 7a591638d1d7cf8040e5c2ffffe948f9392b48cb..8643e14844b8349b987fda1240f95e6ea983b358 100644 (file)
--- a/lfs/gnump3d
+++ b/lfs/gnump3d
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = gnump3d
 PAK_VER    = 1
 
-DESCDE     = "Ein GNU mp3 server."
-DESCEN     = "A GNU mp3 server."
 DEPS       = "lame sox"
 
 ###############################################################################

diff --git a/lfs/guardian b/lfs/guardian
index 5e2b75706a102878bc1bf05c3bc668cbf56e2b85..60745f4b7381de95455eca6832b438e5d1d2adc4 100644 (file)
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -32,8 +32,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = guardian
 PAK_VER    = 1
 
-DESCDE     = "Guardian ist ein Sicherheitstool, welches das Snort IDS Log auswertet und IPs mit Hilfe von iptables blockt."
-DESCEN     = "Guardian is a security tool which will issue commands to the OS to block ip addresses which attacks may be coming from."
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/htop b/lfs/htop
index ba060faf47737e1da7267161f871e083601bf366..3934caeba9deb260c904023a292afd74a00738a1 100644 (file)
--- a/lfs/htop
+++ b/lfs/htop
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = htop
 PAK_VER    = 1
 
-DESCDE     = "Eine Alternative zu top."
-DESCEN     = "An alternative to top."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/icecast b/lfs/icecast
index 8080f0be56706f8c853a8e1161cf6e51c0b1207e..d6bb84833ca26b4604d89984566188b8a089b53d 100644 (file)
--- a/lfs/icecast
+++ b/lfs/icecast
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icecast
 PAK_VER    = 1
 
-DESCDE     = "Ein Musik-Streamer."
-DESCEN     = "A music streamer."
 DEPS       = "libshout lame sox libvorbis libogg"
 
 ###############################################################################

diff --git a/lfs/icegenerator b/lfs/icegenerator
index e67619e5ffbd11f1e9db5e89f7f115be497c50f4..b01ac3ba18b5f6e75d84193ce77c4b5b6d405427 100644 (file)
--- a/lfs/icegenerator
+++ b/lfs/icegenerator
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icegenerator
 PAK_VER    = 1
 
-DESCDE     = "Eine Musik-Bibliothek."
-DESCEN     = "A music library."
 DEPS       = "icecast"
 
 ###############################################################################

diff --git a/lfs/iftop b/lfs/iftop
index 565ab11622382147d51747fcbfcf9ac7ce27d0a3..38d5fcba6d9a3902fa9b1b4b6245a573a4161e63 100644 (file)
--- a/lfs/iftop
+++ b/lfs/iftop
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iftop
 PAK_VER    = 1
 
-DESCDE     = "iftop stellt Interfacestatistiken dar."
-DESCEN     = "iftop shows what's going on with your network interfaces."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 80635f98d674d25cfd50e71c1ab59bee0e6d0525..1de90450f40b03f1296f0a81009c53ded4beff1b 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
 PAK_VER    = 2
 
-DESCDE     = ""
-DESCEN     = ""
 DEPS       = "rtorrent"
 
 ###############################################################################

diff --git a/lfs/java b/lfs/java
index 198f81eacdd9c5f07085c13f1962fb0f75915331..118fa694c5a828df5cb45796670ba1cd38a7a74a 100644 (file)
--- a/lfs/java
+++ b/lfs/java
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = java
 PAK_VER    = 1
 
-DESCDE     = ""
-DESCEN     = ""
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/lame b/lfs/lame
index a8925b055581dd9df4ea75a50bca774a302f7001..6af455b378d282f61ecc0312372e852b8aa72e65 100644 (file)
--- a/lfs/lame
+++ b/lfs/lame
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lame
 PAK_VER    = 1
 
-DESCDE     = "Ein Konsolen-MP3-Codec."
-DESCEN     = "A mp3 codec for console."
 DEPS       = "libmad"
 
 ###############################################################################

diff --git a/lfs/libmad b/lfs/libmad
index 95eb635055b7e123e16b5dc735d1b0f418a7febe..381a8f1ba49ef5805a5850018f5aa586595772e6 100644 (file)
--- a/lfs/libmad
+++ b/lfs/libmad
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libmad
 PAK_VER    = 1
 
-DESCDE     = "Eine Musik-Bibliothek."
-DESCEN     = "A music library."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/libogg b/lfs/libogg
index d8ba630195c1f34818d0de619235a6eb8c08ea0e..ca0129f014f71bb4ce94de49ebfebdd8902d380c 100644 (file)
--- a/lfs/libogg
+++ b/lfs/libogg
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libogg
 PAK_VER    = 1
 
-DESCDE     = "Eine Libary zum Abspielen von ogg-Dateien."
-DESCEN     = "A library for playing ogg-files."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/libpri b/lfs/libpri
index 7a79979174d9faa2b6044ba4e240b02553276e7b..e4e5e7a0af785a5f371a9b3df025ad86acf9e939 100644 (file)
--- a/lfs/libpri
+++ b/lfs/libpri
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libpri
 PAK_VER    = 1
 
-DESCDE     = "Libpri ist eine Hilfsbibliothek für Asterisk."
-DESCEN     = "Libpri is a library used by asterisk PBX."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/libshout b/lfs/libshout
index 1860ad509fb92d55b58264a4c9b568d4b44ac083..14fde733c1134a10a072a7ac14a34f4be9f0fed1 100644 (file)
--- a/lfs/libshout
+++ b/lfs/libshout
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libshout
 PAK_VER    = 1
 
-DESCDE     = "Eine Musik-Bibliothek."
-DESCEN     = "A music library."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/libtiff b/lfs/libtiff
index 5251639eb371bae43bf1d4168c40d9b7207969f5..73e53cbafcbfeb6745389d23e6b49ee860dd9c42 100644 (file)
--- a/lfs/libtiff
+++ b/lfs/libtiff
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libtiff
 PAK_VER    = 1
 
-DESCDE     = "libtiff ist eine Bibliothek für tiff-Bilder."
-DESCEN     = "libtiff is a library for tiff-images."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/libvorbis b/lfs/libvorbis
index 71fb84035d498151b0e0b70e2478f0b7b062741b..19132e0d11838e47bbb72bd52fcd9cd0b238c765 100644 (file)
--- a/lfs/libvorbis
+++ b/lfs/libvorbis
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libvorbis
 PAK_VER    = 1
 
-DESCDE     = "Eine Libary zum Abspielen von vorbis-Dateien."
-DESCEN     = "A library for playing vorbis-files."
 DEPS       = "libogg"
 
 ###############################################################################

diff --git a/lfs/mailx b/lfs/mailx
index 1f87b883ec86a951e4e61623f152e074621aacf7..8e2f468601b210cfbebfc6fba1981c99859f54c9 100644 (file)
--- a/lfs/mailx
+++ b/lfs/mailx
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mailx
 PAK_VER    = 1
 
-DESCDE     = "Tools zum Versenden von Mails."
-DESCEN     = "Tools for sending mails from console."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/mc b/lfs/mc
index eeabdebfba1caf5ba6ba1c608da7332f184ec2a9..d3dfa3ac681b8cab57eac96a6dc0dac88454511b 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
 PAK_VER    = 1
 
-DESCDE     = "Der vielbekannte Midnight Commander."
-DESCEN     = "The well-known Midnight Commander."
 DEPS       = "glib"
 
 ###############################################################################

diff --git a/lfs/mldonkey b/lfs/mldonkey
index f1075835e0c312f1707dc2c4cd4ecd0f14dac12c..93d359d97a8de6142f30f0f34bb35ecb4f7bbc1e 100644 (file)
--- a/lfs/mldonkey
+++ b/lfs/mldonkey
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mldonkey
 PAK_VER    = 1
 
-DESCDE     = "Ein P2P-Client für viele Netze."
-DESCEN     = "A p2p client for multiple networks."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/moblock b/lfs/moblock
index 73e1d47cdf841a71e8cbe6b628cce27147b499e9..99a7782a483dfd369e68185b348a4cda1c141a45 100644 (file)
--- a/lfs/moblock
+++ b/lfs/moblock
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = moblock
 PAK_VER    = 1
 
-DESCDE     = "Moblock blockt dynamisch Angriffe."
-DESCEN     = "Moblock blocks with iptables."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/mp3blaster b/lfs/mpc
similarity index 88%
rename from lfs/mp3blaster
rename to lfs/mpc
index 55a1dbb4771542100a751f87e58a9c35eb124f2f..18f01827b4a2b29341e83e72b16da27f2c2b4daf 100644 (file)
--- a/lfs/mp3blaster
+++ b/lfs/mpc
@@ -24,19 +24,17 @@
 
 include Config
 
-VER        = 3.2.3
+VER        = 0.12.1
 
-THISAPP    = mp3blaster-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = mpc-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = mp3blaster
+PROG       = mpc
 PAK_VER    = 1
 
-DESCDE     = "MP3Blaster ist kleine Software um Musik abzuspielen."
-DESCEN     = "MP3Blaster is piece of software that plays your music on the box."
-DEPS       = "alsa libvorbis"
+DEPS       = "mpd"
 
 ###############################################################################
 # Top-level Rules
@@ -46,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0d892d7c99df175eb0efb2bc31086285
+$(DL_FILE)_MD5 = a93a390315aacfec061c8df89fb5e35f
 
 install : $(TARGET)
 
@@ -78,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/lfs/mpd b/lfs/mpd
index 9af4e65e842b64b558e21691491aa6ce40a59e98..ee516ea7d53d902bd90c81e0dbe36faedde5a71b 100644 (file)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -34,6 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
 PAK_VER    = 1
 
+DEPS       = ""
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################

diff --git a/lfs/mpfire b/lfs/mpfire
index f4b2af76f58185a800bb84f3dfd925406ea4eb0d..f0371c294f849762e917408a8ce93d5a7f46f977 100644 (file)
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -32,9 +32,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpfire
 PAK_VER    = 1
 
-DESCDE     = "MPFire ist ein CGI Multimediaplayer auf Basis von mpg123."
-DESCEN     = "MPFire is a mpg123 based CGI Multimedia-Player."
-DEPS       = "mpg123"
+DEPS       = "mpg123 alsa"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/mpg123 b/lfs/mpg123
index 2ee8c468a6893dedd5e46263b90eeece2aea8fc2..9d89f981f5b619973362d3f224b478a9d5e3a7be 100644 (file)
--- a/lfs/mpg123
+++ b/lfs/mpg123
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpg123
 PAK_VER    = 1
 
-DEPS = "alsa"
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/nano b/lfs/nano
index 05a0d6b37f8d2f8f39cf1058fe4a30f2d1272fbc..29bdf499a77a367804e08aa67b85a6ec9aee544d 100644 (file)
--- a/lfs/nano
+++ b/lfs/nano
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nano
 PAK_VER    = 1
 
-DESCDE     = "nano ist ein bequemer Texteditor für die Konsole."
-DESCEN     = "nano is a text editor for console."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/ncftp b/lfs/ncftp
index 6c72a5ae3fe93969cd48450c14e958a0ec0bf00d..778bb6fbc3935351a373414b1dd10f55e534f147 100644 (file)
--- a/lfs/ncftp
+++ b/lfs/ncftp
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ncftp
 PAK_VER    = 1
 
-DESCDE     = "Ein Konsolen-FTP-Client."
-DESCEN     = "A ftp client for console."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/nmap b/lfs/nmap
index 2acc07b69828c97217376508d3a0e3d9b9b4126a..b8fcfaa5052ce4dd407b1409be5f460fd44019d7 100644 (file)
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nmap
 PAK_VER    = 1
 
-DESCDE     = "nmap ist ein vielseitiger Portscanner."
-DESCEN     = "nmap is a versatile portscanner."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/openldap b/lfs/openldap
index bdeea1a3e02ed8f2709159cfe453d8b94f3b7310..8d4024d8c828e521e92ad2ce3e448698f2a4cf49 100644 (file)
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -34,6 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = openldap
 PAK_VER    = 1
 
+DEPS       = "cyrus-sasl"
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################

diff --git a/lfs/postfix b/lfs/postfix
index 969cfb1315d02c1b9b654d90739c0a895135008a..1638709d2f1f9ca387eef4b7b68595dcdb77eb1e 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -34,6 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
 PAK_VER    = 1
 
+DEPS       = "amavisd"
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################

diff --git a/lfs/rsync b/lfs/rsync
index 6b6d37326e8f6c3076484319b35dc4cacdbdb38d..e8a08f7020f90877d7a472fc7620b31fd430bf80 100644 (file)
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
 PAK_VER    = 1
 
-DESCDE     = "rsync ist ein Mirroring-Tool."
-DESCEN     = "rsync is a tool for mirroring."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/rtorrent b/lfs/rtorrent
index d9f2e1b4c735934e5d57fccc22d3a7a485415fbd..43a518f17c2f6d3f6c00b28913c757bdb6732a9d 100644 (file)
--- a/lfs/rtorrent
+++ b/lfs/rtorrent
@@ -36,8 +36,6 @@ PAK_VER    = 2
 CFLAGS     =
 CXXFLAGS   =
 
-DESCDE     = ""
-DESCEN     = ""
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/samba b/lfs/samba
index 4297af54017dde24a211eba5aeb31c1760895e87..2a338f254f4acc54bd54fd9db11181527a08360e 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
 PAK_VER    = 1
 
-DESCDE     = "Samba ist ein Windows-File- und Printserver."
-DESCEN     = "Samba is a file- and printserver for Windows."
 DEPS       = "cups openldap cyrus-sasl"
 
 ###############################################################################

diff --git a/lfs/sox b/lfs/sox
index a3fc90390c5c8af406f7fd29939b7b10cd81b67a..641eaa7166c54d7f3d34be992d563a3f3a482204 100644 (file)
--- a/lfs/sox
+++ b/lfs/sox
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sox
 PAK_VER    = 1
 
-DESCDE     = "Sox spielt gsm-Dateien ab."
-DESCEN     = "Sox is a player for gsm-files."
 DEPS       = "libvorbis"
 
 ###############################################################################

diff --git a/lfs/spamassassin b/lfs/spamassassin
index 9ad83df408d9e3115215f246f10e73a1a699af44..8d864c1328a625d2846264e39151ccea30ae677e 100644 (file)
--- a/lfs/spamassassin
+++ b/lfs/spamassassin
@@ -34,6 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spamassassin
 PAK_VER    = 1
 
+DEPS       = ""
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################

diff --git a/lfs/spandsp b/lfs/spandsp
index a1c5404ed6ef36c3be0b50c8795b511bec6e8555..fe1fcee9b8bb4677fe83fccb6b0fbd26622c7a41 100644 (file)
--- a/lfs/spandsp
+++ b/lfs/spandsp
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spandsp
 PAK_VER    = 1
 
-DESCDE     = "Ein Plugin zum Faxen mit Asterisk."
-DESCEN     = "A plugin for faxing with asterisk."
 DEPS       = "libtiff"
 
 ###############################################################################

diff --git a/lfs/stund b/lfs/stund
index 6af140a49dc3e4d9bc56be9072869f8f5340184a..8855911541dcf445b148a054dbaea803724d2ed5 100644 (file)
--- a/lfs/stund
+++ b/lfs/stund
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = stund
 PAK_VER    = 1
 
-DESCDE     = "Ein stun-Server."
-DESCEN     = "A stun server."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/tcpdump b/lfs/tcpdump
index f78a1d416c9c15f332b9144014561e7ce904df8c..6b0f9ef20a368235667fd9a97a924b0c49c08457 100644 (file)
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tcpdump
 PAK_VER    = 1
 
-DESCDE     = "tcpdump kann Netzverkehr mitschneiden."
-DESCEN     = "tcpdump dumps networking traffic."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/tftp-hpa b/lfs/tftp-hpa
index 62df0524db0456d8827fe479af72923fbac5ffd4..fbf34d76d46b647dcc424521aadf1adea875cae0 100644 (file)
--- a/lfs/tftp-hpa
+++ b/lfs/tftp-hpa
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tftp-hpa
 PAK_VER    = 1
 
-DESCDE     = "Ein tftp-Server."
-DESCEN     = "A tftp server."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/traceroute b/lfs/traceroute
index cc10e8d51e5abff32966fb7ec296c00b73890bac..0c4b154c8ab509b6cd6ca0bb5b5634b53d7c8e29 100644 (file)
--- a/lfs/traceroute
+++ b/lfs/traceroute
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = traceroute
 PAK_VER    = 1
 
-DESCDE     = "traceroute kann Routen durch das Internet verfolgen und anzeigen."
-DESCEN     = "traceroute traces routes on the internet and displays them."
 DEPS       = ""
 
 ###############################################################################

diff --git a/lfs/tripwire b/lfs/tripwire
index bc35965dbc3e4f711cadc385d80f215a76ff9b00..62034b28c3a74e3ff66674c9237d5c2a90b8ea8e 100644 (file)
--- a/lfs/tripwire
+++ b/lfs/tripwire
@@ -31,10 +31,12 @@ DL_FILE    = $(THISAPP)-src.tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-CFLAGS     =
-CXXFLAGS   = 
 PROG       = tripwire
 PAK_VER    = 1
+CFLAGS     =
+CXXFLAGS   = 
+
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/vsftpd b/lfs/vsftpd
index 00a1ba4564fdcd1b749c1a1a5ddec562527189d9..f5fa083b2fde98478132c0f1075a90a99cbabf80 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -34,6 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vsftpd
 PAK_VER    = 1
 
+DEPS       = ""
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################

diff --git a/lfs/webcyradm b/lfs/webcyradm
index 568e0e7db4f8f7c22375d6915501e9daa49a727c..fa6a2fbdb83231a00ed1f9d443092333439b33e3 100644 (file)
--- a/lfs/webcyradm
+++ b/lfs/webcyradm
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = webcyradm
 PAK_VER    = 1
 
-DESCDE     = "Ein in PHP geschriebenes Frontend für das Verwalten von Emailaccounts."
-DESCEN     = "A frontend for managing email accounts written in PHP."
 DEPS       = "cyrusimap postfix"
 
 ###############################################################################

diff --git a/lfs/zaptel b/lfs/zaptel
index 7d76dc5c9362cb909d47542f9b7174209c7f0c4e..98cee78f8a0f680c46b8907fae6ba422b695ba30 100644 (file)
--- a/lfs/zaptel
+++ b/lfs/zaptel
@@ -38,8 +38,6 @@ endif
 PROG       = zaptel
 PAK_VER    = 1
 
-DESCDE = "Zaptel ist eine Treibersammlung für diverse ISDN-Karten."
-DESCEN = "Zaptel is a collection of modules for isdn hardware."
 DEPS = ""
 
 ###############################################################################

diff --git a/make.sh b/make.sh
index 8540f16cf9fcc321c827aab318cd04c4d3c1fda0..0933e3870f993603a847805447f9dc0fbe328bab 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -494,7 +494,7 @@ buildipfire() {
   ipfiremake icecast
   ipfiremake icegenerator
   ipfiremake mpd
-  ipfiremake mp3blaster
+  ipfiremake mpc
   ipfiremake libpri
   ipfiremake stund
   ipfiremake asterisk

diff --git a/src/pakfire/meta b/src/pakfire/meta
index 8b809b2b7acff62e20c14f1d24871181b9638e21..d97b2a0fa670f9d80bd8cd0228c8530cf403c97c 100644 (file)
--- a/src/pakfire/meta
+++ b/src/pakfire/meta
@@ -3,6 +3,4 @@ ProgVersion: VER
 Release: RELEASE
 Size: SIZE
 Dependencies: DEPS
-Description-de: DESCDE
-Description-en: DESCEN
 File: NAME-VER-RELEASE.ipfire