[8.09] [packages] merge r15528 (closes: #5852)

[openwrt/svn-archive/archive.git] / ipv6 / 6tunnel / Makefile

diff --git a/ipv6/6tunnel/Makefile b/ipv6/6tunnel/Makefile
index 0ead0c7b713d5c3e76395f08f5c4ad5bedb19296..9dca418e7299b71d62f4e3007bc6dceefb592d8e 100644 (file)
--- a/ipv6/6tunnel/Makefile
+++ b/ipv6/6tunnel/Makefile
@@ -1,50 +1,42 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 4112 2006-07-02 20:33:21Z nico $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6tunnel
-PKG_VERSION:=0.11rc1
-PKG_RELEASE:=1
-PKG_MD5SUM:=b325fa9d238e32195fbb3fc3646b0d28
+PKG_VERSION:=0.11rc2
+PKG_RELEASE:=2.1
+PKG_MD5SUM:=74e02d4f0704b3083a01feda66033449
 
 PKG_SOURCE_URL:=http://toxygen.net/6tunnel/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-0.11
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/6tunnel
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=+libpcap
+  DEPENDS:=+libpcap +kmod-sit
   TITLE:=IPv4 / IPv6 tunnel proxy
-  DESCRIPTION:=IPv4 / IPv6 tunnel proxy
   URL:=http://toxygen.net/6tunnel/
 endef
 
-define Build/Configure
-$(call Build/Configure/Default,,ac_cv_path_STRIP=$(STRIP) ac_cv_func_vsnprintf=yes)
+define Package/6tunnel/description
+IPv4 / IPv6 tunnel proxy
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               default
+       $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME).c
 endef
 
 define Package/6tunnel/install
-       install -m0755 -d $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/6tunnel $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,6tunnel))