add a mirror for bind and update to latest upstream version

[openwrt/svn-archive/archive.git] / sound / mpd / Makefile

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 6ca73c553ee6a5d3d22cbb3f654b69c31f70dbd6..6dee11874c16ecfefa56bc6147c156f256bc1c04 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -12,12 +12,12 @@ 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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,10 +27,10 @@ define Package/mpd
   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.
+  DESCRIPTION:=\
+       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
 
@@ -38,67 +38,37 @@ 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) \
-       );
+       $(call Build/Configure/Default, \
+               --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" \
+       )
 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
+       $(INSTALL_DIR) $(1)/etc
        $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf
-       install -d -m0755 $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(1)/usr/bin/
 endef