Thu Jan 31 21:06:22 2008 UTC ()
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.


(is)
diff -r1.50 -r1.51 pkgsrc/parallel/pvm3/Makefile
diff -r1.24 -r1.25 pkgsrc/parallel/pvm3/distinfo
diff -r1.6 -r1.7 pkgsrc/parallel/pvm3/patches/patch-ax
cvs diff -r1.50 -r1.51 pkgsrc/parallel/pvm3/Makefile (expand / switch to unified diff)

--- pkgsrc/parallel/pvm3/Makefile 2008/01/31 19:04:09 1.50
+++ pkgsrc/parallel/pvm3/Makefile 2008/01/31 21:06:22 1.51
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.50 2008/01/31 19:04:09 tnn Exp $ 1# $NetBSD: Makefile,v 1.51 2008/01/31 21:06:22 is Exp $
2 2
3DISTNAME= pvm3.4.5 3DISTNAME= pvm3.4.5
4PKGNAME= pvm-3.4.5 4PKGNAME= pvm-3.4.5
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= parallel 6CATEGORIES= parallel
7MASTER_SITES= http://www.netlib.org/pvm3/ 7MASTER_SITES= http://www.netlib.org/pvm3/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.csm.ornl.gov/pvm/pvm_home.html 11HOMEPAGE= http://www.csm.ornl.gov/pvm/pvm_home.html
12COMMENT= Parallel Virtual Machine libraries and environment 12COMMENT= Parallel Virtual Machine libraries and environment
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15BUILD_DEFS+= PVM_SSH 15BUILD_DEFS+= PVM_SSH
16 16
17.if !defined(PVM_SSH) 17.if !defined(PVM_SSH)
18PKG_FAIL_REASON+= PVM_SSH must be defined by the pkgsrc user. 18PKG_FAIL_REASON+= PVM_SSH must be defined by the pkgsrc user.
cvs diff -r1.24 -r1.25 pkgsrc/parallel/pvm3/distinfo (expand / switch to unified diff)

