Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	package/digitemp/Makefile

60 files changed, 8448 insertions, 351 deletions

diff --git a/TODO b/TODO
index ab41d6e3b..dbed99035 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
 - netbsd build
 - macos x build
 - implement rpm package backend 
+- implement update for MTD devices (foxboard,rb532,ag241)
 - network scripts for wireless client and acess point
 - customise mconf help texts to better fit for OpenADK
diff --git a/mk/build.mk b/mk/build.mk
index ee3867a16..bd5dc9e5c 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -405,10 +405,10 @@ bulk:
 		echo === building $$target $$libc $$fs on $$(date); \
 		$(GMAKE) prereq && \
 		if [ "x$$p" = xy ];then \
-			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \
+			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \
 				allmodconfig; \
 		else \
-			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \
+			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \
 				defconfig; \
 		fi && \
 		$(GMAKE) VERBOSE=1 -f mk/build.mk allcopy \
diff --git a/mk/image.mk b/mk/image.mk
index c6f5ce266..a2a6bb176 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -71,9 +71,6 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR}
 	cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \
 		${BUILD_DIR}/root.squashfs > \
 		${BUILD_DIR}/${ROOTFSSQUASHFS}
-	# padding of images is required, foxboard only?
-	#dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \
-		bs=4063232 conv=sync $(MAKE_TRACE)
 
 imageclean:
 	rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-*
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 970120270..79cb7f9cc 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -53,8 +53,12 @@ compile: $(LINUX_DIR)/vmlinux
 install: compile
 ifneq ($(strip $(INSTALL_TARGETS)),)
 	$(TRACE) target/${ADK_TARGET}-modules-install
+ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
+	$(PKG_INSTALL) $(INSTALL_TARGETS) $(MAKE_TRACE)
+else
 	$(foreach pkg,$(INSTALL_TARGETS),$(shell $(PKG_INSTALL) $(pkg)))
 endif
+endif
 
 clean:
 	rm -rf $(LINUX_BUILD_DIR)
diff --git a/mk/modules.mk b/mk/modules.mk
index 948a68364..734fd4435 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -568,6 +568,7 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\
 
 $(eval $(call KMOD_template,SCSI,scsi,\
     $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \
+    $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \
 ,20))
 
 $(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\
@@ -979,6 +980,10 @@ $(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mousedev,\
 	$(MODULES_DIR)/kernel/drivers/input/mousedev \
 ,45))
 
+$(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\
+	$(MODULES_DIR)/kernel/drivers/input/evdev \
+,45))
+
 #
 # USB
 #
diff --git a/package/Config.in b/package/Config.in
index 80e1a84bb..63ae10491 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -79,6 +79,7 @@ endmenu
 menu "Misc"
 source "package/collectd/Config.in"
 source "package/deco/Config.in"
+source "package/dialog/Config.in"
 source "package/digitemp/Config.in"
 source "package/gpm/Config.in"
 source "package/gpsd/Config.in"
@@ -543,6 +544,7 @@ source "package/xf86-video-cirrus/Config.in"
 source "package/xf86-video-geode/Config.in"
 source "package/xf86-input-mouse/Config.in"
 source "package/xf86-input-keyboard/Config.in"
+source "package/xf86-input-evtouch/Config.in"
 
 menu "X Libraries"
 source "package/libICE/Config.in"
diff --git a/package/base-files/extra/sbin/update b/package/base-files/extra/sbin/update
index 0cd4ee713..c51962f5b 100755
--- a/package/base-files/extra/sbin/update
+++ b/package/base-files/extra/sbin/update
@@ -6,6 +6,11 @@ if [ $who -ne 0 ]; then
   exit 1
 fi
 
