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

Conflicts:
	BUGS
	package/autoconf/Makefile

4 files changed, 13 insertions, 44 deletions

diff --git a/package/mrd6/Config.in b/package/mrd6/Config.in
deleted file mode 100644
index 5a5a948d7..000000000
--- a/package/mrd6/Config.in
+++ /dev/null
@@ -1,33 +0,0 @@
-config ADK_PACKAGE_MRD6
-	prompt "mrd6.............................. IPv6 multicast routing daemon"
-	depends on ADK_IPV6
-	tristate
-	default n
-	help
-		Multicast is becoming a major component in next generation 
-		networks, used in several scenarios, from video broadcasting 
-		to multimedia conferencing. In order to be implemented, new 
-		technology needs supporting hardware and software across a set 
-		of devices and systems. MRD6 is an implementation of a modular 
-		IPv6 Multicast Routing Framework for the Linux operating system 
-		and provides MLDv2 (as well as MLDv1), PIM-SM and MBGP support.
-
-		http://artemis.av.it.pt/mrd6/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_MRD6
-default ADK_COMPILE_MRD6_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
-default ADK_COMPILE_MRD6_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_MRD6_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_MRD6_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 6f6ffb363..d495ff10d 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		93ada53bb414b9d622f80a717bc2694b
 PKG_DESCR:=		IPv6 multicast routing daemon
 PKG_SECTION:=		net
+PKG_CXX:=		MRD6
 PKG_DEPENDS:=		kmod-ipv6
 PKG_SITES:=		http://www.openadk.org/distfiles/
 
@@ -16,22 +17,16 @@ WRKBUILD=		${WRKSRC}/src
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
-PKG_DEPENDS:=		uclibc++
-else
-PKG_DEPENDS:=		libstdcxx
-endif
-
 $(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
-TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
+TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs \
+			-I${STAGING_DIR}/usr/include/uClibc++
 TLDFLAGS+=		-nodefaultlibs -luClibc++ -shared
 endif
-
 XAKE_FLAGS+=		EXTRA_FLAGS="${TCFLAGS}" 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MRD6}/usr/sbin ${IDIR_MRD6}/etc
diff --git a/package/mrd6/files/mrd6.init b/package/mrd6/files/mrd6.init
index 710cde814..da6b5eea3 100644
--- a/package/mrd6/files/mrd6.init
+++ b/package/mrd6/files/mrd6.init
@@ -14,7 +14,7 @@ start)
 	/usr/sbin/mrd6 -f /etc/mrd6.conf -D
 	;;
 stop)
-	killall mrd6
+	pkill mrd6
 	;;
 restart)
 	sh $0 stop
diff --git a/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl b/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl
new file mode 100644
index 000000000..c56cae4e9
--- /dev/null
+++ b/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl
@@ -0,0 +1,7 @@
+--- mrd6-0.9.6.orig/src/scripts/generate-modules-cpp.pl	2007-03-22 03:37:07.000000000 +0100
++++ mrd6-0.9.6/src/scripts/generate-modules-cpp.pl	2010-02-13 16:04:53.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ use strict;