X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=mcproxy%2FMakefile;h=c155055a0269ff0570d0e65b504808b171d2a77a;hb=3f48ed92d0a46c3c7f4dc6fd754050f865a4a684;hp=f5d6a1d593b5fa228ed26bbbd03d8ead4aab54b9;hpb=ad9d95cca240fa0edd8e033126877ec58ed848d8;p=feed%2Frouting.git

diff --git a/mcproxy/Makefile b/mcproxy/Makefile
index f5d6a1d..c155055 100644
--- a/mcproxy/Makefile
+++ b/mcproxy/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 Alvaro Fernandez Rojas <noltari@gmail.com>
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,63 +8,50 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mcproxy
-PKG_VERSION:=1.1.0
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=b7bd2d0809a0d1f177181c361b9a6c83e193b79a
+PKG_VERSION:=2014-12-31-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/mcproxy/mcproxy.git
+PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
+PKG_LICENSE:=GPL-2.0+
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=df2d117dd67a7948f86d7effc5b9ea8f372466d8
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/mcproxy
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
   TITLE:=Multicast Proxy for IGMP/MLD
-  URL:=http://mcproxy.realmv6.org/
+  URL:=http://mcproxy.realmv6.org
   DEPENDS:=+libpthread +libstdcpp @(!GCC_VERSION_4_4&&!GCC_VERSION_4_6)
 endef
 
 define Package/mcproxy/description
-  mcproxy is a free & open source implementation of the IGMP/MLD proxy
-  function (see RFC4605) for Linux systems. It operates on the kernel
-  tables for multicast routing and allows for multiple instantiations,
-  as well as dynamically changing downstream interfaces.
-
-  The current design was motivated by research and IETF standardization
-  activities in the MULTIMOB group (see RFC6224 and
-  draft-ietf-multimob-pmipv6-source) and shall serve as a test and
-  experimentation tool for the research community.
+ mcproxy is a free & open source implementation of the IGMP/MLD proxy function (see  RFC 4605) for Linux systems.
+ It operates on the kernel tables for multicast routing and allows for multiple instantiations,
+ as well as dynamically changing downstream interfaces.
 endef
 
-define Build/Configure
-	$(CP) ./src/Makefile $(PKG_BUILD_DIR)/mcproxy/
-endef
-
-TARGET_CXXFLAGS += -pipe -std=c++11 -O2 -Wall -W -fPIE
-TARGET_LFLAGS += -Wl,-O1
-TARGET_INCPATH += -I.
-TARGET_LIBS += -lpthread
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/mcproxy \
-		CXX="$(TARGET_CXX)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CXXFLAGS)" \
-		LFLAGS="$(TARGET_LFLAGS)" \
-		INCPATH="$(TARGET_INCPATH)" \
-		LIBS="$(TARGET_LIBS)"
+define Package/mcproxy/conffiles
+/etc/mcproxy.conf
+/etc/config/mcproxy
 endef
 
 define Package/mcproxy/install
-	$(INSTALL_DIR) $(1)/etc $(1)/etc/init.d $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_CONF) ./files/mcproxy.conf $(1)/etc/mcproxy.conf
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/mcproxy.config $(1)/etc/config/mcproxy
+	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/mcproxy.init $(1)/etc/init.d/mcproxy
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mcproxy/mcproxy $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mcproxy-bin $(1)/usr/sbin/mcproxy
 endef
 
 $(eval $(call BuildPackage,mcproxy))