[package] ruby: fix path to libiconv

[openwrt/svn-archive/archive.git] / ipv6 / mrd6 / Makefile

diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile
index 4d2459dd2661903fd2a5506476dac0b085fb33c4..c20d6c490f1ee878c3b09c334dae01cfb4167a1f 100644 (file)
--- a/ipv6/mrd6/Makefile
+++ b/ipv6/mrd6/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006,2007 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,16 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mrd6
-PKG_VERSION:=0.9.5
-PKG_REVISION:=3
-PKG_RELEASE:=$(PKG_REVISION).1
+PKG_VERSION:=0.9.6
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REVISION).tar.gz
-PKG_SOURCE_URL:=http://fivebits.net/files/mrd6/ \
-       http://hng.av.it.pt/mrd6/download/
-PKG_MD5SUM:=361322198dafcc5ffab5e8e23197012b
+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_DEPENDS:=libnotimpl
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,8 +24,7 @@ define Package/mrd6
   SECTION:=ipv6
   CATEGORY:=IPv6
   TITLE:=IPv6 multicast routing daemon
-  URL:=http://artemis.av.it.pt/mrd6/
-  DEPENDS:= +uclibcxx
+  URL:=http://fivebits.net/proj/mrd6
 endef
 
 define Package/mrd6/description
@@ -38,18 +36,23 @@ define Package/mrd6/description
  and provides MLDv2 (as well as MLDv1), PIM-SM and MBGP support.
 endef
 
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR)/src \
-               $(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) -nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -ldl -lgcc -lm -lnotimpl" \
-               MODULE_CXX="\$$$$(CC) -shared \$$$$(CXXFLAGS) \$$$$(LDFLAGS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               PREFIX="/usr" \
-               install
+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 Package/mrd6/conffiles
@@ -58,8 +61,8 @@ 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