--- pkgsrc/parallel/pvm3/distinfo 2007/10/14 11:33:31 1.24
+++ pkgsrc/parallel/pvm3/distinfo 2008/01/31 21:06:22 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.24 2007/10/14 11:33:31 rillig Exp $ 1$NetBSD: distinfo,v 1.25 2008/01/31 21:06:22 is Exp $
2 2
3SHA1 (pvm3.4.5.tgz) = c14946a4591c4f258380a20b478ee837ad69d985 3SHA1 (pvm3.4.5.tgz) = c14946a4591c4f258380a20b478ee837ad69d985
4RMD160 (pvm3.4.5.tgz) = 22244c42a964d74ada43fb1379d7b4179afc7f9e 4RMD160 (pvm3.4.5.tgz) = 22244c42a964d74ada43fb1379d7b4179afc7f9e
5Size (pvm3.4.5.tgz) = 979201 bytes 5Size (pvm3.4.5.tgz) = 979201 bytes
6SHA1 (patch-aa) = 01eb70804ffa50549ef2a9fd1d6d7417438053c6 6SHA1 (patch-aa) = 01eb70804ffa50549ef2a9fd1d6d7417438053c6
7SHA1 (patch-ab) = bb34608cab2b1bf0c1a03c3626376ef3fb97627f 7SHA1 (patch-ab) = bb34608cab2b1bf0c1a03c3626376ef3fb97627f
8SHA1 (patch-ac) = e1f512152bfb67c9ebdcb10127c906b27c6c684a 8SHA1 (patch-ac) = e1f512152bfb67c9ebdcb10127c906b27c6c684a
9SHA1 (patch-ad) = 3ae745dc17dc8647110fc5f4571badc0bd21e5ae 9SHA1 (patch-ad) = 3ae745dc17dc8647110fc5f4571badc0bd21e5ae
10SHA1 (patch-ae) = 8b1cd6765adcf86c0e50e8663c3eadac2c43065c 10SHA1 (patch-ae) = 8b1cd6765adcf86c0e50e8663c3eadac2c43065c
11SHA1 (patch-af) = 6cfe6f2b279efea00b6a4588b51a9833e1d5106e 11SHA1 (patch-af) = 6cfe6f2b279efea00b6a4588b51a9833e1d5106e
12SHA1 (patch-ag) = 55545a6ba3c09f27502f44404ac419509ac6ea4e 12SHA1 (patch-ag) = 55545a6ba3c09f27502f44404ac419509ac6ea4e
13SHA1 (patch-ah) = 923137a50581fd376a75571a5db48fb9085f3571 13SHA1 (patch-ah) = 923137a50581fd376a75571a5db48fb9085f3571
14SHA1 (patch-ai) = 9110c92e7c7ed743c8e869346639792dbbf3b820 14SHA1 (patch-ai) = 9110c92e7c7ed743c8e869346639792dbbf3b820
@@ -16,27 +16,27 @@ SHA1 (patch-aj) = 9ee59ba6dfb5bff2b2ade6 @@ -16,27 +16,27 @@ SHA1 (patch-aj) = 9ee59ba6dfb5bff2b2ade6
16SHA1 (patch-ak) = f9161b173975625021cdb2612e6748d937ed2864 16SHA1 (patch-ak) = f9161b173975625021cdb2612e6748d937ed2864
17SHA1 (patch-al) = 64e8161fc96d1b4390dece60dbd5b11a37dc755d 17SHA1 (patch-al) = 64e8161fc96d1b4390dece60dbd5b11a37dc755d
18SHA1 (patch-am) = d006193cdd138fdae3cff9d0621b04839c38c676 18SHA1 (patch-am) = d006193cdd138fdae3cff9d0621b04839c38c676
19SHA1 (patch-an) = 767ea8a9a5e0c5fb96b25c29f93d24d4d34b48a4 19SHA1 (patch-an) = 767ea8a9a5e0c5fb96b25c29f93d24d4d34b48a4
20SHA1 (patch-ao) = 2b29a5d04774d1c796fe8adf28d385a148504c2d 20SHA1 (patch-ao) = 2b29a5d04774d1c796fe8adf28d385a148504c2d
21SHA1 (patch-ap) = 6a3e8d80e45484e991cbefa9cdb64b23761434b9 21SHA1 (patch-ap) = 6a3e8d80e45484e991cbefa9cdb64b23761434b9
22SHA1 (patch-aq) = 6bedbe1d3cb3d7cf7b61a4e6233ac7601173d9f8 22SHA1 (patch-aq) = 6bedbe1d3cb3d7cf7b61a4e6233ac7601173d9f8
23SHA1 (patch-ar) = bc9951cb567cb92d8c978e1ce003855d554eb74e 23SHA1 (patch-ar) = bc9951cb567cb92d8c978e1ce003855d554eb74e
24SHA1 (patch-as) = 2e7cd28b4526e3ef3f3bcf3e9f0446ee3a09c891 24SHA1 (patch-as) = 2e7cd28b4526e3ef3f3bcf3e9f0446ee3a09c891
25SHA1 (patch-at) = f3dbe98951722d41756b36e8e08bc5b25e0733df 25SHA1 (patch-at) = f3dbe98951722d41756b36e8e08bc5b25e0733df
26SHA1 (patch-au) = 4c560b4b3c90088e2dc471951f696a1c5f4ef8dd 26SHA1 (patch-au) = 4c560b4b3c90088e2dc471951f696a1c5f4ef8dd
27SHA1 (patch-av) = d6fb408d0c0237b503c9d58ebee17b6ca4d55d24 27SHA1 (patch-av) = d6fb408d0c0237b503c9d58ebee17b6ca4d55d24
28SHA1 (patch-aw) = a97cdb684b24d7a4b0bcaea0814ebebfb9687b7d 28SHA1 (patch-aw) = a97cdb684b24d7a4b0bcaea0814ebebfb9687b7d
29SHA1 (patch-ax) = fe4208c9f89399be830cdd2a09c987551868e742 29SHA1 (patch-ax) = 68cf11ac97845e4cc03ca8b091663a7068e13227
30SHA1 (patch-ay) = 5006d9f76dbb536f3d1280dda92920a790d90da1 30SHA1 (patch-ay) = 5006d9f76dbb536f3d1280dda92920a790d90da1
31SHA1 (patch-az) = 8f3879e1c734406ae4d6752c025d42925a56893a 31SHA1 (patch-az) = 8f3879e1c734406ae4d6752c025d42925a56893a
32SHA1 (patch-ba) = c89743b7d09ce32700a1a3c1c2c0735962523416 32SHA1 (patch-ba) = c89743b7d09ce32700a1a3c1c2c0735962523416
33SHA1 (patch-bb) = 4e563c280e4bcf94e546797c1d99248ab1ad5008 33SHA1 (patch-bb) = 4e563c280e4bcf94e546797c1d99248ab1ad5008
34SHA1 (patch-bc) = 56cc87dfb11f9a8d4cd93acac3b13643b4eb9fb3 34SHA1 (patch-bc) = 56cc87dfb11f9a8d4cd93acac3b13643b4eb9fb3
35SHA1 (patch-bd) = cf7b76748d17a2ee8f9872b45d35e6ab6429f875 35SHA1 (patch-bd) = cf7b76748d17a2ee8f9872b45d35e6ab6429f875
36SHA1 (patch-be) = 16643c0d2257fac2e3c1957df9fafa59b9030264 36SHA1 (patch-be) = 16643c0d2257fac2e3c1957df9fafa59b9030264
37SHA1 (patch-bf) = ca5dceb87f9dcba715f4b01982924267e1eb5b0d 37SHA1 (patch-bf) = ca5dceb87f9dcba715f4b01982924267e1eb5b0d
38SHA1 (patch-bg) = 8dba3b19231a69bd8fc892cc64e91dfdc457d6d6 38SHA1 (patch-bg) = 8dba3b19231a69bd8fc892cc64e91dfdc457d6d6
39SHA1 (patch-bh) = 16533fdec088fc575c829ed7e09a8647bd17e322 39SHA1 (patch-bh) = 16533fdec088fc575c829ed7e09a8647bd17e322
40SHA1 (patch-bi) = bc5f70135f581d79e27c6da2d3834b9f1efb9fe0 40SHA1 (patch-bi) = bc5f70135f581d79e27c6da2d3834b9f1efb9fe0
41SHA1 (patch-bj) = 1c2817c77e7acf7876625e4b9989982bb80e345e 41SHA1 (patch-bj) = 1c2817c77e7acf7876625e4b9989982bb80e345e
42SHA1 (patch-bk) = a05a60b81c5f02e6998cf8b85a1b5ccb814a13db 42SHA1 (patch-bk) = a05a60b81c5f02e6998cf8b85a1b5ccb814a13db
cvs diff -r1.6 -r1.7 pkgsrc/parallel/pvm3/patches/patch-ax (expand / switch to unified diff)

