diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-06-17 21:56:04 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-06-17 21:56:04 +0200 |
| commit | b2c55530b8e48225329e2833d3e2ce1f74a59d77 (patch) | |
| tree | 7e03a71d9a9720ebb467efa80b98d69c113ec0f0 /package/diffutils | |
| parent | 541c723fa37dd324146f5c7ddb71866d0b873bad (diff) | |
diffutils: update to 3.3
Diffstat (limited to 'package/diffutils')
| -rw-r--r-- | package/diffutils/Makefile | 20 | ||||
| -rw-r--r-- | package/diffutils/patches/patch-lib_regex_c | 16 |
2 files changed, 9 insertions, 27 deletions
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile index 7cd47b36b..0ffd9f670 100644 --- a/package/diffutils/Makefile +++ b/package/diffutils/Makefile @@ -1,28 +1,26 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= diffutils -PKG_VERSION:= 2.8.1 +PKG_VERSION:= 3.3 PKG_RELEASE:= 1 -PKG_HASH:= c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a +PKG_HASH:= a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c PKG_DESCR:= show differences between two files PKG_SECTION:= sys/utils PKG_URL:= http://www.gnu.org/software/diffutils/ -PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} +PKG_SITES:= $(MASTER_SITE_GNU:=$(PKG_NAME)/) PKG_BB:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include $(ADK_TOPDIR)/mk/package.mk -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,DIFFUTILS,diffutils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DIFFUTILS,diffutils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) CONFIGURE_ENV+= ac_use_included_regex=no diffutils-install: - ${INSTALL_DIR} ${IDIR_DIFFUTILS}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/diff ${IDIR_DIFFUTILS}/usr/bin + $(INSTALL_DIR) $(IDIR_DIFFUTILS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/diff $(IDIR_DIFFUTILS)/usr/bin -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/diffutils/patches/patch-lib_regex_c b/package/diffutils/patches/patch-lib_regex_c deleted file mode 100644 index c4a8bec7b..000000000 --- a/package/diffutils/patches/patch-lib_regex_c +++ /dev/null @@ -1,16 +0,0 @@ -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); |