change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.

3 files changed, 26 insertions, 58 deletions

diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index c6129d9b2..24a54787c 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vpnc
-PKG_VERSION:=		0.4.0
-PKG_RELEASE:=		2
-PKG_BUILDDEP+=		libgcrypt libgpg-error
-PKG_MD5SUM:=		604807e7dd90fce00a4e2344ee29c76d
+PKG_VERSION:=		0.5.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		4378f9551d5b077e1770bbe09995afb3
 PKG_DESCR:=		client for cisco3000 VPN Concentrator.
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libgcrypt libgpg-error kmod-tun
+PKG_BUILDDEP+=		libgcrypt libgpg-error
 PKG_URL:=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
 PKG_SITES:=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
 
@@ -18,13 +18,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VPNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
 XAKE_FLAGS+=		CC="${TARGET_CC}" \
 			OFLAGS="${TARGET_CFLAGS}" \
 			OS="Linux" \
-			STAGING_DIR=${STAGING_DIR} \
 			PREFIX=/usr
-INSTALL_STYLE:=		auto
 
 post-install:
 	${CP} ${WRKINST}/* ${IDIR_VPNC}/
diff --git a/package/vpnc/patches/patch-Makefile b/package/vpnc/patches/patch-Makefile
index bb3a255a3..563b653c2 100644
--- a/package/vpnc/patches/patch-Makefile
+++ b/package/vpnc/patches/patch-Makefile
@@ -1,51 +1,22 @@
-$Id$
---- vpnc-0.4.0.orig/Makefile	2007-02-19 21:51:12.000000000 +0100
-+++ vpnc-0.4.0/Makefile	2007-04-21 18:39:46.000000000 +0200
-@@ -35,12 +35,11 @@ VERSION := $(shell sh mk-version)
- RELEASE_VERSION := $(shell cat VERSION)
- 
- CC=gcc
--CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
-+CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS)
- CPPFLAGS = -DVERSION=\"$(VERSION)\"
--LDFLAGS = -g $(shell libgcrypt-config --libs)
--CFLAGS +=  $(shell libgcrypt-config --cflags)
-+LDFLAGS = -g -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error
- 
--ifeq ($(shell uname -s), SunOS)
-+ifeq ($(OS), SunOS)
- LDFLAGS += -lnsl -lresolv -lsocket
+--- vpnc-0.5.3.orig/Makefile	2008-11-19 21:36:12.000000000 +0100
++++ vpnc-0.5.3/Makefile	2010-02-06 04:36:54.194334252 +0100
+@@ -66,7 +66,7 @@ ifneq (,$(findstring Apple,$(shell $(CC)
+ CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock
  endif
  
-@@ -84,21 +83,21 @@ distclean : clean
- 	-rm -f vpnc-debug.c vpnc-debug.h vpnc.ps .depend
- 
- install : all
--	install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8
--	install vpnc-script $(DESTDIR)$(ETCDIR)
--	install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
-+	install -d $(DESTDIR)$(ETCDIR)  $(DESTDIR)$(SBINDIR)
-+#	install vpnc-script $(DESTDIR)$(ETCDIR)
-+#	install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
- 	install vpnc vpnc-disconnect $(DESTDIR)$(SBINDIR)
--	install pcf2vpnc $(DESTDIR)$(BINDIR)
--	install vpnc.8 $(DESTDIR)$(MANDIR)/man8
-+#	install pcf2vpnc $(DESTDIR)$(BINDIR)
-+#	install vpnc.8 $(DESTDIR)$(MANDIR)/man8
+-all : $(BINS) vpnc.8 vpnc-script
++all : $(BINS) vpnc-script
  
- install-strip : all
--	install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8
--	install vpnc-script $(DESTDIR)$(ETCDIR)
--	install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
--	install pcf2vpnc $(DESTDIR)$(BINDIR)
-+	install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR)
-+#	install vpnc-script $(DESTDIR)$(ETCDIR)
-+#	install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
-+#	install pcf2vpnc $(DESTDIR)$(BINDIR)
- 	install -s vpnc $(DESTDIR)$(SBINDIR)
- 	install vpnc-disconnect $(DESTDIR)$(SBINDIR)
--	install vpnc.8 $(DESTDIR)$(MANDIR)/man8
-+#	install vpnc.8 $(DESTDIR)$(MANDIR)/man8
+ vpnc : $(OBJS) vpnc.o
+ 	$(CC) -o $@ $^ $(LDFLAGS)
+@@ -122,10 +122,6 @@ install-common: all
+ 	install -m600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
+ 	install -m755 vpnc-disconnect $(DESTDIR)$(SBINDIR)
+ 	install -m755 pcf2vpnc $(DESTDIR)$(BINDIR)
+-	install -m644 vpnc.8 $(DESTDIR)$(MANDIR)/man8
+-	install -m644 pcf2vpnc.1 $(DESTDIR)$(MANDIR)/man1
+-	install -m644 cisco-decrypt.1 $(DESTDIR)$(MANDIR)/man1
+-	install -m644 COPYING $(DESTDIR)$(DOCDIR)
  
- uninstall :
- 	rm -f $(DESTDIR)$(SBINDIR)/vpnc \
+ install : install-common
+ 	install -m755 vpnc $(DESTDIR)$(SBINDIR)
diff --git a/package/vpnc/patches/patch-config_c b/package/vpnc/patches/patch-config_c
index ce5cb30e9..9dfbdee43 100644
--- a/package/vpnc/patches/patch-config_c
+++ b/package/vpnc/patches/patch-config_c
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- vpnc-0.4.0.orig/config.c	2007-02-16 18:22:06.000000000 +0100
-+++ vpnc-0.4.0/config.c	2008-10-16 12:55:57.000000000 +0200
-@@ -485,7 +485,7 @@ static char *get_config_filename(const c
+--- vpnc-0.5.3.orig/config.c	2008-11-19 21:36:12.000000000 +0100
++++ vpnc-0.5.3/config.c	2010-02-06 04:35:05.394334473 +0100
+@@ -456,7 +456,7 @@ static char *get_config_filename(const c
  {
  	char *realname;