diff options
| author | ryoon <ryoon@pkgsrc.org> | 2014-03-14 21:59:34 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2014-03-14 21:59:34 +0000 |
| commit | 85b25fa3a58eb7a2c86aaa7213023fe202069d5c (patch) | |
| tree | a2dc8c0ef2bf03151f421d20155f020016436a2c /devel/bmake/files | |
| parent | 59db7bf469e0e5552afabf117820281951a89398 (diff) | |
| download | pkgsrc-85b25fa3a58eb7a2c86aaa7213023fe202069d5c.tar.gz | |
Bump version to 20140314
* Add SCO OpenServer 5.0.7/3.2 support
* Replace _DIR with _DIR_H in dir.h, because SCO OpenServer 5.0.7/3.2 has _DIR
macro in dirent.h
Diffstat (limited to 'devel/bmake/files')
| -rw-r--r-- | devel/bmake/files/dir.h | 8 | ||||
| -rwxr-xr-x | devel/bmake/files/machine.sh | 7 | ||||
| -rw-r--r-- | devel/bmake/files/make.h | 13 | ||||
| -rw-r--r-- | devel/bmake/files/os.sh | 7 |
4 files changed, 28 insertions, 7 deletions
diff --git a/devel/bmake/files/dir.h b/devel/bmake/files/dir.h index 71d54f2df69..d6919cad4bf 100644 --- a/devel/bmake/files/dir.h +++ b/devel/bmake/files/dir.h @@ -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 */ diff --git a/devel/bmake/files/machine.sh b/devel/bmake/files/machine.sh index fdd577ce161..fcf2c2c9ea2 100755 --- a/devel/bmake/files/machine.sh +++ b/devel/bmake/files/machine.sh @@ -2,7 +2,7 @@ # derrived from /etc/rc_d/os.sh # RCSid: -# $Id: machine.sh,v 1.9 2013/09/08 16:32:14 ryoon Exp $ +# $Id: machine.sh,v 1.10 2014/03/14 21:59:34 ryoon Exp $ # # @(#) Copyright (c) 1994-2002 Simon J. Gerraty # @@ -93,6 +93,11 @@ GNU/kFreeBSD) FreeMiNT) MACHINE_ARCH=m68k ;; +SCO_SV) + OSREL=`uname -v` + OSMAJOR=`IFS=.; set $OSREL; echo $1` + MACHINE_ARCH=`uname -m` + ;; esac MACHINE=${MACHINE:-$OS$OSMAJOR} diff --git a/devel/bmake/files/make.h b/devel/bmake/files/make.h index aede918a4d8..e6f2d727db0 100644 --- a/devel/bmake/files/make.h +++ b/devel/bmake/files/make.h @@ -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) \ diff --git a/devel/bmake/files/os.sh b/devel/bmake/files/os.sh index 4cfb463e8a2..1f78f8f9ea5 100644 --- a/devel/bmake/files/os.sh +++ b/devel/bmake/files/os.sh @@ -17,7 +17,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: os.sh,v 1.9 2013/09/08 16:32:14 ryoon Exp $ +# $Id: os.sh,v 1.10 2014/03/14 21:59:34 ryoon Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -201,6 +201,11 @@ GNU/kFreeBSD) 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`} |