+if [ -x /sbin/mtd ];then
+	updatecmd="mtd -r write - linux"
+else
+	updatecmd="gunzip -c | tar -xf -"
+fi
 
 check_exit() {
 	if [ $? -ne 0 ];then
@@ -22,19 +27,19 @@ prepare() {
 
 extract_from_file() {
 	prepare
-        cat $1 | gunzip -c | tar -xf -
+        cat $1 | $updatecmd
 	check_exit
 }
 
 extract_from_ssh() {
 	prepare
-        ssh $1 "cat $2" | gunzip -c | tar -xf -
+        ssh $1 "cat $2" | $updatecmd
 	check_exit
 }
 
 extract_from_http() {
 	prepare
-        wget -O - $1 | gunzip -c | tar -xf -
+        wget -O - $1 | $updatecmd
 	check_exit
 }
                 
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index e99c7e244..dd5784512 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		5
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
-PKG_TARGET_DEPENDS:=	alix1c alix2d wrap foxboard ag241 rb532
+PKG_TARGET_DEPENDS:=	alix1c alix2d alix2d13 wrap foxboard ag241 rb532
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
diff --git a/package/dialog/Makefile b/package/dialog/Makefile
new file mode 100644
index 000000000..2763a0946
--- /dev/null
+++ b/package/dialog/Makefile
@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		dialog
+PKG_VERSION:=		1.1-20080819
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3caebd641a9f337b980becb4444336c5
+PKG_DESCR:=		A text gui interface
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP+=		ncurses
+PKG_SITES:=		ftp://ftp.us.debian.org/debian/pool/main/d/dialog/
+
+DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DIALOG,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+MAKE_FILE:=		makefile
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_DIALOG)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/dialog $(IDIR_DIALOG)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index fab6e8d79..a291c127c 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		digitemp
 PKG_VERSION:=		3.6.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libusb libusb-compat
 PKG_MD5SUM:=		9be2e48db37920f21925ae6e88f83b84
-PKG_DESCR:=		simple program for reading values from 1-wire devices
+PKG_DESCR:=		program for reading values from 1-wire devices
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libusb
+PKG_BUILDDEP+=		libusb libusb-compat
 PKG_URL:=		http://www.digitemp.com/software/linux
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
@@ -20,7 +20,7 @@ $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 
 TCFLAGS+=		-I./src -I./userial
 ALL_TARGET=		ds2490
-BUILD_STYLE=		auto
+BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_DIGITEMP}/usr/sbin
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 96ec1ce99..436bd3a13 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		e2fsprogs
 PKG_VERSION:=		1.41.9
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		52f60a9e19a02f142f5546f1b5681927
 PKG_DESCR:=		Ext2/3/4 filesystem utilities
 PKG_SECTION:=		admin
+PKG_DEPENDS:=		libcom-err libuuid libblkid libpthread
 PKG_URL:=		http://e2fsprogs.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 
@@ -24,10 +25,10 @@ PKG_SECTION_SS:=	libs
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UUID},${PKG_SECTION_UUID}))
-$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR}))
-$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SS},${PKG_SECTION_SS}))
-$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_BLKID},${PKG_SECTION_BLKID}))
+$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_UUID},${PKG_SECTION_UUID}))
+$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR}))
+$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_SS},${PKG_SECTION_SS}))
+$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-elf-shlibs \
diff --git a/package/git/Makefile b/package/git/Makefile
index da9896e51..2a6951c1c 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.6.5.5
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		50fb736021ef89916af622cb4772bbea
+PKG_VERSION:=		1.6.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		08af805fd59f68d9ad00a2f878cf820e
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libopenssl libcurl libexpat
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index 90a61257a..cfa09f93e 100644
--- a/package/igmpproxy/Makefile
+++ b/package/igmpproxy/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		net
 PKG_URL:=		http://sourceforge.net/projects/igmpproxy/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=igmpproxy/}
 
+CFLINE_IGMPPROXY=	select ADK_KERNEL_IP_MULTICAST\n\tselect ADK_KERNEL_IP_MROUTE
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index d779ab1db..4f7e7e660 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libICE
 PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		xtrans
 PKG_MD5SUM:=		4a8f09f15fc92196b91d61e2dc9afcea
 PKG_DESCR:=		Inter-Client Exchange library
 PKG_SECTION:=		x11
