From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/moc/Makefile                |  8 +++-----
 package/moc/patches/patch-configure | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 package/moc/patches/patch-configure

(limited to 'package/moc')

diff --git a/package/moc/Makefile b/package/moc/Makefile
index 18a255ae1..97b5e8707 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -6,27 +6,25 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		moc
 PKG_VERSION:=		2.4.4
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libvorbis curl libmad flac ffmpeg
 PKG_MD5SUM:=		647c770a5542a4ae5437386807a89796
 PKG_DESCR:=		console music player
 PKG_SECTION:=		sound
-PKG_DEPENDS:=		libmad libvorbis libcurl libflac ffmpeg
+PKG_DEPENDS:=		libmad libvorbis libcurl libflac ffmpeg libiconv libid3tag
+PKG_BUILDDEP+=		libvorbis curl libmad flac ffmpeg libiconv libid3tag
 PKG_URL:=		http://moc.daper.net
 PKG_SITES:=		ftp://ftp.daper.net/pub/soft/moc/stable/
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MOC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-jack \
 			--without-oss \
 			--without-musepack \
 			--without-speex \
 			--without-sndfile
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MOC}/usr/bin
diff --git a/package/moc/patches/patch-configure b/package/moc/patches/patch-configure
new file mode 100644
index 000000000..0968574d6
--- /dev/null
+++ b/package/moc/patches/patch-configure
@@ -0,0 +1,20 @@
+--- moc-2.4.4.orig/configure	2009-01-04 09:28:51.000000000 +0100
++++ moc-2.4.4/configure	2010-02-06 01:22:38.464334671 +0100
+@@ -13910,7 +13910,7 @@ DECODER_PLUGIN_DIR=decoder_plugins
+ PLUGIN_LDFLAGS='-module -avoid-version'
+ 
+ 
+-OS=`uname 2>/dev/null`
++OS=Linux
+ 
+ case "$OS" in
+ 	Linux)
+@@ -13929,7 +13929,7 @@ _ACEOF
+ 		;;
+ esac
+ 
+-LDFLAGS="$LDFLAGS -export-dynamic"
++LDFLAGS="$LDFLAGS"
+ 
+ { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-- 
cgit v1.2.3