Import of pkgsrc-2014Q1

This commit is contained in:
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions

View File

@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.60 2013/05/31 12:41:59 wiz Exp $
# $NetBSD: Makefile,v 1.62 2014/03/13 11:08:52 jperkin Exp $
.include "../../sysutils/coreutils/Makefile.common"
PKGREVISION= 6
CONFIGURE_ARGS+= --without-gmp
@@ -23,6 +22,11 @@ PLIST_VARS+= hostid stdbuf
PLIST.hostid= yes
.endif
# This should really only be defined if building stdbuf, however we cannot
# set this variable after including compiler.mk, so we take the hit of
# setting it unconditionally for now.
USE_GCC_RUNTIME= yes
.include "../../mk/compiler.mk"
.if ${OBJECT_FMT} == "ELF" && \
@@ -34,10 +38,10 @@ PROGS= [ base64 basename cat chcon chgrp chmod chown chroot cksum comm \
cp csplit cut date dd df dir dircolors dirname du hostid echo env \
expand expr factor false fmt fold groups head id install join kill \
link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl \
nohup nproc od paste pathchk pinky pr printenv printf ptx pwd \
readlink rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum \
sha512sum shred shuf sleep sort split stat stdbuf stty sum sync tac \
tail tee test timeout touch tr true truncate tsort tty uname \
nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd \
readlink realpath rm rmdir runcon seq sha1sum sha224sum sha256sum \
sha384sum sha512sum shred shuf sleep sort split stat stdbuf stty sum \
sync tac tail tee test timeout touch tr true truncate tsort tty uname \
unexpand uniq unlink uptime users vdir wc who whoami yes
AUTO_MKDIRS= yes

View File

@@ -1,10 +1,11 @@
# $NetBSD: Makefile.common,v 1.6 2012/10/23 19:50:56 asau Exp $
# $NetBSD: Makefile.common,v 1.7 2014/02/02 07:08:24 richard Exp $
# used by sysutils/coreutils/Makefile
# used by misc/gnuls/Makefile
DISTNAME= coreutils-8.13
DISTNAME= coreutils-8.22
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/}
EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/coreutils/