+PKG_BUILDDEP+=		xtrans xproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 3724575b5..e40b02d39 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		bf134b9f79a7fc6507577bf5b6d4f412
 PKG_DESCR:=		X font Library
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		libfreetype
-PKG_BUILDDEP+=		freetype fontcacheproto fontsproto libfontenc
+PKG_BUILDDEP+=		freetype fontcacheproto fontsproto libfontenc xtrans
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index c2badb0fd..145c36988 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		1791473c18a83a333a048b72d719fc55
 PKG_DESCR:=		X11 rendering library
 PKG_SECTION:=		x11
+PKG_BUILDDEP+=		renderproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 ifeq ($(ADK_STATIC),y)
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index d1c71d881..d17d844a8 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libffi
-PKG_VERSION:=		3.0.8
+PKG_VERSION:=		3.0.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		188a4f79fdac2310044b44b7d3918ef9
+PKG_MD5SUM:=		1f300a7a7f975d4046f51c3022fa5ff1
 PKG_DESCR:=		Foreign Function Interface library
 PKG_SECTION:=		libs
 PKG_URL:=		http://sourceware.org/libffi
@@ -16,7 +16,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autotool gnu
+CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
diff --git a/package/libffi/patches/patch-Makefile_am b/package/libffi/patches/patch-Makefile_am
deleted file mode 100644
index d53ba2a76..000000000
--- a/package/libffi/patches/patch-Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libffi-3.0.6.orig/Makefile.am	2008-02-21 14:36:18.000000000 +0100
-+++ libffi-3.0.6/Makefile.am	2008-12-08 02:27:27.000000000 +0100
-@@ -68,6 +68,7 @@ AM_MAKEFLAGS = \
- 	"infodir=$(infodir)" \
- 	"libdir=$(libdir)" \
- 	"prefix=$(prefix)" \
-+	"includesdir=$(prefix)/include" \
- 	"AR=$(AR)" \
- 	"AS=$(AS)" \
- 	"CC=$(CC)" \
diff --git a/package/libffi/patches/patch-include_Makefile_am b/package/libffi/patches/patch-include_Makefile_am
deleted file mode 100644
index 0b6ad70ab..000000000
--- a/package/libffi/patches/patch-include_Makefile_am
+++ /dev/null
@@ -1,10 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libffi-3.0.6.orig/include/Makefile.am	2008-02-14 16:37:00.000000000 +0100
-+++ libffi-3.0.6/include/Makefile.am	2008-12-08 02:20:25.000000000 +0100
-@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
- DISTCLEANFILES=ffitarget.h
- EXTRA_DIST=ffi.h.in ffi_common.h
- 
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includesdir = $(includesdir)
- nodist_includes_HEADERS = ffi.h ffitarget.h 
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile
index 00f85b570..d6da115a4 100644
--- a/package/libxkbfile/Makefile
+++ b/package/libxkbfile/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a1384a9a48430397aff236f97e26ed05
 PKG_DESCR:=		X11 keyboard configuration extension library
 PKG_SECTION:=		x11
+PKG_BUILDDEP+=		kbproto libX11
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index a04bd4693..92acee50f 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+PKGDFLT_MTD=		y
+
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 0fd7c6710..ef58ca96f 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.22
+PKG_VERSION:=		2.6.24
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		gmp
-PKG_MD5SUM:=		9a30009bade8a1b09fba27680c87cf72
+PKG_MD5SUM:=		1c76b6982c05392f7c360afb92699661
 PKG_DESCR:=		IPSec software
 PKG_SECTION:=		net
 PKG_DEPENDS:=		ip libgmp
+PKG_BUILDDEP+=		gmp
 PKG_URL:=		http://www.openswan.org
 PKG_SITES:=		http://www.openswan.org/download/ \
 			ftp://ftp.openswan.org/openswan/
