Import of pkgsrc-2015Q1

sysutils/coreutils/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.63 2014/05/29 23:37:27 wiz Exp $
 
 .include "../../sysutils/coreutils/Makefile.common"
 
-
+PKGREVISION=		1
 CONFIGURE_ARGS+=	--without-gmp
 
 CONFLICTS=	fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*

sysutils/coreutils/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2014/02/02 07:08:24 richard Exp $
+# $NetBSD: Makefile.common,v 1.9 2015/01/29 21:58:34 jperkin Exp $
 # used by sysutils/coreutils/Makefile
 # used by misc/gnuls/Makefile
 
@@ -33,6 +33,15 @@ CONFIGURE_ENV+=		ac_list_mounted_fs=found
 CONFIGURE_ENV+= 	gl_cv_search_pthread_join=-lpthread
 .endif
 
+.if ${OPSYS} == "Linux"
+CONFIGURE_ENV+=		FORCE_UNSAFE_CONFIGURE=1
+.endif
+
+# Explicitly disable inotify support whilst it is Linux-specific.
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=		ac_cv_func_inotify_init=no
+.endif
+
 .if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
 CONFIGURE_ENV+=		ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes
 .endif

sysutils/coreutils/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2014/03/25 07:53:35 obache Exp $
+$NetBSD: distinfo,v 1.29 2014/06/29 06:53:23 obache Exp $
 
 SHA1 (coreutils-8.22.tar.xz) = cc7fe47b21eb49dd2ee4cdb707570f42fb2c8cc6
 RMD160 (coreutils-8.22.tar.xz) = c3da7ade1d3ac82e97ac4a24c70376af8b9b503b
@@ -6,4 +6,4 @@ Size (coreutils-8.22.tar.xz) = 5335124 bytes
 SHA1 (patch-Makefile.in) = fce694c56777081a6a54d157dd0573945250f381
 SHA1 (patch-lib-fflush.c) = 106e9c7d05fff290f24cb69e1b2c80d0077c62bd
 SHA1 (patch-lib-fseeko.c) = 9f4b0294698648011c64869fc0e642f910e9d47f
-SHA1 (patch-lib_strncat.c) = 415f45d29a6d073d4e90eaadf45b7fdc6107b05c
+SHA1 (patch-lib_string.in.h) = 37167af962d1cfe9196d11e4250d9e9628d9eb73

sysutils/coreutils/patches/patch-lib_string.in.h

@@ -0,0 +1,33 @@
+$NetBSD: patch-lib_string.in.h,v 1.1 2014/06/29 06:53:23 obache Exp $
+
+* fixes for nested include of string.h.
+
+--- lib/string.in.h.orig	2013-12-04 15:02:02.000000000 +0000
++++ lib/string.in.h
+@@ -15,6 +15,10 @@
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+ 
++#ifdef GL_ALREADY_INCLUDE_STRING_H
++#@INCLUDE_NEXT@ @NEXT_STRING_H@
++#else
++
+ #ifndef _@GUARD_PREFIX@_STRING_H
+ 
+ #if __GNUC__ >= 3
+@@ -22,8 +26,10 @@
+ #endif
+ @PRAGMA_COLUMNS@
+ 
++#define GL_ALREADY_INCLUDE_STRING_H
+ /* The include_next requires a split double-inclusion guard.  */
+ #@INCLUDE_NEXT@ @NEXT_STRING_H@
++#undef GL_ALREADY_INCLUDE_STRING_H
+ 
+ #ifndef _@GUARD_PREFIX@_STRING_H
+ #define _@GUARD_PREFIX@_STRING_H
+@@ -1027,3 +1033,4 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp
+ 
+ #endif /* _@GUARD_PREFIX@_STRING_H */
+ #endif /* _@GUARD_PREFIX@_STRING_H */
++#endif

sysutils/coreutils/patches/patch-lib_strncat.c

@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_strncat.c,v 1.1 2014/03/25 07:53:35 obache Exp $
-
-* strncat is defined as a macro in NetBSD-6
-
---- lib/strncat.c.orig	2013-12-04 15:02:02.000000000 +0000
-+++ lib/strncat.c
-@@ -19,6 +19,7 @@
- 
- /* Specification.  */
- #include <string.h>
-+#undef strncat
- 
- char *
- strncat (char *dest, const char *src, size_t n)