View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.16 2012/06/02 09:32:30 cheusov Exp $
@comment $NetBSD: PLIST,v 1.17 2014/02/02 07:08:24 richard Exp $
bin/g[
bin/gbase64
bin/gbasename
@@ -49,6 +49,7 @@ bin/gnice
bin/gnl
bin/gnohup
bin/gnproc
bin/gnumfmt
bin/god
bin/gpaste
bin/gpathchk
@@ -59,6 +60,7 @@ bin/gprintf
bin/gptx
bin/gpwd
bin/greadlink
bin/grealpath
bin/grm
bin/grmdir
bin/gruncon
@@ -150,6 +152,7 @@ gnu/bin/nice
gnu/bin/nl
gnu/bin/nohup
gnu/bin/nproc
gnu/bin/numfmt
gnu/bin/od
gnu/bin/paste
gnu/bin/pathchk
@@ -160,6 +163,7 @@ gnu/bin/printf
gnu/bin/ptx
gnu/bin/pwd
gnu/bin/readlink
gnu/bin/realpath
gnu/bin/rm
gnu/bin/rmdir
gnu/bin/runcon
@@ -250,6 +254,7 @@ gnu/man/man1/nice.1
gnu/man/man1/nl.1
gnu/man/man1/nohup.1
gnu/man/man1/nproc.1
gnu/man/man1/numfmt.1
gnu/man/man1/od.1
gnu/man/man1/paste.1
gnu/man/man1/pathchk.1
@@ -260,6 +265,7 @@ gnu/man/man1/printf.1
gnu/man/man1/ptx.1
gnu/man/man1/pwd.1
gnu/man/man1/readlink.1
gnu/man/man1/realpath.1
gnu/man/man1/rm.1
gnu/man/man1/rmdir.1
gnu/man/man1/runcon.1
@@ -352,6 +358,7 @@ man/man1/gnice.1
man/man1/gnl.1
man/man1/gnohup.1
man/man1/gnproc.1
man/man1/gnumfmt.1
man/man1/god.1
man/man1/gpaste.1
man/man1/gpathchk.1
@@ -362,6 +369,7 @@ man/man1/gprintf.1
man/man1/gptx.1
man/man1/gpwd.1
man/man1/greadlink.1
man/man1/grealpath.1
man/man1/grm.1
man/man1/grmdir.1
man/man1/gruncon.1
@@ -419,7 +427,9 @@ share/locale/fi/LC_MESSAGES/coreutils.mo
share/locale/fr/LC_MESSAGES/coreutils.mo
share/locale/ga/LC_MESSAGES/coreutils.mo
share/locale/gl/LC_MESSAGES/coreutils.mo
share/locale/hr/LC_MESSAGES/coreutils.mo
share/locale/hu/LC_MESSAGES/coreutils.mo
share/locale/ia/LC_MESSAGES/coreutils.mo
share/locale/id/LC_MESSAGES/coreutils.mo
share/locale/it/LC_MESSAGES/coreutils.mo
share/locale/ja/LC_MESSAGES/coreutils.mo
@@ -459,7 +469,9 @@ share/locale/fi/LC_TIME/coreutils.mo
share/locale/fr/LC_TIME/coreutils.mo
share/locale/ga/LC_TIME/coreutils.mo
share/locale/gl/LC_TIME/coreutils.mo
share/locale/hr/LC_TIME/coreutils.mo
share/locale/hu/LC_TIME/coreutils.mo
share/locale/ia/LC_TIME/coreutils.mo
share/locale/id/LC_TIME/coreutils.mo
share/locale/it/LC_TIME/coreutils.mo
share/locale/ja/LC_TIME/coreutils.mo

View File

@@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.23 2013/04/30 22:28:22 joerg Exp $
$NetBSD: distinfo,v 1.27 2014/03/25 07:53:35 obache Exp $
SHA1 (coreutils-8.13.tar.gz) = 83b7e25661c439ecac55e99ff0dd816b9ff478a5
RMD160 (coreutils-8.13.tar.gz) = fb24a15641581ba57482f4c1c1ecfc32752dbd9d
Size (coreutils-8.13.tar.gz) = 11660808 bytes
SHA1 (patch-configure) = bfe96fde14c73b2836f539cc2e9dad3a77b05c4b
SHA1 (patch-lib-fflush.c) = e52e0da2127c5debbb14e967b1e206226efdaa4a
SHA1 (patch-lib-fseeko.c) = ab62b8c7faa9a601191475c040c7466e1bd52fe1
SHA1 (coreutils-8.22.tar.xz) = cc7fe47b21eb49dd2ee4cdb707570f42fb2c8cc6
RMD160 (coreutils-8.22.tar.xz) = c3da7ade1d3ac82e97ac4a24c70376af8b9b503b
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

View File

@@ -0,0 +1,16 @@
$NetBSD: patch-Makefile.in,v 1.2 2014/02/04 15:07:46 wiz Exp $
Target for misc/gnuls package.
--- Makefile.in.orig 2013-12-13 15:20:00.000000000 +0000
+++ Makefile.in
@@ -4395,6 +4395,9 @@ pr_data = \
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-recursive
+gnuls: $(BUILT_SOURCES) $(mandeps)
+ $(MAKE) $(AM_MAKEFLAGS) src/dircolors src/ls man/dircolors.1 man/ls.1
+
.SUFFIXES:
.SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .trs .x .xpl .xpl$(EXEEXT) .y
am--refresh: Makefile

View File

@@ -1,73 +0,0 @@
$NetBSD: patch-configure,v 1.1 2013/04/30 22:28:22 joerg Exp $
--- configure.orig 2013-04-30 19:22:56.000000000 +0000
+++ configure
@@ -38704,30 +38704,30 @@ fi
LIB_PTHREAD=
if test $ac_cv_header_pthread_h = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_join" >&5
-$as_echo_n "checking for library containing pthread_join... " >&6; }
-if ${gl_cv_search_pthread_join+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
+$as_echo_n "checking for library containing pthread_create... " >&6; }
+if ${gl_cv_search_pthread_create+:} false; then :
$as_echo_n "(cached) " >&6
else
gl_saved_libs="$LIBS"
- gl_cv_search_pthread_join=
+ gl_cv_search_pthread_create=
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <pthread.h>
int
main ()
{
-pthread_join (pthread_self (), (void **) 0);
+pthread_create (NULL, NULL, NULL, NULL);
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- gl_cv_search_pthread_join="none required"
+ gl_cv_search_pthread_create="none required"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- if test -z "$gl_cv_search_pthread_join"; then
+ if test -z "$gl_cv_search_pthread_create"; then
LIBS="-lpthread $gl_saved_libs"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -38735,13 +38735,13 @@ rm -f core conftest.err conftest.$ac_obj
int
main ()
{
-pthread_join (pthread_self (), (void **) 0);
+pthread_create (NULL, NULL, NULL, NULL);
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- gl_cv_search_pthread_join="-lpthread"
+ gl_cv_search_pthread_create="-lpthread"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -38749,10 +38749,10 @@ rm -f core conftest.err conftest.$ac_obj
LIBS="$gl_saved_libs"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_search_pthread_join" >&5
-$as_echo "$gl_cv_search_pthread_join" >&6; }
- if test "$gl_cv_search_pthread_join" != "none required"; then
- LIB_PTHREAD="$gl_cv_search_pthread_join"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_search_pthread_create" >&5
+$as_echo "$gl_cv_search_pthread_create" >&6; }
+ if test "$gl_cv_search_pthread_create" != "none required"; then
+ LIB_PTHREAD="$gl_cv_search_pthread_create"
fi
fi

View File

@@ -1,13 +1,13 @@
$NetBSD: patch-lib-fflush.c,v 1.1 2012/03/06 23:38:04 joerg Exp $
$NetBSD: patch-lib-fflush.c,v 1.2 2014/02/02 07:08:25 richard Exp $
--- lib/fflush.c.orig 2011-08-19 16:09:37.000000000 +0000
--- lib/fflush.c.orig 2013-12-04 14:53:33.000000000 +0000
+++ lib/fflush.c
@@ -91,7 +91,7 @@ static inline void
update_fpos_cache (FILE *fp, off_t pos)
@@ -96,7 +96,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
off_t pos _GL_UNUSED_PARAMETER)
{
#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
-# if defined __CYGWIN__
+# if defined(__CYGWIN__) || defined(__NetBSD__)
# if 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
# else

View File

@@ -1,11 +1,11 @@
$NetBSD: patch-lib-fseeko.c,v 1.1 2012/03/06 23:38:04 joerg Exp $
$NetBSD: patch-lib-fseeko.c,v 1.2 2014/02/02 07:08:25 richard Exp $
--- lib/fseeko.c.orig 2011-08-12 08:05:46.000000000 +0000
--- lib/fseeko.c.orig 2013-12-04 15:02:00.000000000 +0000
+++ lib/fseeko.c
@@ -111,7 +111,7 @@ fseeko (FILE *fp, off_t offset, int when
@@ -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, MacOS X, Cygwin */
#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. */

View File

@@ -0,0 +1,14 @@
$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)