3 files changed, 50 insertions, 10 deletions
diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index a621af7b8..edce0ecaa 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -4,25 +4,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		6tunnel
-PKG_VERSION:=		0.11rc1
+PKG_VERSION:=		0.11rc2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b325fa9d238e32195fbb3fc3646b0d28
+PKG_MD5SUM:=		74e02d4f0704b3083a01feda66033449
 PKG_DESCR:=		IPv4/IPv6 tunnel proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		kmod-ipv6
+PKG_URL:=		http://toxygen.net/6tunnel/
 PKG_SITES:=		http://toxygen.net/6tunnel/
 
-WRKDIST=		${WRKDIR}/$(PKG_NAME)-0.11
-
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,6TUNNEL,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_path_STRIP=$(STRIP) \
-			ac_cv_func_vsnprintf=yes
-ALL_TARGET=		default
-BUILD_STYLE=		auto
+AUTOTOOL_STYLE:=	autoconf
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_6TUNNEL)/usr/sbin
diff --git a/package/6tunnel/patches/patch-Makefile_in b/package/6tunnel/patches/patch-Makefile_in
new file mode 100644
index 000000000..0a26cdeef
--- /dev/null
+++ b/package/6tunnel/patches/patch-Makefile_in
@@ -0,0 +1,27 @@
+--- 6tunnel-0.11rc2.orig/Makefile.in	2002-11-24 02:18:47.000000000 +0100
++++ 6tunnel-0.11rc2/Makefile.in	2010-02-05 14:22:35.462572327 +0100
+@@ -10,19 +10,18 @@ INSTALL = @INSTALL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-default:	6tunnel
++all:	6tunnel
+ 
+ 6tunnel:	6tunnel.c
+ 
+ .PHONY:	install
+ 
+ install:
+-	$(STRIP) 6tunnel
+-	$(INSTALL) -d $(bindir)
+-	$(INSTALL) 6tunnel $(bindir)
++	$(INSTALL) -d $(DESTDIR)$(bindir)
++	$(INSTALL) 6tunnel $(DESTDIR)$(bindir)
+ 
+-	$(INSTALL) -d $(mandir)/man1
+-	$(INSTALL) 6tunnel.1 $(mandir)/man1
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
++	$(INSTALL) 6tunnel.1 $(DESTDIR)$(mandir)/man1
+ 
+ .PHONY:	clean
+ 
diff --git a/package/6tunnel/patches/patch-Makefile_in.orig b/package/6tunnel/patches/patch-Makefile_in.orig
new file mode 100644
index 000000000..d5663cc00
--- /dev/null
+++ b/package/6tunnel/patches/patch-Makefile_in.orig
@@ -0,0 +1,18 @@
+--- 6tunnel-0.11rc2.orig/Makefile.in	2002-11-24 02:18:47.000000000 +0100
++++ 6tunnel-0.11rc2/Makefile.in	2010-02-05 14:21:39.992115665 +0100
+@@ -10,14 +10,13 @@ INSTALL = @INSTALL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-default:	6tunnel
++all:	6tunnel
+ 
+ 6tunnel:	6tunnel.c
+ 
+ .PHONY:	install
+ 
+ install:
+-	$(STRIP) 6tunnel
+ 	$(INSTALL) -d $(bindir)
+ 	$(INSTALL) 6tunnel $(bindir)
+