From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 4 Aug 2006 23:08:20 +0000 (+0000)
Subject: move mpd to sound/
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=8fe23b3c30c26367d781cdfc0e6861aa77b5ac06;p=packages.git

move mpd to sound/

git-svn-id: svn://svn.openwrt.org/openwrt/packages@4461 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
new file mode 100644
index 000000000..6ca73c553
--- /dev/null
+++ b/sound/mpd/Makefile
@@ -0,0 +1,105 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mpd
+PKG_VERSION:=0.12.0
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://users.tpg.com.au/davico/openwrt/
+PKG_MD5SUM:=65e62cc813f2186dff0f96f164a853f8
+PKG_CAT:=zcat
+
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mpd
+  SECTION:=sound
+  CATEGORY:=Sound
+  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec
+  TITLE:=Music Player Daemon
+  DESCRIPTION:=Music Player Daemon.\\\
+    MPD is a music player supporting flac, mp3 and ogg files.\\\
+    It is typically controlled over a network using one of it's many \\\
+    clients including mpc(console), gmpc(gnome), phpmp(php) etc.
+  URL:=http://www.musicpd.org/
+endef
+
+define Package/mpd/conffiles
+/etc/mpd.conf
+endef
+
+PKG_CONFIGURE_OPTIONS := \
+	--disable-alsa \
+	--disable-shout \
+	--disable-mod \
+	--disable-audiofile \
+	--disable-iconv \
+	--disable-mpc \
+	--disable-aac \
+	--with-id3tag-includes="$(STAGING_DIR)/usr/include" \
+	--with-id3tag-libraries="$(STAGING_DIR)/usr/lib" \
+	--with-libFLAC-includes="$(STAGING_DIR)/usr/include" \
+	--with-libFLAC-libraries="$(STAGING_DIR)/usr/lib" \
+	--with-mad-includes="$(STAGING_DIR)/usr/include" \
+	--with-mad-libraries="$(STAGING_DIR)/usr/lib" \
+	--with-tremor \
+	--with-tremor-includes="$(STAGING_DIR)/usr/include" \
+	--with-tremor-libraries="$(STAGING_DIR)/usr/lib" \
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		./configure \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			$(DISABLE_LARGEFILE) \
+			$(DISABLE_NLS) \
+			$(PKG_CONFIGURE_OPTIONS) \
+	);
+endef
+
+define Build/Compile
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+endef
+
+define Package/mpd/install
+	install -d -m0755 $(1)/etc
+	$(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf
+	install -d -m0755 $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,mpd))
diff --git a/utils/mpd/Makefile b/utils/mpd/Makefile
deleted file mode 100644
index a45836773..000000000
--- a/utils/mpd/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mpd
-PKG_VERSION:=0.12.0
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://users.tpg.com.au/davico/openwrt/
-PKG_MD5SUM:=65e62cc813f2186dff0f96f164a853f8
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mpd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec
-  TITLE:=Music Player Daemon
-  DESCRIPTION:=Music Player Daemon.\\\
-    MPD is a music player supporting flac, mp3 and ogg files.\\\
-    It is typically controlled over a network using one of it's many \\\
-    clients including mpc(console), gmpc(gnome), phpmp(php) etc.
-  URL:=http://www.musicpd.org/
-endef
-
-define Package/mpd/conffiles
-/etc/mpd.conf
-endef
-
-PKG_CONFIGURE_OPTIONS := \
-	--disable-alsa \
-	--disable-shout \
-	--disable-mod \
-	--disable-audiofile \
-	--disable-iconv \
-	--disable-mpc \
-	--disable-aac \
-	--with-id3tag-includes="$(STAGING_DIR)/usr/include" \
-	--with-id3tag-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-libFLAC-includes="$(STAGING_DIR)/usr/include" \
-	--with-libFLAC-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-mad-includes="$(STAGING_DIR)/usr/include" \
-	--with-mad-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-tremor \
-	--with-tremor-includes="$(STAGING_DIR)/usr/include" \
-	--with-tremor-libraries="$(STAGING_DIR)/usr/lib" \
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			$(PKG_CONFIGURE_OPTIONS) \
-	);
-endef
-
-define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Package/mpd/install
-	install -d -m0755 $(1)/etc
-	$(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf
-	install -d -m0755 $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,mpd))