[pkgsrc/trunk]: pkgsrc/www/analog Fix accouting of various BSD flavours in op...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2108300d276a
branches:  trunk
changeset: 479051:2108300d276a
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Aug 04 10:51:38 2004 +0000

description:
Fix accouting of various BSD flavours in operating system report. Problem
noted by Noriyuki Soda. Bump package revision after this change.

diffstat:

 www/analog/Makefile         |   3 ++-
 www/analog/distinfo         |   4 ++--
 www/analog/patches/patch-ab |  22 +++++++++++-----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diffs (61 lines):

diff -r 3b09daea4ce4 -r 2108300d276a www/analog/Makefile
--- a/www/analog/Makefile       Wed Aug 04 09:36:16 2004 +0000
+++ b/www/analog/Makefile       Wed Aug 04 10:51:38 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2004/01/20 12:27:57 agc Exp $
+# $NetBSD: Makefile,v 1.43 2004/08/04 10:51:38 tron Exp $
 
 DISTNAME=       analog-5.32
 CATEGORIES=    www
+PKGREVISION=   1
 MASTER_SITES=   ${HOMEPAGE} \
                http://www.web42.com/analog/ \
                http://www.statslab.cam.ac.uk/~sret1/analog/ \
diff -r 3b09daea4ce4 -r 2108300d276a www/analog/distinfo
--- a/www/analog/distinfo       Wed Aug 04 09:36:16 2004 +0000
+++ b/www/analog/distinfo       Wed Aug 04 10:51:38 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2003/03/23 21:47:57 tron Exp $
+$NetBSD: distinfo,v 1.18 2004/08/04 10:51:38 tron Exp $
 
 SHA1 (analog-5.32.tar.gz) = 81cd8c018663f905ce8c11175ca826f019765b4d
 Size (analog-5.32.tar.gz) = 1428349 bytes
 SHA1 (patch-aa) = 736bd5c425ec88b62d5d3873367bd3ee134b030c
-SHA1 (patch-ab) = 314ac78baceeb6a4e08e32c11edb1f8ecaf63f5d
+SHA1 (patch-ab) = e59f91bedf08f4ece6b36ee06bc8d7d7742948c4
diff -r 3b09daea4ce4 -r 2108300d276a www/analog/patches/patch-ab
--- a/www/analog/patches/patch-ab       Wed Aug 04 09:36:16 2004 +0000
+++ b/www/analog/patches/patch-ab       Wed Aug 04 10:51:38 2004 +0000
@@ -1,21 +1,21 @@
-$NetBSD: patch-ab,v 1.6 2002/12/02 12:08:44 tron Exp $
+$NetBSD: patch-ab,v 1.7 2004/08/04 10:51:38 tron Exp $
 
---- tree.c.orig        Sat Nov 30 16:36:11 2002
-+++ tree.c     Mon Dec  2 12:45:58 2002
-@@ -891,8 +891,16 @@
+--- tree.c.orig        2003-03-23 14:57:02.000000000 +0100
++++ tree.c     2004-08-04 12:47:19.000000000 +0200
+@@ -895,8 +895,16 @@
        *name = "Macintosh";
      else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL)
        *name = "Unix:Linux";
--    else if (strstr(whole, "BSD") != NULL)
-+    else if (strstr(whole, "NetBBSD") != NULL)
-+      *name = "Unix:BSD";
++    else if (strstr(whole, "NetBSD") != NULL)
++      *name = "Unix:NetBSD";
 +    else if (strstr(whole, "FreeBSD") != NULL)
-       *name = "Unix:BSD";
++      *name = "Unix:FreeBSD";
 +    else if (strstr(whole, "OpenBSD") != NULL)
-+      *name = "Unix:BSD";
-+    else if (strstr(whole, "BSDi") != NULL)
++      *name = "Unix:OpenBSD";
++    else if (strstr(whole, "BSDi") != NULL || strstr(whole, "BSD/OS") != NULL)
 +      *name = "Unix:BSDi";
-+    else if (strstr(whole, "BSD") != NULL)
+     else if (strstr(whole, "BSD") != NULL)
+-      *name = "Unix:BSD";
 +      *name = "Unix:otherBSD";
      else if (strstr(whole, "SunOS") != NULL || strstr(whole, "sunos") != NULL)
        *name = "Unix:SunOS";