diff options
| author | christos <christos> | 2002-12-11 22:35:55 +0000 |
|---|---|---|
| committer | christos <christos> | 2002-12-11 22:35:55 +0000 |
| commit | b4cb257f758f990a9c0fbbc88e46568f092a5382 (patch) | |
| tree | 671fc8a7887abe7c38c5a35d2676f0bf88f007a5 /sysutils | |
| parent | a3c31a0630e876d068624a5ccc37dd00c0d39a76 (diff) | |
| download | pkgsrc-b4cb257f758f990a9c0fbbc88e46568f092a5382.tar.gz | |
comment out all the old swap code, because <sys/map.h> is no more.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xosview/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xosview/patches/patch-ah | 62 |
2 files changed, 64 insertions, 1 deletions
diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo index 96985c281d3..5b6bf284306 100644 --- a/sysutils/xosview/distinfo +++ b/sysutils/xosview/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/12/11 21:38:20 christos Exp $ +$NetBSD: distinfo,v 1.4 2002/12/11 22:35:55 christos Exp $ SHA1 (xosview-1.7.0.b.tar.gz) = 7f3053e0e8300995eb16421b0840cfbe9c4c7d07 Size (xosview-1.7.0.b.tar.gz) = 134985 bytes @@ -9,3 +9,4 @@ SHA1 (patch-ad) = 594bea4feb45b082c9e4809044cbeaafba81c53e SHA1 (patch-ae) = 4d8d3dd05040129ba3380dafefc6f311bf2c3e57 SHA1 (patch-af) = a9b1cfa4f00526e884239af1514c1b4eecd98a4e SHA1 (patch-ag) = 1b4e4cb5e8ba1a732eb57b44f5e41562b219d9ac +SHA1 (patch-ah) = a566d00f2035e41db8bfe265f27e3177e9915ee8 diff --git a/sysutils/xosview/patches/patch-ah b/sysutils/xosview/patches/patch-ah new file mode 100644 index 00000000000..e807bca1ce2 --- /dev/null +++ b/sysutils/xosview/patches/patch-ah @@ -0,0 +1,62 @@ +$NetBSD: patch-ah,v 1.1 2002/12/11 22:35:56 christos Exp $ + +--- bsd/swapinternal.cc.orig Tue Feb 16 09:09:21 1999 ++++ bsd/swapinternal.cc Wed Dec 11 17:33:24 2002 +@@ -68,8 +68,10 @@ + #ifdef XOSVIEW_FREEBSD + #include <sys/rlist.h> + #else ++#ifndef HAVE_SWAPCTL + #include <sys/map.h> /* For struct mapent. */ + #endif ++#endif + + #include <kvm.h> /* For all sorts of stuff. */ + #ifndef HAVE_SWAPCTL +@@ -118,10 +120,12 @@ + #ifdef XOSVIEW_FREEBSD + static struct rlisthdr swaplist; + #else ++#ifndef HAVE_SWAPCTL + static int nswapmap; + static struct map *swapmap, *kswapmap; + static struct mapent *mp; + #endif ++#endif + static int nfree; + + #define SVAR(var) __STRING(var) /* to force expansion */ +@@ -174,6 +178,7 @@ + KGET1(VM_SWDEVT, &ptr, sizeof ptr, "swdevt"); + KGET2(ptr, sw, (signed) (nswdev * sizeof(*sw)), "*swdevt"); + #else /* XOSVIEW_FREEBSD */ ++#ifndef HAVE_SWAPCTL + KGET(VM_NSWAPMAP, nswapmap); + KGET(VM_SWAPMAP, kswapmap); /* kernel `swapmap' is a pointer */ + if ((sw = (struct swdevt*) malloc(nswdev * sizeof(*sw))) == NULL || +@@ -184,6 +189,9 @@ + return (0); + } + KGET1(VM_SWDEVT, sw, (signed) (nswdev * sizeof(*sw)), "swdevt"); ++#else ++ return(0); ++#endif + #endif /* XOSVIEW_FREEBSD */ + once = 1; + return (1); +@@ -243,6 +251,7 @@ + void + fetchswap() + { ++#ifndef HAVE_SWAPCTL + int s, e, i; + int elast; + struct mapent* localmp; +@@ -299,6 +308,7 @@ + s = bound; + } + } ++#endif + } + #endif /* XOSVIEW_FREEBSD */ + |