[Packages] bmon:

 * Fix compilation
 * Cleanup Makefile
 * Refresh patch

SVN-Revision: 9585

diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index b4cb327cdc62ecc04af414c4a857efd4f0f8862f..419ceee11286e31da9595905ba168573396084dc 100644 (file)
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -10,14 +10,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bmon
 PKG_VERSION:=2.1.0
 
 PKG_NAME:=bmon
 PKG_VERSION:=2.1.0

-PKG_RELEASE:=0
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://people.suug.ch/~tgr/bmon/files/
 PKG_MD5SUM:=3111a027907016c0902d67350c619df6
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://people.suug.ch/~tgr/bmon/files/
 PKG_MD5SUM:=3111a027907016c0902d67350c619df6
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-

 include $(INCLUDE_DIR)/package.mk
 
 define Package/bmon
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bmon


@@ -35,18 +33,14 @@ define Package/bmon/description
        input methods for different architectures.
 endef
 
        input methods for different architectures.
 endef
 

-define Build/Configure
-       $(call Build/Configure/Default, \
-               --disable-cnt-workaround \
-               --disable-dbi \
-               --disable-rrd \
-               --disable-asound \
-       )
-endef
+CONFIGURE_ARGS += \
+       --disable-cnt-workaround \
+       --disable-dbi \
+       --disable-rrd \
+       --disable-asound \

 
 

-define Build/Compile
-       $(call Build/Compile/Default,all)
-endef
+CONFIGURE_VARS += \
+       ac_cv_lib_nl_nl_connect=no \

 
 define Package/bmon/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/bmon/install
        $(INSTALL_DIR) $(1)/usr/sbin

diff --git a/net/bmon/patches/001-bugfixes.patch b/net/bmon/patches/001-bugfixes.patch
index 3657058f123b32b94f8c2690b8075ab89b25421c..fcb9306587493841c1618260ec476e9d0d0bae0e 100644 (file)
--- a/net/bmon/patches/001-bugfixes.patch
+++ b/net/bmon/patches/001-bugfixes.patch
@@ -1,6 +1,7 @@
-diff -ruN bmon-2.1.0-old/src/out_audio.c bmon-2.1.0-new/src/out_audio.c
---- bmon-2.1.0-old/src/out_audio.c     2005-04-05 17:01:33.000000000 +0200
-+++ bmon-2.1.0-new/src/out_audio.c     2006-10-09 23:11:44.000000000 +0200
+Index: bmon-2.1.0/src/out_audio.c
+===================================================================
+--- bmon-2.1.0.orig/src/out_audio.c    2007-11-20 17:25:54.000000000 +0100
++++ bmon-2.1.0/src/out_audio.c 2007-11-20 17:25:54.000000000 +0100

 @@ -141,7 +141,7 @@
        .om_draw = audio_draw,
        .om_set_opts = audio_set_opts,
 @@ -141,7 +141,7 @@
        .om_draw = audio_draw,
        .om_set_opts = audio_set_opts,


@@ -10,9 +11,10 @@ diff -ruN bmon-2.1.0-old/src/out_audio.c bmon-2.1.0-new/src/out_audio.c
  };
  
  static void __init audio_init(void)
  };
  
  static void __init audio_init(void)

-diff -ruN bmon-2.1.0-old/src/out_xml_event.c bmon-2.1.0-new/src/out_xml_event.c
---- bmon-2.1.0-old/src/out_xml_event.c 2005-04-05 17:01:33.000000000 +0200
-+++ bmon-2.1.0-new/src/out_xml_event.c 2006-10-09 23:11:59.000000000 +0200
+Index: bmon-2.1.0/src/out_xml_event.c
+===================================================================
+--- bmon-2.1.0.orig/src/out_xml_event.c        2007-11-20 17:25:54.000000000 +0100
++++ bmon-2.1.0/src/out_xml_event.c     2007-11-20 17:25:54.000000000 +0100

 @@ -127,7 +127,7 @@
        .om_draw = xml_event_draw,
        .om_set_opts = xml_event_set_opts,
 @@ -127,7 +127,7 @@
        .om_draw = xml_event_draw,
        .om_set_opts = xml_event_set_opts,