pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/parallel/pvm3 Detect NetBSD by `uname -s` == "NetBSD",...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3dee1f07d705
branches:  trunk
changeset: 538198:3dee1f07d705
user:      is <is%pkgsrc.org@localhost>
date:      Thu Jan 31 21:06:22 2008 +0000

description:
Detect NetBSD by `uname -s` == "NetBSD", not by -f /netbsd.
This way, this package even works with netboot setups where no kernel is
in the OS-visible root file system.

diffstat:

 parallel/pvm3/Makefile         |   4 +-
 parallel/pvm3/distinfo         |   4 +-
 parallel/pvm3/patches/patch-ax |  79 +++++++++++++++++++++++++++++++----------
 3 files changed, 63 insertions(+), 24 deletions(-)

diffs (135 lines):

diff -r c2183231767c -r 3dee1f07d705 parallel/pvm3/Makefile
--- a/parallel/pvm3/Makefile    Thu Jan 31 20:42:29 2008 +0000
+++ b/parallel/pvm3/Makefile    Thu Jan 31 21:06:22 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2008/01/31 19:04:09 tnn Exp $
+# $NetBSD: Makefile,v 1.51 2008/01/31 21:06:22 is Exp $
 
 DISTNAME=      pvm3.4.5
 PKGNAME=       pvm-3.4.5
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    parallel
 MASTER_SITES=  http://www.netlib.org/pvm3/
 EXTRACT_SUFX=  .tgz
diff -r c2183231767c -r 3dee1f07d705 parallel/pvm3/distinfo
--- a/parallel/pvm3/distinfo    Thu Jan 31 20:42:29 2008 +0000
+++ b/parallel/pvm3/distinfo    Thu Jan 31 21:06:22 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2007/10/14 11:33:31 rillig Exp $
+$NetBSD: distinfo,v 1.25 2008/01/31 21:06:22 is Exp $
 
 SHA1 (pvm3.4.5.tgz) = c14946a4591c4f258380a20b478ee837ad69d985
 RMD160 (pvm3.4.5.tgz) = 22244c42a964d74ada43fb1379d7b4179afc7f9e
@@ -26,7 +26,7 @@
 SHA1 (patch-au) = 4c560b4b3c90088e2dc471951f696a1c5f4ef8dd
 SHA1 (patch-av) = d6fb408d0c0237b503c9d58ebee17b6ca4d55d24
 SHA1 (patch-aw) = a97cdb684b24d7a4b0bcaea0814ebebfb9687b7d
-SHA1 (patch-ax) = fe4208c9f89399be830cdd2a09c987551868e742
+SHA1 (patch-ax) = 68cf11ac97845e4cc03ca8b091663a7068e13227
 SHA1 (patch-ay) = 5006d9f76dbb536f3d1280dda92920a790d90da1
 SHA1 (patch-az) = 8f3879e1c734406ae4d6752c025d42925a56893a
 SHA1 (patch-ba) = c89743b7d09ce32700a1a3c1c2c0735962523416
diff -r c2183231767c -r 3dee1f07d705 parallel/pvm3/patches/patch-ax
--- a/parallel/pvm3/patches/patch-ax    Thu Jan 31 20:42:29 2008 +0000
+++ b/parallel/pvm3/patches/patch-ax    Thu Jan 31 21:06:22 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.6 2006/01/27 16:34:36 joerg Exp $
+$NetBSD: patch-ax,v 1.7 2008/01/31 21:06:22 is Exp $
 
 --- lib/pvmgetarch.orig        2004-02-03 20:12:05.000000000 +0000
-+++ lib/pvmgetarch
-@@ -78,6 +78,7 @@ if [ -f /bin/uname -o -f /usr/bin/uname 
++++ lib/pvmgetarch     2008-01-31 14:49:48.000000000 +0000
+@@ -78,6 +78,7 @@
        Linux,m68k )            ARCH=LINUXATARI ;;
        BSD/OS,i[3456]86 )      ARCH=BSD386 ;;
        FreeBSD,i[3456]86 )     ARCH=FREEBSD ;;
@@ -10,31 +10,70 @@
        FreeBSD,alpha )         ARCH=FREEBSD ;;
        SUPER-UX,SX-3 )         ARCH=SX3 ;;
        uts,* )                 ARCH=UTS2 ;;
