X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fvtun%2FMakefile;h=730e6f4b869bb044caaec9a467796a5c115b4e8f;hb=fe8c92d99d7234ce8502f5a20db36df8e84d59f4;hp=5668741a6ad8734521b2dbb4ecbd20d8420156c7;hpb=0550a9ac78eaf2c17bd304f198fdf6a6eb3e6e6d;p=packages.git

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 5668741a6..730e6f4b8 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,53 +1,51 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 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:=vtun
-PKG_VERSION:=2.6
+PKG_VERSION:=3.0.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/vtun
-PKG_MD5SUM:=309534fd03c5d13a19c43916f61f4bbf
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_MD5SUM:=d3d8bc4d58886498a1c338670eab9315
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vtun
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-tun +liblzo +libopenssl +zlib
+  DEPENDS:=+kmod-tun +liblzo +libopenssl
   TITLE:=VPN tunneling daemon
   URL:=http://vtun.sourceforge.net
-  SUBMENU:=vpn
+  SUBMENU:=VPN
 endef
 
 define Package/vtun/conffiles
 /etc/vtund.conf
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		, \
-		LIBS="-L$(STAGING_DIR)/usr/lib" \
-		BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
-		LZO_HDR_DIR="$(STAGING_DIR)/usr/include/lzo" \
-		SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
-	)
-endef
+CONFIGURE_ARGS += \
+	--with-lzo-headers="$(STAGING_DIR)/usr/include/lzo" \
+	--with-lzo-lib="$(STAGING_DIR)/usr/lib/" \
+	--with-ssl-headers="$(STAGING_DIR)/usr/include/openssl" \
+
+CONFIGURE_VARS += \
+	LIBS="$(TARGET_LDFLAGS)" \
+	BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
+	LZO_HDR_DIR="$(STAGING_DIR)/usr/include/lzo" \
+	SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
 
-define Build/Compile	
+define Build/Compile
 	$(call Build/Compile/Default,vtund)
 endef
 
-define Package/vtun/install	
+define Package/vtun/install
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/vtund.conf $(1)/etc/
 	$(INSTALL_DIR) $(1)/usr/sbin