[pkgsrc/trunk]: pkgsrc/devel/bmake Bump version to 20140314

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/584d18e6343b
branches:  trunk
changeset: 632057:584d18e6343b
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Mar 14 21:59:34 2014 +0000

description:
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:

 devel/bmake/Makefile         |   4 ++--
 devel/bmake/files/dir.h      |   8 ++++----
 devel/bmake/files/machine.sh |   7 ++++++-
 devel/bmake/files/make.h     |  13 ++++++++++++-
 devel/bmake/files/os.sh      |   7 ++++++-
 5 files changed, 30 insertions(+), 9 deletions(-)

diffs (113 lines):

diff -r 6ad6307db064 -r 584d18e6343b devel/bmake/Makefile
--- a/devel/bmake/Makefile      Fri Mar 14 21:54:25 2014 +0000
+++ b/devel/bmake/Makefile      Fri Mar 14 21:59:34 2014 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2014/02/16 08:55:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2014/03/14 21:59:34 ryoon Exp $
 
-DISTNAME=      bmake-20140214
+DISTNAME=      bmake-20140314
 CATEGORIES=    devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 6ad6307db064 -r 584d18e6343b devel/bmake/files/dir.h
--- a/devel/bmake/files/dir.h   Fri Mar 14 21:54:25 2014 +0000
+++ b/devel/bmake/files/dir.h   Fri Mar 14 21:59:34 2014 +0000
@@ -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_Destroy(void *);
 void * Dir_CopyDir(void *);
 
-#endif /* _DIR */
+#endif /* _DIR_H */
diff -r 6ad6307db064 -r 584d18e6343b devel/bmake/files/machine.sh
--- a/devel/bmake/files/machine.sh      Fri Mar 14 21:54:25 2014 +0000
+++ b/devel/bmake/files/machine.sh      Fri Mar 14 21:59:34 2014 +0000
@@ -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 @@
 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 -r 6ad6307db064 -r 584d18e6343b devel/bmake/files/make.h
--- a/devel/bmake/files/make.h  Fri Mar 14 21:54:25 2014 +0000
+++ b/devel/bmake/files/make.h  Fri Mar 14 21:59:34 2014 +0000
@@ -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 -r 6ad6307db064 -r 584d18e6343b devel/bmake/files/os.sh
--- a/devel/bmake/files/os.sh   Fri Mar 14 21:54:25 2014 +0000
+++ b/devel/bmake/files/os.sh   Fri Mar 14 21:59:34 2014 +0000
@@ -17,7 +17,7 @@
 #      Simon J. Gerraty <sjg%crufty.net@localhost>
 
 # 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 @@
 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`}