X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=ipv6%2Fmrd6%2FMakefile;h=d71ed345f3fc23d83ff4fd745bb8b4d3eb247df9;hb=25afec7ced2e096c16c01dff3ed0c125bdfe4cf6;hp=b7062e409793c785f75ab857f59837cf0aab3f8f;hpb=00ec9c3ab548661b9cb12f46764d771edcd208bd;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile
index b7062e4097..d71ed345f3 100644
--- a/ipv6/mrd6/Makefile
+++ b/ipv6/mrd6/Makefile
@@ -1,66 +1,75 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mrd6
-PKG_VERSION:=0.9.5
-PKG_RELEASE:=1
-PKG_MD5SUM:=24a08cf1407000d628a272b08a415dda
+PKG_VERSION:=0.9.6
+PKG_RELEASE:=3
 
-PKG_SOURCE_URL:=http://hng.av.it.pt/mrd6/download/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mrd6/
+PKG_MD5SUM:=a59d87857654ff92426062ad5664fcd6
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-PKG_BUILD_DEPENDS:=libnotimpl
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mrd6
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=@LINUX_2_6 +uclibcxx
   TITLE:=IPv6 multicast routing daemon
-  DESCRIPTION:=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.\\\
-  URL:=http://artemis.av.it.pt/mrd6/
+  URL:=http://fivebits.net/proj/mrd6
+  DEPENDS:=+libstdcpp
 endef
 
-define Package/mrd6/conffiles
-/etc/mrd6.conf
+define Package/mrd6/description
+ 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.
+endef
+
+MRD6_MAKEFLAGS:= \
+	$(TARGET_CONFIGURE_OPTS) \
+	OPTIMIZE=yes \
+	SPACE_OPTIMIZE=yes \
+	FULL_STATIC=no \
+	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DNO_INET6_OPTION -fno-builtin -fno-rtti" \
+	LDFLAGS="$(TARGET_LDFLAGS) -ldl -lm" \
+	MODULE_CXX="\$$$$(CC) -shared \$$$$(CXXFLAGS) \$$$$(LDFLAGS)" \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	PREFIX="/usr"
+
+define Build/Compile
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) all
+endef
+
+define Build/Install
+	$(MAKE) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) install
 endef
 
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR)/src \
-		OPTIMIZE=yes \
-		SPACE_OPTIMIZE=yes \
-		FULL_STATIC=yes \
-		CFLAGS="$(TARGET_CFLAGS) -DNO_INET6_OPTION" \
-		CXX="$(TARGET_CROSS)g++" \
-		CC="$(TARGET_CC)" \
-		STAGING_DIR="$(STAGING_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		PREFIX=/usr/ \
-		install
+define Package/mrd6/conffiles
+/etc/mrd6.conf
 endef
 
 define Package/mrd6/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DATA) files/mrd6.conf $(1)/etc
-	$(INSTALL_BIN) files/mrd6.init $(1)/etc/init.d/mrd6
+	$(INSTALL_CONF) ./files/mrd6.conf $(1)/etc
+	$(INSTALL_BIN) ./files/mrd6.init $(1)/etc/init.d/mrd6
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mrd $(1)/usr/sbin/mrd6
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mrd6sh $(1)/usr/bin/mrd6sh
+	$(INSTALL_DIR) $(1)/usr/lib/mrd6
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/mrd6/bgp.so $(1)/usr/lib/mrd6/bgp.so
 endef
 
 $(eval $(call BuildPackage,mrd6))