6 files changed, 41 insertions, 12 deletions
diff --git a/package/frickin/Config.in b/package/frickin/Config.in
deleted file mode 100644
index 599703234..000000000
--- a/package/frickin/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_FRICKIN
-	prompt "frickin........................... PPTP (Point-to-Point Tunneling Protocol) proxy"
-	tristate
-	default n
-	help
-	  Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP)
-	  client to connect to a PPTP server through Network Address
-	  Translation (NAT).
-
-	  http://frickin.sourceforge.net/
diff --git a/package/frickin/Makefile b/package/frickin/Makefile
index e43d5d0eb..0c16037a8 100644
--- a/package/frickin/Makefile
+++ b/package/frickin/Makefile
@@ -15,7 +15,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FRICKIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_FRICKIN}/usr/sbin
diff --git a/package/frickin/files/frickin.init b/package/frickin/files/frickin.init
index 4e63232c0..baf5d9c18 100644
--- a/package/frickin/files/frickin.init
+++ b/package/frickin/files/frickin.init
@@ -13,7 +13,7 @@ start)
 	frickin ${frickin_flags}
 	;;
 stop)
-	killall frickin
+	pkill frickin
 	;;
 restart)
 	sh $0 stop
diff --git a/package/frickin/patches/patch-Makefile b/package/frickin/patches/patch-Makefile
new file mode 100644
index 000000000..eb8052f4f
--- /dev/null
+++ b/package/frickin/patches/patch-Makefile
@@ -0,0 +1,9 @@
+--- frickin-1.3.orig/Makefile	2004-10-13 18:24:56.000000000 +0200
++++ frickin-1.3/Makefile	2010-02-05 19:12:36.101852925 +0100
+@@ -1,5 +1,5 @@
+ #CFLAGS = -g -Wall
+-CFLAGS = -O3 -Wall
++CFLAGS ?= -O3 -Wall
+ 
+ all: frickin
+ 
diff --git a/package/frickin/patches/patch-src_Makefile b/package/frickin/patches/patch-src_Makefile
new file mode 100644
index 000000000..97e0adf86
--- /dev/null
+++ b/package/frickin/patches/patch-src_Makefile
@@ -0,0 +1,9 @@
+--- frickin-1.3.orig/src/Makefile	2004-10-13 18:24:56.000000000 +0200
++++ frickin-1.3/src/Makefile	2010-02-05 19:13:44.344334596 +0100
+@@ -1,5 +1,5 @@
+ #CFLAGS = -g3 -Wall
+-CFLAGS = -O3 -Wall
++CFLAGS ?= -O3 -Wall
+ 
+ all: frickin
+ 
diff --git a/package/frickin/patches/patch-src_main_c b/package/frickin/patches/patch-src_main_c
new file mode 100644
index 000000000..8a893d3c0
--- /dev/null
+++ b/package/frickin/patches/patch-src_main_c
@@ -0,0 +1,20 @@
+--- frickin-1.3.orig/src/main.c	2005-05-31 16:51:36.000000000 +0200
++++ frickin-1.3/src/main.c	2010-02-05 19:12:23.654334206 +0100
+@@ -259,7 +259,7 @@ int _connect_to_server()
+ 	{
+ 		SIN sin;
+ 
+-		bzero(&sin, sizeof(SIN));
++		memset(&sin, 0, sizeof(SIN));
+ 		sin.sin_family = AF_INET;
+ 		sin.sin_port = htons(PPTP_PORT);
+ 		sin.sin_addr.s_addr = inet_addr(g_target_ip);
+@@ -713,7 +713,7 @@ int main(int argc, char **argv)
+ 	{
+ 		SIN sin;
+ 
+-		bzero(&sin, sizeof(SIN));
++		memset(&sin, 0, sizeof(SIN));
+ 		sin.sin_family = AF_INET;
+ 		sin.sin_port = htons(PPTP_PORT);
+ 		sin.sin_addr.s_addr = inet_addr(g_listen_ip);