asterisk-chan-sccp-b: update to revision 3004, cleanup Makefile

Patch from Hans Zandbelt.

SVN-Revision: 28647

diff --git a/net/asterisk-chan-sccp-b/Makefile b/net/asterisk-chan-sccp-b/Makefile
index 6f2892fdcc1f66d78ffb7d82212bd94bb8270d6d..c44b8599fcf7929ded08380d4e9cfdffd42b78dd 100644 (file)
--- a/net/asterisk-chan-sccp-b/Makefile
+++ b/net/asterisk-chan-sccp-b/Makefile
@@ -8,21 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk18-chan-sccp-b
-# associated with asterisk version
-PKG_VERSION:=1.8.4.4
-# chan-sccp-b version
-PKG_RELEASE:=V4.0.0
+PKG_REV=3004
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
 
-# SVN
-PKG_REV=2797
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://chan-sccp-b.svn.sourceforge.net/svnroot/chan-sccp-b/trunk
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=svn
 
-PKG_FIXUP:=libtool
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/asterisk18-chan-sccp-b
@@ -31,7 +26,7 @@ define Package/asterisk18-chan-sccp-b
   CATEGORY:=Network
   TITLE:=SCCP channel provider for asterisk
   URL:=http://chan-sccp-b.net.sourceforge.net/
-  MAINTAINER:=Diederik de Groot <ddegroot@users.sourceforge.net>
+  MAINTAINER:=Hans Zandbelt <hans.zandbelt@gmail.com>
   DEPENDS:=+asterisk18
 endef
 
@@ -40,29 +35,25 @@ define Package/asterisk18-chan-sccp-b/description
  by asterisk by default.
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); \
-               $(TARGET_CONFIGURE_OPTS) \
-               ./configure \
-                       --prefix=/usr \
-                        --target=$(GNU_TARGET_NAME) \
-                        --host=$(GNU_TARGET_NAME) \
-                        --build=$(GNU_HOST_NAME) \
-                       --with-asterisk="$(PKG_BUILD_DIR)/../asterisk-${PKG_VERSION}/" \
-       );
-endef
+CONFIGURE_ARGS += \
+       --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS)
-       mkdir -p $(PKG_INSTALL_DIR)/usr/lib/modules/asterisk
-       mkdir -p $(PKG_INSTALL_DIR)/etc/astisk
+       $(MAKE) -C "$(PKG_BUILD_DIR)" \
+               CFLAGS="$(CFLAGS) -DLOW_MEMORY" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
+endef
+
+define Package/asterisk18-chan-sccp-b/conffiles
+/etc/asterisk/sccp.conf
 endef
 
 define Package/asterisk18-chan-sccp-b/install
        $(INSTALL_DIR) $(1)/etc/asterisk
        $(INSTALL_BIN)  ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf
        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-       $(CP) $(PKG_BUILD_DIR)/src/.libs/chan_sccp.so $(1)/usr/lib/asterisk/modules/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/
 endef
 
 $(eval $(call BuildPackage,asterisk18-chan-sccp-b))

diff --git a/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch b/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch
index 464bb584954298b917c39c8052a5f9ae4c3ff68b..81ca9d389228c3e2978f2a99590033ad56e4d7a4 100644 (file)
--- a/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch
+++ b/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch
@@ -1,6 +1,6 @@
 --- a/src/chan_sccp.h
 +++ b/src/chan_sccp.h
-@@ -172,15 +172,7 @@
+@@ -127,15 +127,7 @@ extern "C" {
  #        define CHECK_LEAKS()
  #    endif
  

diff --git a/net/asterisk-chan-sccp-b/patches/300-stdarg.patch b/net/asterisk-chan-sccp-b/patches/300-stdarg.patch
new file mode 100644 (file)
index 0000000..be91ed7
--- /dev/null
+++ b/net/asterisk-chan-sccp-b/patches/300-stdarg.patch
@@ -0,0 +1,10 @@
+--- a/src/chan_sccp.h
++++ b/src/chan_sccp.h
+@@ -32,6 +32,7 @@ extern "C" {
+ #include "common.h"
+ #include <poll.h>
+ #include "asterisk/compiler.h"
++#include <stdarg.h>
+ #include "asterisk/lock.h"
+ #include "asterisk/abstract_jb.h"
+