--- pkgsrc/parallel/pvm3/patches/patch-ax 2006/01/27 16:34:36 1.6
+++ pkgsrc/parallel/pvm3/patches/patch-ax 2008/01/31 21:06:22 1.7
@@ -1,40 +1,79 @@ @@ -1,40 +1,79 @@
1$NetBSD: patch-ax,v 1.6 2006/01/27 16:34:36 joerg Exp $ 1$NetBSD: patch-ax,v 1.7 2008/01/31 21:06:22 is Exp $
2 2
3--- lib/pvmgetarch.orig 2004-02-03 20:12:05.000000000 +0000 3--- lib/pvmgetarch.orig 2004-02-03 20:12:05.000000000 +0000
4+++ lib/pvmgetarch 4+++ lib/pvmgetarch 2008-01-31 14:49:48.000000000 +0000
5@@ -78,6 +78,7 @@ if [ -f /bin/uname -o -f /usr/bin/uname  5@@ -78,6 +78,7 @@
6 Linux,m68k ) ARCH=LINUXATARI ;; 6 Linux,m68k ) ARCH=LINUXATARI ;;
7 BSD/OS,i[3456]86 ) ARCH=BSD386 ;; 7 BSD/OS,i[3456]86 ) ARCH=BSD386 ;;
8 FreeBSD,i[3456]86 ) ARCH=FREEBSD ;; 8 FreeBSD,i[3456]86 ) ARCH=FREEBSD ;;
9+ DragonFly,i[3456]86 ) ARCH=DRAGONFLY ;; 9+ DragonFly,i[3456]86 ) ARCH=DRAGONFLY ;;
10 FreeBSD,alpha ) ARCH=FREEBSD ;; 10 FreeBSD,alpha ) ARCH=FREEBSD ;;
11 SUPER-UX,SX-3 ) ARCH=SX3 ;; 11 SUPER-UX,SX-3 ) ARCH=SX3 ;;
12 uts,* ) ARCH=UTS2 ;; 12 uts,* ) ARCH=UTS2 ;;
13@@ -143,17 +144,27 @@ if [ "$ARCH" = UNKNOWN ]; then 13@@ -87,6 +88,37 @@
14 # sun3) ARCH=NETBSDSUN3 ;; --> NETBSDM68K 14 CYGWIN*,i[3456]86 ) ARCH=CYGWIN ;;
15 case "`/usr/bin/uname -p`" in 15 Darwin,* ) ARCH=DARWIN ;;
16 alpha) ARCH=NETBSDALPHA ;; 16 Rhapsody,"Power Macintosh" ) ARCH=MACOSX ;;
 17+ NetBSD,*)
 18+ # amiga) ARCH=NETBSDAMIGA ;; --> NETBSDM68K
 19+ # hp300) ARCH=NETBSDHP300 ;; --> NETBSDM68K
 20+ # mac68k) ARCH=NETBSDMAC68K ;; --> NETBSDM68K
 21+ # pmax) ARCH=NETBSDPMAX ;; --> NETBSDMIPSEL
 22+ # sun3) ARCH=NETBSDSUN3 ;; --> NETBSDM68K
 23+ case "`/usr/bin/uname -p`" in
 24+ alpha) ARCH=NETBSDALPHA ;;
