diff options
| author | abs <abs@pkgsrc.org> | 2006-08-19 23:34:54 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2006-08-19 23:34:54 +0000 |
| commit | 1d7922597664f9d8c65b5aacc99fbb27c370ccb5 (patch) | |
| tree | a6d8eb1cd93095adb0f7bf4aed29047947b2e2f2 /net | |
| parent | cade4817e57dde7ff5a3cfb658aa447e6749dfc5 (diff) | |
| download | pkgsrc-1d7922597664f9d8c65b5aacc99fbb27c370ccb5.tar.gz | |
If guessing OS type has to have a '*4.0*' entry to try to match svr4,
at least have it after matching specific other OS versions, such as...
'netbsd' (netbsd 4.0 anyone?)
Diffstat (limited to 'net')
| -rw-r--r-- | net/rdist6/distinfo | 4 | ||||
| -rw-r--r-- | net/rdist6/patches/patch-ag | 28 |
2 files changed, 27 insertions, 5 deletions
diff --git a/net/rdist6/distinfo b/net/rdist6/distinfo index 2ff02d0390b..1095190b2c5 100644 --- a/net/rdist6/distinfo +++ b/net/rdist6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2006/03/23 13:41:41 joerg Exp $ +$NetBSD: distinfo,v 1.9 2006/08/19 23:34:54 abs Exp $ SHA1 (freerdist-0.92.tar.gz) = 84db4efd8d223a7e10d62e386349aa9236f71ae3 RMD160 (freerdist-0.92.tar.gz) = 2106cbf21fbe6fda2738d2e9e2d750625eb8c2da @@ -9,7 +9,7 @@ SHA1 (patch-ac) = 78df932333c8742139368abb5d12b910d34e222c SHA1 (patch-ad) = 89500d25dc2fb34c0295836f7ab18433218c85ea SHA1 (patch-ae) = 2bcbce70c6228b34c13082e6a2b82f67f02389f8 SHA1 (patch-af) = c91cfab8609a6b8fe0df051ac8a2d29154ff5aad -SHA1 (patch-ag) = 89112bbb65a879949a2d3cb33ec412a8a4a75685 +SHA1 (patch-ag) = 0049876208f0466b6a725bb4bc04097ed603c89c SHA1 (patch-ai) = 3f96e7440fe4ac5d6180a4137806fe70e2033565 SHA1 (patch-aj) = db6307ff40a8db7428fc23f7cfd40a3152c465dc SHA1 (patch-ak) = a65735786a4cbe19874e83cdc8ac2d6aadb8c14e diff --git a/net/rdist6/patches/patch-ag b/net/rdist6/patches/patch-ag index bb7d7b13ae2..76f62471b95 100644 --- a/net/rdist6/patches/patch-ag +++ b/net/rdist6/patches/patch-ag @@ -1,8 +1,16 @@ -$NetBSD: patch-ag,v 1.3 2006/03/23 13:41:41 joerg Exp $ +$NetBSD: patch-ag,v 1.4 2006/08/19 23:34:54 abs Exp $ ---- config/os-type.orig 2006-03-23 13:11:00.000000000 +0000 +--- config/os-type.orig 1999-08-04 16:57:30.000000000 +0100 +++ config/os-type -@@ -102,6 +102,7 @@ if [ -z "${OS}" -a ! -z "${uname}" ]; th +@@ -75,7 +75,6 @@ fi + if [ -z "${OS}" -a ! -z "${uname}" ]; then + case "`$uname -a | tr '[A-Z]' '[a-z]'`" in + "osf1"*) OS="osf1";; +- *"4.0"*) OS=svr4;; # There has to be a better way + *" dcosx "*) OS=dcosx;; + *"cx/ux"*) OS=cxux;; + *"hp-ux"*) OS=hpux;; # HP-UX 9.x +@@ -102,6 +101,7 @@ if [ -z "${OS}" -a ! -z "${uname}" ]; th "linux"*) OS=linux;; "netbsd"*) OS="${osname}";; "freebsd"*) OS="${osname}${osmajver}";; @@ -10,3 +18,17 @@ $NetBSD: patch-ag,v 1.3 2006/03/23 13:41:41 joerg Exp $ "openbsd"*) OS="${osname}";; "dgux"*) OS=dgux;; "unicos"*) OS=unicos;; +@@ -109,6 +109,13 @@ if [ -z "${OS}" -a ! -z "${uname}" ]; th + esac + fi + ++# At least do this _after_ the above to avoid some false matches ++if [ -z "${OS}" -a ! -z "${uname}" ]; then ++ case "`$uname -a | tr '[A-Z]' '[a-z]'`" in ++ *"4.0"*) OS=svr4;; # There has to be a better way ++ esac ++fi ++ + # + # NeXTStep specific. + # |