Merge branch 'master' of ssh://openadk.org/git/openadk

resolve conflicts

Conflicts:

	mk/pkg-bottom.mk
	package/ctorrent/Makefile
	package/gcc/Makefile
	package/gmp/Makefile
	package/id3lib/Makefile
	package/libelf/Makefile
	package/libnl/patches/patch-include_netlink-local_h
	package/mpd/Makefile
	package/nmap/Makefile
	package/rrs/Makefile
	package/weechat/Makefile
	scripts/rstrip.sh
	target/Config.in

5 files changed, 43 insertions, 35 deletions

diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index d8118809a..83cc3ad49 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -9,64 +9,85 @@ PKG_NAME:=		mpd
 PKG_VERSION:=		0.14.2
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		64177135f64aca555887ba378de8cdfb
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
+PKG_DESCR:=		A music player for flac, mp3 and ogg
+PKG_SECTION:=		net
+PKG_DEPENDS:=		alsa-lib glib2 libcurl
+PKG_URL:=		http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE}))
+ifneq (${ADK_COMPILE_MPD_WITH_MP3},)
+PKG_DEPENDS+=		libid3tag libmad
+endif
+
+ifneq (${ADK_COMPILE_MPD_WITH_MP4},)
+PKG_DEPENDS+=		libfaad2
+endif
+
+ifeq (${ADK_COMPILE_MPD_WITH_OGG},y)
+PKG_DEPENDS+=		libvorbis libogg
+endif
+
+ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},)
+PKG_DEPENDS+=		libvorbisidec
+endif
+
+ifneq (${ADK_COMPILE_MPD_WITH_FLAC},)
+PKG_DEPENDS+=		libflac
+endif
+
+ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},)
+PKG_DEPENDS+=		libshout liblame
+endif
+
+$(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 XAKE_FLAGS+=		MPD_CFLAGS='-D_GNU_SOURCE'
-PKG_DEPENDS:=		glib2 alsa-lib libcurl
 
 CONFIGURE_ARGS+=	\
-	--enable-alsa \
-	--disable-mod \
-	--disable-oss \
-	--disable-audiofile \
-	--disable-mpc \
+			--enable-alsa \
+			--disable-mod \
+			--disable-oss \
+			--disable-audiofile \
+			--disable-mpc \
 
 ifneq (${ADK_COMPILE_MPD_WITH_MP3},)
-PKG_DEPENDS+=		libid3tag libmad
 CONFIGURE_ARGS+=	--enable-id3 --enable-mp3
 else
 CONFIGURE_ARGS+=	--disable-id3 --disable-mp3
 endif
 
 ifneq (${ADK_COMPILE_MPD_WITH_MP4},)
-PKG_DEPENDS+=		libfaad2
 CONFIGURE_ARGS+=	--enable-aac
 else
 CONFIGURE_ARGS+=	--disable-aac
 endif
 
 ifeq (${ADK_COMPILE_MPD_WITH_OGG},y)
-PKG_DEPENDS+=		libvorbis libogg
 CONFIGURE_ARGS+=	--enable-oggvorbis 
 else
 CONFIGURE_ARGS+=	--disable-oggvorbis 
 endif
 
 ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},)
-PKG_DEPENDS+=		libvorbisidec
 CONFIGURE_ARGS+=	\
-	--disable-oggvorbis \
-	--with-tremor \
-	--with-tremor-includes=${STAGING_DIR}/usr/include \
-	--with-tremor-libraries=${STAGING_DIR}/usr/lib
+			--disable-oggvorbis \
+			--with-tremor \
+			--with-tremor-includes=${STAGING_DIR}/usr/include \
+			--with-tremor-libraries=${STAGING_DIR}/usr/lib
 endif
 
 ifneq (${ADK_COMPILE_MPD_WITH_FLAC},)
-PKG_DEPENDS+=		libflac
 CONFIGURE_ARGS+=	--enable-flac
 else
 CONFIGURE_ARGS+=	--disable-flac
 endif
 
 ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},)
-PKG_DEPENDS+=		libshout liblame
 CONFIGURE_ARGS+=	--enable-shout-ogg \
 			--enable-shout-mp3 \
 			--enable-lame
@@ -76,19 +97,9 @@ CONFIGURE_ARGS+=	--disable-shout-ogg \
 			--disable-lame
 endif
 
-COMMA:=			,
-EMPTY:=
-SPACE:=			${EMPTY} ${EMPTY}
-PKG_DEPENDS:=		${subst ${SPACE},${COMMA}${SPACE},${sort ${PKG_DEPENDS}}}
-
-
 post-install:
-	${INSTALL_DIR} ${IDIR_MPD}/usr/bin
-	${INSTALL_DIR} ${IDIR_MPD}/etc/init.d
+	${INSTALL_DIR} ${IDIR_MPD}/usr/bin ${IDIR_MPD}/etc
 	${INSTALL_BIN} ${WRKINST}/usr/bin/mpd ${IDIR_MPD}/usr/bin
 	${INSTALL_DATA} ./files/mpd.conf ${IDIR_MPD}/etc/mpd.conf
-	${INSTALL_BIN} ./files/mpd.init \
-	    ${IDIR_MPD}/etc/init.d/mpd
-	echo "Depends: ${PKG_DEPENDS}" >> ${IDIR_MPD}/CONTROL/control
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mpd/ipkg/mpd.conffiles b/package/mpd/files/mpd.conffiles
index a8d69760e..a8d69760e 100644
--- a/package/mpd/ipkg/mpd.conffiles
+++ b/package/mpd/files/mpd.conffiles
diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init
index b07a189a1..d71797a0d 100644
--- a/package/mpd/files/mpd.init
+++ b/package/mpd/files/mpd.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG mpd 
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/mpd/ipkg/mpd.postinst b/package/mpd/files/mpd.postinst
index 361adeec0..361adeec0 100644
--- a/package/mpd/ipkg/mpd.postinst
+++ b/package/mpd/files/mpd.postinst
diff --git a/package/mpd/ipkg/mpd.control b/package/mpd/ipkg/mpd.control
deleted file mode 100644
index 946f3d022..000000000
--- a/package/mpd/ipkg/mpd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: mpd
-Priority: optional
-Section: net
-Depends: alsa-lib
-Description: A music player for flac, mp3 and ogg.