-@@ -143,17 +144,27 @@ if [ "$ARCH" = UNKNOWN ]; then
-               # sun3)   ARCH=NETBSDSUN3 ;;  --> NETBSDM68K
-               case "`/usr/bin/uname -p`" in
-               alpha)   ARCH=NETBSDALPHA ;;
+@@ -87,6 +88,37 @@
+       CYGWIN*,i[3456]86 )     ARCH=CYGWIN ;;
+       Darwin,* )              ARCH=DARWIN ;;
+       Rhapsody,"Power Macintosh" )    ARCH=MACOSX ;;
++      NetBSD,*) 
++              # amiga)  ARCH=NETBSDAMIGA ;;  --> NETBSDM68K
++              # hp300)  ARCH=NETBSDHP300 ;;  --> NETBSDM68K
++              # mac68k) ARCH=NETBSDMAC68K ;;  --> NETBSDM68K
++              # pmax)   ARCH=NETBSDPMAX ;;  --> NETBSDMIPSEL
++              # sun3)   ARCH=NETBSDSUN3 ;;  --> NETBSDM68K
++              case "`/usr/bin/uname -p`" in
++              alpha)   ARCH=NETBSDALPHA ;;
 +              arm)     ARCH=NETBSDARM ;;
-               arm32)   ARCH=NETBSDARM32 ;;
++              arm32)   ARCH=NETBSDARM32 ;;
 +              armeb)   ARCH=NETBSDARMEB ;;
 +              hppa)    ARCH=NETBSDHPPA ;;
-               i386)    ARCH=NETBSDI386 ;;
++              i386)    ARCH=NETBSDI386 ;;
 +              m68000)  ARCH=NETBSDM68000 ;;
-               m68k)    ARCH=NETBSDM68K ;;
-               mipseb)  ARCH=NETBSDMIPSEB ;;
-               mipsel)  ARCH=NETBSDMIPSEL ;;
-               ns32k)   ARCH=NETBSDNS32K ;;
++              m68k)    ARCH=NETBSDM68K ;;
++              mipseb)  ARCH=NETBSDMIPSEB ;;
++              mipsel)  ARCH=NETBSDMIPSEL ;;
++              ns32k)   ARCH=NETBSDNS32K ;;
 +              pdp10)   ARCH=NETBSDPDP10 ;;
-               powerpc) ARCH=NETBSDPOWERPC ;;
-               sh3)     ARCH=NETBSDSH3 ;;
++              powerpc) ARCH=NETBSDPOWERPC ;;
++              sh3)     ARCH=NETBSDSH3 ;;
 +              sh3eb)   ARCH=NETBSDSH3EB ;;
 +              sh3el)   ARCH=NETBSDSH3EL ;;
 +              sh5eb)   ARCH=NETBSDSH5EB ;;
 +              sh5el)   ARCH=NETBSDSH5EL ;;
-               sparc)   ARCH=NETBSDSPARC ;;
-               sparc64) ARCH=NETBSDSPARC64 ;;
-               vax)     ARCH=NETBSDVAX ;;
++              sparc)   ARCH=NETBSDSPARC ;;
++              sparc64) ARCH=NETBSDSPARC64 ;;
++              vax)     ARCH=NETBSDVAX ;;
 +              x86_64)  ARCH=NETBSDX86_64 ;;
++              esac
++              ;;
+       esac
+ fi
+ 
+@@ -135,27 +167,7 @@
+       if [ -f /dynix ]; then ARCH=SYMM; fi
+       if [ -f /bin/titan ]; then ARCH=TITN; fi
+ 
+-      if [ -f /netbsd ]; then
+-              # amiga)  ARCH=NETBSDAMIGA ;;  --> NETBSDM68K
+-              # hp300)  ARCH=NETBSDHP300 ;;  --> NETBSDM68K
+-              # mac68k) ARCH=NETBSDMAC68K ;;  --> NETBSDM68K
+-              # pmax)   ARCH=NETBSDPMAX ;;  --> NETBSDMIPSEL
+-              # sun3)   ARCH=NETBSDSUN3 ;;  --> NETBSDM68K
+-              case "`/usr/bin/uname -p`" in
+-              alpha)   ARCH=NETBSDALPHA ;;
+-              arm32)   ARCH=NETBSDARM32 ;;
+-              i386)    ARCH=NETBSDI386 ;;
+-              m68k)    ARCH=NETBSDM68K ;;
+-              mipseb)  ARCH=NETBSDMIPSEB ;;
+-              mipsel)  ARCH=NETBSDMIPSEL ;;
+-              ns32k)   ARCH=NETBSDNS32K ;;
+-              powerpc) ARCH=NETBSDPOWERPC ;;
+-              sh3)     ARCH=NETBSDSH3 ;;
+-              sparc)   ARCH=NETBSDSPARC ;;
+-              sparc64) ARCH=NETBSDSPARC64 ;;
+-              vax)     ARCH=NETBSDVAX ;;
+-              esac
+-      elif [ -f /usr/bin/machine ]; then
++      if [ -f /usr/bin/machine ]; then
+               case "`/usr/bin/machine`" in
+               i386 ) ARCH=BSD386 ;;
                esac
-       elif [ -f /usr/bin/machine ]; then
-               case "`/usr/bin/machine`" in



Home | Main Index | Thread Index | Old Index