17+ arm) ARCH=NETBSDARM ;; 25+ arm) ARCH=NETBSDARM ;;
18 arm32) ARCH=NETBSDARM32 ;; 26+ arm32) ARCH=NETBSDARM32 ;;
19+ armeb) ARCH=NETBSDARMEB ;; 27+ armeb) ARCH=NETBSDARMEB ;;
20+ hppa) ARCH=NETBSDHPPA ;; 28+ hppa) ARCH=NETBSDHPPA ;;
21 i386) ARCH=NETBSDI386 ;; 29+ i386) ARCH=NETBSDI386 ;;
22+ m68000) ARCH=NETBSDM68000 ;; 30+ m68000) ARCH=NETBSDM68000 ;;
23 m68k) ARCH=NETBSDM68K ;; 31+ m68k) ARCH=NETBSDM68K ;;
24 mipseb) ARCH=NETBSDMIPSEB ;; 32+ mipseb) ARCH=NETBSDMIPSEB ;;
25 mipsel) ARCH=NETBSDMIPSEL ;; 33+ mipsel) ARCH=NETBSDMIPSEL ;;
26 ns32k) ARCH=NETBSDNS32K ;; 34+ ns32k) ARCH=NETBSDNS32K ;;
27+ pdp10) ARCH=NETBSDPDP10 ;; 35+ pdp10) ARCH=NETBSDPDP10 ;;
28 powerpc) ARCH=NETBSDPOWERPC ;; 36+ powerpc) ARCH=NETBSDPOWERPC ;;
29 sh3) ARCH=NETBSDSH3 ;; 37+ sh3) ARCH=NETBSDSH3 ;;
30+ sh3eb) ARCH=NETBSDSH3EB ;; 38+ sh3eb) ARCH=NETBSDSH3EB ;;
31+ sh3el) ARCH=NETBSDSH3EL ;; 39+ sh3el) ARCH=NETBSDSH3EL ;;
32+ sh5eb) ARCH=NETBSDSH5EB ;; 40+ sh5eb) ARCH=NETBSDSH5EB ;;
33+ sh5el) ARCH=NETBSDSH5EL ;; 41+ sh5el) ARCH=NETBSDSH5EL ;;
34 sparc) ARCH=NETBSDSPARC ;; 42+ sparc) ARCH=NETBSDSPARC ;;
35 sparc64) ARCH=NETBSDSPARC64 ;; 43+ sparc64) ARCH=NETBSDSPARC64 ;;
36 vax) ARCH=NETBSDVAX ;; 44+ vax) ARCH=NETBSDVAX ;;
37+ x86_64) ARCH=NETBSDX86_64 ;; 45+ x86_64) ARCH=NETBSDX86_64 ;;
38 esac 46+ esac
39 elif [ -f /usr/bin/machine ]; then 47+ ;;
 48 esac
 49 fi
 50
 51@@ -135,27 +167,7 @@
 52 if [ -f /dynix ]; then ARCH=SYMM; fi
 53 if [ -f /bin/titan ]; then ARCH=TITN; fi
 54
 55- if [ -f /netbsd ]; then
 56- # amiga) ARCH=NETBSDAMIGA ;; --> NETBSDM68K
 57- # hp300) ARCH=NETBSDHP300 ;; --> NETBSDM68K
 58- # mac68k) ARCH=NETBSDMAC68K ;; --> NETBSDM68K
 59- # pmax) ARCH=NETBSDPMAX ;; --> NETBSDMIPSEL
 60- # sun3) ARCH=NETBSDSUN3 ;; --> NETBSDM68K
 61- case "`/usr/bin/uname -p`" in
 62- alpha) ARCH=NETBSDALPHA ;;
 63- arm32) ARCH=NETBSDARM32 ;;
 64- i386) ARCH=NETBSDI386 ;;
 65- m68k) ARCH=NETBSDM68K ;;
 66- mipseb) ARCH=NETBSDMIPSEB ;;
 67- mipsel) ARCH=NETBSDMIPSEL ;;
 68- ns32k) ARCH=NETBSDNS32K ;;
 69- powerpc) ARCH=NETBSDPOWERPC ;;
 70- sh3) ARCH=NETBSDSH3 ;;
 71- sparc) ARCH=NETBSDSPARC ;;
 72- sparc64) ARCH=NETBSDSPARC64 ;;
 73- vax) ARCH=NETBSDVAX ;;
 74- esac
 75- elif [ -f /usr/bin/machine ]; then
 76+ if [ -f /usr/bin/machine ]; then
40 case "`/usr/bin/machine`" in 77 case "`/usr/bin/machine`" in
 78 i386 ) ARCH=BSD386 ;;
 79 esac