diff --git a/package/openswan/patches/patch-programs_Makefile_program b/package/openswan/patches/patch-programs_Makefile_program
deleted file mode 100644
index 154fd06c2..000000000
--- a/package/openswan/patches/patch-programs_Makefile_program
+++ /dev/null
@@ -1,102 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.22.orig/programs/Makefile.program	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/programs/Makefile.program	2009-07-23 19:46:18.635264333 +0200
-@@ -49,9 +49,9 @@ CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFIL
- CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\"
- 
- # die if there are any warnings
--ifndef WERROR
--WERROR:= -Werror
--endif
-+#ifndef WERROR
-+#WERROR:= -Werror
-+#endif
- 
- CFLAGS+= ${WERROR}
- 
-@@ -104,67 +104,67 @@ endif
- ifneq ($(NOINSTALL),true)
- 
- doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES)
--	@mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR)
-+	mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR)
- 	@if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi
--	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
-+	$(foreach f, $(addsuffix .8, $(PROGRAM)), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/$(MANPROGPREFIX)$f || exit 1; \
- 	)
--	@$(foreach f, $(EXTRA8MAN), \
-+	$(foreach f, $(EXTRA8MAN), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/ipsec_$f || exit 1; \
- 	)
--	@$(foreach f, $(EXTRA5MAN), \
-+	$(foreach f, $(EXTRA5MAN), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/$f || exit 1 ;\
- 	)
--	@$(foreach f, $(EXTRA5PROC), \
-+	$(foreach f, $(EXTRA5PROC), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/ipsec_$f || exit 1 ;\
- 	)
--	@$(foreach f, $(LIBFILES), \
-+	$(foreach f, $(LIBFILES), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTCONFFLAGS) $$g $(LIBDIR)/$f || exit 1 ;\
- 	)
--	@$(foreach f, $(CONFFILES), \
-+	$(foreach f, $(CONFFILES), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		if [ ! -f $(CONFDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDIR)/$f || exit 1; fi;\
- 		$(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \
- 	)
--	@$(foreach f, $(EXCONFFILES), \
-+	$(foreach f, $(EXCONFFILES), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		$(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \
- 	)
--	@$(foreach f, $(CONFDFILES), \
-+	$(foreach f, $(CONFDFILES), \
- 		g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \
- 		if [ ! -f $(CONFDDIR)/$(CONFDSUBDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDDIR)/$(CONFDSUBDIR)/$f || exit 1; fi;\
- 	)
- 
- install_file_list::
--	@if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi
--	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
-+	if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi
-+	$(foreach f, $(addsuffix .8, $(PROGRAM)), \
- 		echo $(MANDIR8)/${MANPROGPREFIX}$f; \
- 	)
--	@$(foreach f, $(EXTRA8MAN), \
-+	$(foreach f, $(EXTRA8MAN), \
- 		echo $(MANDIR8)/ipsec_$f; \
- 	)
--	@$(foreach f, $(EXTRA5MAN), \
-+	$(foreach f, $(EXTRA5MAN), \
- 		echo $(MANDIR5)/$f;\
- 	)
--	@$(foreach f, $(EXTRA5PROC), \
-+	$(foreach f, $(EXTRA5PROC), \
- 		echo $(MANDIR5)/ipsec_$f; \
- 	)
--	@$(foreach f, $(LIBFILES), \
-+	$(foreach f, $(LIBFILES), \
- 		echo $(LIBDIR)/$f;\
- 	)
--	@$(foreach f, $(CONFFILES), \
-+	$(foreach f, $(CONFFILES), \
- 		echo $(CONFDIR)/$f;\
- 		echo $(EXAMPLECONFDIR)/$f-sample;\
- 	)
--	@$(foreach f, $(EXCONFFILES), \
-+	$(foreach f, $(EXCONFFILES), \
- 		echo $(EXAMPLECONFDIR)/$f-sample;\
- 	)
--	@$(foreach f, $(CONFDFILES), \
-+	$(foreach f, $(CONFDFILES), \
- 		echo $(CONFDDIR)/${CONFDSUBDIR}/$f;\
- 	)
- 
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
new file mode 100644
index 000000000..4f7506523
--- /dev/null
+++ b/package/xf86-input-evtouch/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrig