Import of pkgsrc-2016Q3

sysutils/coreutils/patches/patch-lib-fflush.c

@@ -1,11 +1,11 @@
-$NetBSD: patch-lib-fflush.c,v 1.2 2014/02/02 07:08:25 richard Exp $
+$NetBSD: patch-lib-fflush.c,v 1.3 2016/01/31 09:20:51 ryoon Exp $
 
---- lib/fflush.c.orig	2013-12-04 14:53:33.000000000 +0000
+--- lib/fflush.c.orig	2016-01-01 13:45:55.000000000 +0000
 +++ lib/fflush.c
-@@ -96,7 +96,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
-                    off_t pos _GL_UNUSED_PARAMETER)
+@@ -99,7 +99,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
  {
- #  if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
+ #  if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
 -#   if defined __CYGWIN__
 +#   if defined(__CYGWIN__) || defined(__NetBSD__)
    /* fp_->_offset is typed as an integer.  */

sysutils/coreutils/patches/patch-lib-fseeko.c

@@ -1,13 +0,0 @@
-$NetBSD: patch-lib-fseeko.c,v 1.2 2014/02/02 07:08:25 richard Exp $
-
---- lib/fseeko.c.orig	2013-12-04 15:02:00.000000000 +0000
-+++ lib/fseeko.c
-@@ -125,7 +125,7 @@ fseeko (FILE *fp, off_t offset, int when
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
--# if defined __CYGWIN__
-+# if defined(__CYGWIN__) || defined(__NetBSD__)
-       /* fp_->_offset is typed as an integer.  */
-       fp_->_offset = pos;
- # else

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

@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_string.in.h,v 1.1 2014/06/29 06:53:23 obache Exp $
+$NetBSD: patch-lib_string.in.h,v 1.2 2016/01/31 09:20:51 ryoon 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.orig	2016-01-01 14:17:01.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/>.  */
+@@ -32,12 +32,18 @@
+ #else
+ /* Normal invocation convention.  */
  
 +#ifdef GL_ALREADY_INCLUDE_STRING_H
 +#@INCLUDE_NEXT@ @NEXT_STRING_H@
@@ -14,20 +14,17 @@ $NetBSD: patch-lib_string.in.h,v 1.1 2014/06/29 06:53:23 obache Exp $
 +
  #ifndef _@GUARD_PREFIX@_STRING_H
  
- #if __GNUC__ >= 3
-@@ -22,8 +26,10 @@
- #endif
- @PRAGMA_COLUMNS@
+ #define _GL_ALREADY_INCLUDING_STRING_H
  
 +#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
+ #undef _GL_ALREADY_INCLUDING_STRING_H
  
+@@ -1044,3 +1050,4 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp
  #endif /* _@GUARD_PREFIX@_STRING_H */
  #endif /* _@GUARD_PREFIX@_STRING_H */
+ #endif
 +#endif