[packages] Use default templates instead of custom reimplementations where applicable

[packages.git] / sound / mpd / Makefile

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 9d307f8..43eeb4c 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007-2009 OpenWrt.org
+#
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,19 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
-PKG_VERSION:=0.15.4
+PKG_VERSION:=0.15.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/musicpd
-PKG_MD5SUM:=addbbcbbf8a24a2ce80db1ba5a1f91ca
+PKG_MD5SUM:=
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mpd
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +glib2 +libmms +libcurl
+  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +glib2 \
+       +libmms +libcurl +libsqlite3 +libstdcpp +libvorbis +libshout
   TITLE:=Music Player Daemon
   URL:=http://www.musicpd.org/
 endef
@@ -53,6 +56,8 @@ ifeq ($(CONFIG_PACKAGE_kmod-sound-core),)
        CONFIGURE_ARGS+= --disable-alsa
 endif
 
+TARGET_CFLAGS+=-std=gnu99
+
 CONFIGURE_VARS += \
        CURL_LIBS="-L$(STAGING_DIR)/usr/lib -lssl -lcrypto -lcurl" \
        CURL_CFLAGS="-I$(STAGING_DIR)/usr/include" \
@@ -67,12 +72,6 @@ CONFIGURE_VARS += \
        GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
        GLIB_LIBS="$(TARGET_LDLFAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib -lintl -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -lglib-2.0 -lgthread-2.0 -pthread"
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Package/mpd/install
        $(INSTALL_DIR) $(1)/etc
        $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf