3 files changed, 50 insertions, 0 deletions
diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in
new file mode 100644
index 000000000..493c10d33
--- /dev/null
+++ b/package/diffutils/Config.in
@@ -0,0 +1,6 @@
+config ADK_PACKAGE_DIFFUTILS
+	prompt "diffutils......................... show differences between two files"
+	tristate
+	default n
+	help
+	  http://www.gnu.org/software/diffutils/
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile
new file mode 100644
index 000000000..70f1f53cd
--- /dev/null
+++ b/package/diffutils/Makefile
@@ -0,0 +1,28 @@
+# 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:=		diffutils
+PKG_VERSION:=		2.8.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		71f9c5ae19b60608f6c7f162da86a428
+PKG_DESCR:=		show differences between two files
+PKG_SECTION:=		comp
+PKG_URL:=		http://www.gnu.org/software/diffutils/
+PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,DIFFUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ENV+=		ac_use_included_regex=no
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_DIFFUTILS}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/diff ${IDIR_DIFFUTILS}/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/diffutils/patches/patch-lib_regex_c b/package/diffutils/patches/patch-lib_regex_c
new file mode 100644
index 000000000..c4a8bec7b
--- /dev/null
+++ b/package/diffutils/patches/patch-lib_regex_c
@@ -0,0 +1,16 @@
+workaround for uClibc
+--- diffutils-2.8.1.orig/lib/regex.c	2002-03-01 08:44:52.000000000 +0100
++++ diffutils-2.8.1/lib/regex.c	2009-08-28 16:39:02.000000000 +0200
+@@ -8313,12 +8313,8 @@ regerror (errcode, preg, errbuf, errbuf_
+     {
+       if (msg_size > errbuf_size)
+         {
+-#if defined HAVE_MEMPCPY || defined _LIBC
+-	  *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+-#else
+           memcpy (errbuf, msg, errbuf_size - 1);
+           errbuf[errbuf_size - 1] = 0;
+-#endif
+         }
+       else
+         memcpy (errbuf, msg, msg_size);