Import of pkgsrc-2014Q1

This commit is contained in:
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
+10 -4
View File
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.63 2013/02/26 00:52:20 christos Exp $
# $NetBSD: Makefile,v 1.67 2014/03/14 21:59:34 ryoon Exp $
DISTNAME= bmake-20110606
PKGREVISION= 1
DISTNAME= bmake-20140314
CATEGORIES= devel
MASTER_SITES= # empty
DISTFILES= # empty
@@ -24,7 +23,7 @@ USE_FEATURES= nbcompat
makesyspath= ${PREFIX}/share/mk
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -55,6 +54,13 @@ do-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bmake ${DESTDIR}${PREFIX}/bin
.if !empty(MANINSTALL:Mcatinstall)
. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
${INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/bmake.1
. else
${INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/bmake.0
. endif
.endif
${INSTALL_MAN} ${WRKSRC}/bmake.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
do-test:
+2 -1
View File
@@ -1,3 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2006/07/14 15:18:17 jlam Exp $
@comment $NetBSD: PLIST,v 1.3 2014/02/14 16:09:18 jperkin Exp $
bin/bmake
man/cat1/bmake.0
man/man1/bmake.1
+6 -2
View File
@@ -1,7 +1,7 @@
# $NetBSD: Makefile.in,v 1.20 2011/06/18 22:39:46 bsiegert Exp $
# $NetBSD: Makefile.in,v 1.21 2013/09/08 16:32:14 ryoon Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
# $Id: Makefile.in,v 1.20 2011/06/18 22:39:46 bsiegert Exp $
# $Id: Makefile.in,v 1.21 2013/09/08 16:32:14 ryoon Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -142,4 +142,8 @@ DPADD+=${LIBUTIL}
# A simple unit-test driver to help catch regressions
accept test:
.if ${OS} != "FreeMiNT"
cd ${.CURDIR}/unit-tests && ${.MAKE} -r -m / TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET}
.else
true
.endif
+14 -2
View File
@@ -63,7 +63,7 @@
# Simon J. Gerraty <sjg@crufty.net>
# RCSid:
# $Id: boot-strap,v 1.10 2011/06/18 22:39:46 bsiegert Exp $
# $Id: boot-strap,v 1.11 2013/10/31 12:18:19 obache Exp $
#
# @(#) Copyright (c) 2001 Simon J. Gerraty
#
@@ -236,6 +236,18 @@ add_path () {
no_path $* && eval ${2:-PATH}="$__p${__p:+:}$1"
}
find_prog () {
saved_IFS="$IFS"
IFS=":"
for p in $PATH; do
if [ -x "$p/$1" ]; then
echo "$p/$1"
break;
fi
done
IFS="$saved_IFS";
}
srcdir=`GetDir /bmake "$srcdir" "$2" "$Mydir" ./bmake* "$Mydir"/../bmake*`
[ -d "${srcdir:-/dev/null}" ] || Usage
@@ -310,7 +322,7 @@ if [ -s "${mksrc:-/dev/null}/install-mk" ]; then
esac
fi
# make sure test below uses the same diff that configure did
TOOL_DIFF=`type diff | sed 's,[()],,g;s,^[^/][^/]*,,;q'`
TOOL_DIFF=`find_prog diff`
export MAKESYSPATH TOOL_DIFF
if [ "$mksrc" ]; then
$objdir/bmake test || exit 1
+4 -4
View File
@@ -1,4 +1,4 @@
/* $NetBSD: dir.h,v 1.3 2009/09/18 21:27:25 joerg Exp $ */
/* $NetBSD: dir.h,v 1.4 2014/03/14 21:59:34 ryoon Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -75,8 +75,8 @@
/* dir.h --
*/
#ifndef _DIR
#define _DIR
#ifndef _DIR_H
#define _DIR_H
typedef struct Path {
char *name; /* Name of directory */
@@ -105,4 +105,4 @@ void Dir_PrintPath(Lst);
void Dir_Destroy(void *);
void * Dir_CopyDir(void *);
#endif /* _DIR */
#endif /* _DIR_H */
+12 -1
View File
@@ -2,7 +2,7 @@
# derrived from /etc/rc_d/os.sh
# RCSid:
# $Id: machine.sh,v 1.7 2013/04/06 02:49:57 obache Exp $
# $Id: machine.sh,v 1.10 2014/03/14 21:59:34 ryoon Exp $
#
# @(#) Copyright (c) 1994-2002 Simon J. Gerraty
#
@@ -87,6 +87,17 @@ CYGWIN_*)
i?86) MACHINE_ARCH=i386;;
esac
;;
GNU/kFreeBSD)
MACHINE_ARCH=$MACHINE
;;
FreeMiNT)
MACHINE_ARCH=m68k
;;
SCO_SV)
OSREL=`uname -v`
OSMAJOR=`IFS=.; set $OSREL; echo $1`
MACHINE_ARCH=`uname -m`
;;
esac
MACHINE=${MACHINE:-$OS$OSMAJOR}
+12 -1
View File
@@ -1,4 +1,4 @@
/* $NetBSD: make.h,v 1.6 2011/06/18 22:39:46 bsiegert Exp $ */
/* $NetBSD: make.h,v 1.7 2014/03/14 21:59:34 ryoon Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -98,6 +98,17 @@
#include <unistd.h>
#include <sys/cdefs.h>
/*
* SCO OpenServer 5.0.7/3.2 has no MAXPATHLEN, but it has PATH_MAX (256).
* in limits.h. PATH_MAX is defined alternatively under non-OpenServer OS,
* and it is used in dirname.c of bmake.
*/
#if !defined(MAXPATHLEN)
#if defined(_SCO_DS)
#define MAXPATHLEN 1024
#endif
#endif
#if !defined(__GNUC_PREREQ__)
#if defined(__GNUC__)
#define __GNUC_PREREQ__(x, y) \
+13 -2
View File
@@ -17,7 +17,7 @@
# Simon J. Gerraty <sjg@crufty.net>
# RCSid:
# $Id: os.sh,v 1.6 2013/04/06 02:49:57 obache Exp $
# $Id: os.sh,v 1.10 2014/03/14 21:59:34 ryoon Exp $
#
# @(#) Copyright (c) 1994 Simon J. Gerraty
#
@@ -44,7 +44,7 @@ MACHINE_ARCH=`uname -p 2>/dev/null || echo $MACHINE`
# there is at least one case of `uname -p` outputting
# a bunch of usless drivel
case "$MACHINE_ARCH" in
*[!A-Za-z0-9_-]*) MACHINE_ARCH="$MACHINE";;
unknown|*[!A-Za-z0-9_-]*) MACHINE_ARCH="$MACHINE";;
esac
# we need this here, and it is not always available...
@@ -195,6 +195,17 @@ CYGWIN_*)
i?86) MACHINE_ARCH=i386;;
esac
;;
GNU/kFreeBSD)
MACHINE_ARCH=$MACHINE
;;
FreeMiNT)
MACHINE_ARCH=m68k
;;
SCO_SV)
OSREL=`uname -v`
OSMAJOR=`IFS=.; set $OSREL; echo $1`
MACHINE_ARCH=`uname -m`
;;
esac
HOSTNAME=${HOSTNAME:-`( hostname ) 2>/dev/null`}
+2 -2
View File
@@ -12,9 +12,9 @@ all: mod-ts
# Use print or printf iff they are builtin.
# XXX note that this causes problems, when make decides
# there is no need to use a shell, so avoid where possible.
.if ${type print 2> /dev/null || echo:L:sh:Mbuiltin} != ""
.if ${(type print) 2> /dev/null || echo:L:sh:Mbuiltin} != ""
PRINT= print -r --
.elif ${type printf 2> /dev/null || echo:L:sh:Mbuiltin} != ""
.elif ${(type printf) 2> /dev/null || echo:L:sh:Mbuiltin} != ""
PRINT= printf '%s\n'
.else
PRINT= echo
+15 -4
View File
@@ -1,24 +1,35 @@
/* $NetBSD: util.c,v 1.10 2011/06/18 22:39:46 bsiegert Exp $ */
/* $NetBSD: util.c,v 1.12 2013/10/14 23:19:09 joerg Exp $ */
/*
* Missing stuff from OS's
*
* $Id: util.c,v 1.10 2011/06/18 22:39:46 bsiegert Exp $
* $Id: util.c,v 1.12 2013/10/14 23:19:09 joerg Exp $
*/
/*
* Workaround for EasyMiNT 1.70 and 1.83.
* Also needed on Linux systems where sys/ucontext.h sometimes uses __unused
* as field name.
*/
#if defined(__MINT__) || defined(__linux__)
#include <signal.h>
#endif
#include "make.h"
#ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: util.c,v 1.10 2011/06/18 22:39:46 bsiegert Exp $";
static char rcsid[] = "$NetBSD: util.c,v 1.12 2013/10/14 23:19:09 joerg Exp $";
#else
#ifndef lint
__RCSID("$NetBSD: util.c,v 1.10 2011/06/18 22:39:46 bsiegert Exp $");
__RCSID("$NetBSD: util.c,v 1.12 2013/10/14 23:19:09 joerg Exp $");
#endif
#endif
#include <errno.h>
#include <time.h>
/* workaround for EasyMiNT 1.70 and 1.83 */
#if !defined(__MINT__)
#include <signal.h>
#endif
#if !defined(HAVE_STRERROR)
extern int errno, sys_nerr;