Merge branch 'master' of gogs.waldemar-brodkorb.de:oss/openadk

4 files changed, 2 insertions, 60 deletions

diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile
index 60d33c19a..f5a1585a2 100644
--- a/package/coreutils/Makefile
+++ b/package/coreutils/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		coreutils
-PKG_VERSION:=		8.25
+PKG_VERSION:=		9.0
 PKG_RELEASE:=		1
-PKG_HASH:=		31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87
+PKG_HASH:=		ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce
 PKG_DESCR:=		file, shell and text utilities
 PKG_SECTION:=		base/apps
 PKG_NEEDS:=		threads
@@ -19,7 +19,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,COREUTILS,coreutils,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,COREUTILS,coreutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--disable-rpath
 
 coreutils-install:
diff --git a/package/coreutils/patches/patch-Makefile_am b/package/coreutils/patches/patch-Makefile_am
deleted file mode 100644
index 20f1fff1d..000000000
--- a/package/coreutils/patches/patch-Makefile_am
+++ /dev/null
@@ -1,27 +0,0 @@
---- coreutils-8.24.orig/Makefile.am	2015-07-03 22:07:38.000000000 +0200
-+++ coreutils-8.24/Makefile.am	2015-07-06 20:55:18.000000000 +0200
-@@ -17,7 +17,7 @@
- 
- ALL_RECURSIVE_TARGETS =
- 
--SUBDIRS = po . gnulib-tests
-+SUBDIRS = . gnulib-tests
- 
- changelog_etc =				\
-   ChangeLog-2005			\
-@@ -35,8 +35,7 @@ changelog_etc =				\
-   old/sh-utils/ChangeLog.0		\
-   old/sh-utils/NEWS			\
-   old/textutils/ChangeLog		\
--  old/textutils/NEWS			\
--  po/ChangeLog-2007
-+  old/textutils/NEWS			
- 
- EXTRA_DIST =				\
-   $(changelog_etc)			\
-@@ -223,5 +222,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib
- include $(top_srcdir)/lib/local.mk
- include $(top_srcdir)/src/local.mk
- include $(top_srcdir)/doc/local.mk
--include $(top_srcdir)/man/local.mk
- include $(top_srcdir)/tests/local.mk
diff --git a/package/coreutils/patches/patch-configure_ac b/package/coreutils/patches/patch-configure_ac
deleted file mode 100644
index 2ec02088f..000000000
--- a/package/coreutils/patches/patch-configure_ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- coreutils-8.24.orig/configure.ac	2015-06-26 19:05:22.000000000 +0200
-+++ coreutils-8.24/configure.ac	2015-07-06 20:55:57.000000000 +0200
-@@ -589,11 +589,6 @@ AM_CONDITIONAL([CROSS_COMPILING], [test
- 
- ############################################################################
- 
--# As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in
--# translatable strings, we must use need-formatstring-macros here.
--AM_GNU_GETTEXT([external], [need-formatstring-macros])
--AM_GNU_GETTEXT_VERSION([0.19.2])
--
- # For a test of uniq: it uses the $LOCALE_FR envvar.
- gt_LOCALE_FR
- 
diff --git a/package/coreutils/patches/patch-man_local_mk b/package/coreutils/patches/patch-man_local_mk
deleted file mode 100644
index 5bf9e5cc1..000000000
--- a/package/coreutils/patches/patch-man_local_mk
+++ /dev/null
@@ -1,16 +0,0 @@
---- coreutils-8.22.orig/man/local.mk	2013-12-04 15:48:30.000000000 +0100
-+++ coreutils-8.22/man/local.mk	2014-02-21 16:08:08.000000000 +0100
-@@ -18,12 +18,7 @@
- 
- EXTRA_DIST += man/help2man man/dummy-man
- 
--## Graceful degradation for systems lacking perl.
--if HAVE_PERL
--run_help2man = $(PERL) -- $(srcdir)/man/help2man
--else
--run_help2man = $(SHELL) $(srcdir)/man/dummy-man
--endif
-+run_help2man = echo
- 
- man1_MANS = @man1_MANS@
- EXTRA_DIST += $(man1_MANS:.1=.x)