[packages] batman, bmxd: change urls for the open-mesh.net -> open-mesh.org move

[packages.git] / net / bmxd / Makefile

diff --git a/net/bmxd/Makefile b/net/bmxd/Makefile
index 42545ac..1b145f6 100644 (file)
--- a/net/bmxd/Makefile
+++ b/net/bmxd/Makefile
@@ -1,68 +1,71 @@
 #
 # Copyright (C) 2008 Freifunk Leipzig
+# Copyright (C) 2008-2010 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:=bmxd
-PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/batman-experimental/
+PKG_SOURCE_URL:=http://downloads.open-mesh.org/svn/batman/branches/bmx-0.3.x/
 
-PKG_REV:=1075
+PKG_REV:=1707
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
+PKG_EXTRA_CFLAGS:=-DNODEBUGALL
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bmxd/Default
-  URL:=https://www.open-mesh.net/
+  URL:=https://www.open-mesh.org/
+  MAINTAINER:=Axel Neumann <bmxd@neumann.cgws.de>
 endef
 
 define Package/bmxd
 $(call Package/bmxd/Default)
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpthread +kmod-tun
-  TITLE:=B.A.T.M.A.N. Experimental (BMX) layer 3 routing daemon
+  DEPENDS:=+kmod-tun
+  TITLE:=B.a.t.M.a.n. eXperimental (BMX) layer 3 routing daemon
 endef
 
+define Package/bmxd/conffiles
+/etc/config/bmxd
+endef
+
+
 define Package/bmxd/description
-B.A.T.M.A.N. Experimental (BMX) layer 3 routing daemon
+B.a.t.M.a.n. eXperimental (BMX) layer 3 routing daemon
 endef
 
 MAKE_ARGS += \
-       EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+       EXTRA_CFLAGS="$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)" \
        CCFLAGS="$(TARGET_CFLAGS)" \
        OFLAGS="$(TARGET_CFLAGS)" \
        REVISION="$(PKG_REV)" \
        CC="$(TARGET_CC)" \
        NODEBUG=1 \
        UNAME="Linux" \
-       INSTALL_DIR="$(PKG_INSTALL_DIR)" \
+       INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
        STRIP="/bin/true" \
-       batmand install
-
-define Build/Configure
-       mkdir -p $(PKG_INSTALL_DIR)/bin
-endef
+       bmxd install
 
 define Build/Compile
+       mkdir -p $(PKG_INSTALL_DIR)/usr/sbin
        $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS)
 endef
 
 define Package/bmxd/install
        $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/batmand $(1)/usr/sbin/bmxd
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bmxd $(1)/usr/sbin/bmxd
        $(INSTALL_BIN) ./files/etc/init.d/bmxd $(1)/etc/init.d
        $(INSTALL_DATA) ./files/etc/config/bmxd $(1)/etc/config
 endef