Import of pkgsrc-2016Q3

sysutils/coreutils/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2015/07/24 17:02:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.71 2016/07/09 06:38:59 wiz Exp $
 
-PKGREVISION= 2
+PKGREVISION= 1
 .include "../../sysutils/coreutils/Makefile.common"
 
 CONFIGURE_ARGS+=	--without-gmp
@@ -36,12 +36,10 @@ PLIST.stdbuf=		yes
 
 # Ensure libstdbuf.so has a valid library name otherwise REQUIRES will
 # record the relative path of the object output file.
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+=		libname
+SUBST_CLASSES.Darwin+=	libname
 SUBST_STAGE.libname=	pre-configure
 SUBST_FILES.libname=	Makefile.in
 SUBST_SED.libname=	-e '/^src_libstdbuf_so_LDFLAGS/s,$$, -install_name ${PREFIX}/libexec/coreutils/glibstdbuf.so,'
-.endif
 
 PROGS=	[ base64 basename cat chcon chgrp chmod chown chroot cksum comm \
 	cp csplit cut date dd df dir dircolors dirname du hostid echo env \

sysutils/coreutils/Makefile.common

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.11 2015/05/07 00:24:59 mef Exp $
+# $NetBSD: Makefile.common,v 1.15 2016/02/26 10:24:11 jperkin Exp $
 # used by sysutils/coreutils/Makefile
 # used by misc/gnuls/Makefile
 
-DISTNAME=	coreutils-8.23
+DISTNAME=	coreutils-8.25
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU:=coreutils/}
 EXTRACT_SUFX=	.tar.xz
@@ -35,22 +35,18 @@ TEST_TARGET=		check
 # Otherwise configure aborts when ran by root
 CONFIGURE_ENV+=		FORCE_UNSAFE_CONFIGURE=yes
 
-.if ${OPSYS} == "Interix"
-CONFIGURE_ENV+=		ac_list_mounted_fs=found
+CONFIGURE_ENV.Interix+=	ac_list_mounted_fs=found
+
+CONFIGURE_ENV.DragonFly+= 	gl_cv_search_pthread_join=-lpthread
+
+# Various tests rely on GCC's -O2 behaviour (e.g. -D__NO_INLINE__) and
+# without it we run into undefined symbol issues.
+.if ${OPSYS} == "Darwin" && ${PKGSRC_COMPILER} == "gcc"
+CFLAGS+=		-O2
 .endif
 
-.if ${OPSYS} == "DragonFly"
-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
+# Explicitly disable inotify support whilst it is Linux-specific.
+CONFIGURE_ENV.SunOS+=	ac_cv_func_inotify_init=no
 
 .if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
 CONFIGURE_ENV+=		ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes

sysutils/coreutils/PLIST

@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.17 2014/02/02 07:08:24 richard Exp $
+@comment $NetBSD: PLIST,v 1.18 2016/01/31 09:20:50 ryoon Exp $
 bin/g[
+bin/gbase32
 bin/gbase64
 bin/gbasename
 bin/gcat
@@ -308,7 +309,8 @@ gnu/man/man1/who.1
 gnu/man/man1/whoami.1
 gnu/man/man1/yes.1
 info/coreutils.info
-${PLIST.stdbuf}libexec/coreutils/glibstdbuf.so
+${PLIST.stdbuf}libexec/coreutils/libstdbuf.so
+man/man1/gbase32.1
 man/man1/gbase64.1
 man/man1/gbasename.1
 man/man1/gcat.1
@@ -447,6 +449,7 @@ share/locale/ro/LC_MESSAGES/coreutils.mo
 share/locale/ru/LC_MESSAGES/coreutils.mo
 share/locale/sk/LC_MESSAGES/coreutils.mo
 share/locale/sl/LC_MESSAGES/coreutils.mo
+share/locale/sr/LC_MESSAGES/coreutils.mo
 share/locale/sv/LC_MESSAGES/coreutils.mo
 share/locale/tr/LC_MESSAGES/coreutils.mo
 share/locale/uk/LC_MESSAGES/coreutils.mo
@@ -489,6 +492,7 @@ share/locale/ro/LC_TIME/coreutils.mo
 share/locale/ru/LC_TIME/coreutils.mo
 share/locale/sk/LC_TIME/coreutils.mo
 share/locale/sl/LC_TIME/coreutils.mo
+share/locale/sr/LC_TIME/coreutils.mo
 share/locale/sv/LC_TIME/coreutils.mo
 share/locale/tr/LC_TIME/coreutils.mo
 share/locale/uk/LC_TIME/coreutils.mo

sysutils/coreutils/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.31 2015/05/07 00:24:59 mef Exp $
+$NetBSD: distinfo,v 1.33 2016/01/31 09:20:50 ryoon Exp $
 
-SHA1 (coreutils-8.23.tar.xz) = adead02839225218b85133fa57b4dba02af2291d
-RMD160 (coreutils-8.23.tar.xz) = d4c433968cd77dbf86e9f4a75c622b24aa7c2726
-Size (coreutils-8.23.tar.xz) = 5375612 bytes
+SHA1 (coreutils-8.25.tar.xz) = 301f186c24afb882a3ca73d19a102a2ce6f456c3
+RMD160 (coreutils-8.25.tar.xz) = 9a957473c66db3b12b55cb92275a32be670d8a8f
+SHA512 (coreutils-8.25.tar.xz) = 571f95d44987d373081ed4c6ac82155ad3dcd95621d7b1a7163597e80ecbbafef2cd74b2ef594587a443a1a4355083879f898a286bb0230c48112d43d076ccd6
+Size (coreutils-8.25.tar.xz) = 5725008 bytes
 SHA1 (patch-Makefile.in) = fce694c56777081a6a54d157dd0573945250f381
-SHA1 (patch-lib-fflush.c) = 106e9c7d05fff290f24cb69e1b2c80d0077c62bd
-SHA1 (patch-lib-fseeko.c) = 9f4b0294698648011c64869fc0e642f910e9d47f
-SHA1 (patch-lib_string.in.h) = 37167af962d1cfe9196d11e4250d9e9628d9eb73
+SHA1 (patch-lib-fflush.c) = adfd2c0da90c63e082d4f6bf3938f63a6260d018
+SHA1 (patch-lib_string.in.h) = 4fcd9c511eed2bb476db0d7bb8cceba03c1da180

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