${UVM} cleanup: while we're at it, make the package work again, and

upgrade it to 3.7@P7, also called 3.7.8

5 files changed, 36 insertions, 22 deletions

diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index bd7bfb52723..3c847ebc67d 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1999/10/05 00:57:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2000/02/19 02:03:11 wiz Exp $
 #
 # The version number for skill does not match the @P number.
 # This is normal.
 
-DISTNAME=	skill-3.7@P6
-PKGNAME=	skill-3.7.7
+DISTNAME=	skill-3.7@P7
+PKGNAME=	skill-3.7.8
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://fast.cs.utah.edu/pub/skill/
@@ -16,8 +16,6 @@ BINMODE=	02555
 
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_ENV+=	UVM=${UVM}
-
 .if ${OPSYS} == "NetBSD"
 MAKE_ENV+=	OSTYPE=bsd-44 BINGRP=kmem
 .elif ${OPSYS} == "SunOS"
diff --git a/sysutils/skill/files/md5 b/sysutils/skill/files/md5
index e603961e903..4db065c6e82 100644
--- a/sysutils/skill/files/md5
+++ b/sysutils/skill/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/01/05 19:12:00 kim Exp $
+$NetBSD: md5,v 1.5 2000/02/19 02:03:13 wiz Exp $
 
-MD5 (skill-3.7@P6_tar.Z) = 5e7a53006012e6314215465f79e1cab8
+MD5 (skill-3.7@P7_tar.Z) = fa764e00a751c95d30307b605183e626
diff --git a/sysutils/skill/files/patch-sum b/sysutils/skill/files/patch-sum
index f7397267afa..26488d15842 100644
--- a/sysutils/skill/files/patch-sum
+++ b/sysutils/skill/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/09/27 13:29:41 agc Exp $
+$NetBSD: patch-sum,v 1.3 2000/02/19 02:03:13 wiz Exp $
 
-MD5 (patch-aa) = b12ca8c7059b2daf6a59689c7ed2d6c3
+MD5 (patch-aa) = 5d6f3e8a25d01c34fc5b864cae1d02be
+MD5 (patch-ab) = 3485a6aac010683afb08fe538288a2cf
diff --git a/sysutils/skill/patches/patch-aa b/sysutils/skill/patches/patch-aa
index cd05de9914a..44e579bbf2f 100644
--- a/sysutils/skill/patches/patch-aa
+++ b/sysutils/skill/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 1999/09/27 13:28:57 agc Exp $
+$NetBSD: patch-aa,v 1.5 2000/02/19 02:03:13 wiz Exp $
 
---- Makefile.orig	Wed Oct 28 16:20:26 1998
-+++ Makefile	Mon Sep 27 14:18:52 1999
-@@ -51,22 +51,29 @@
+--- ./Makefile.orig	Wed Oct 28 17:20:26 1998
++++ ./Makefile	Sat Feb 19 02:39:40 2000
+@@ -51,22 +51,22 @@
  SHELL=	/bin/sh
  
  # CONFIGURE: Set location of executable, it's group and mode.
@@ -23,22 +23,16 @@ $NetBSD: patch-aa,v 1.4 1999/09/27 13:28:57 agc Exp $
 +#OSTYPE=	bsd-44
  
  # CONFIGURE(Config): Add any OS-specific options here.
- COPTS=	
+-COPTS=	
++COPTS=	-DUVM
  
-+.ifndef UVM
-+UVM=
-+.endif
-+.if ${UVM} != ""
-+COPTS+= -DUVM
-+.endif
-+
  # CONFIGURE(Config): Add any special libraries your system needs.
 -LIBS=	
 +LIBS=	-lkvm
  
  SRCS=	main.c argparse.c getproc.c
  OBJS=	main.o argparse.o getproc.o
-@@ -87,20 +94,20 @@
+@@ -87,20 +87,20 @@
  
  install: skill
  #(SysV)	filepriv -d ${DESTDIR}/${BINDIR}/skill
diff --git a/sysutils/skill/patches/patch-ab b/sysutils/skill/patches/patch-ab
new file mode 100644
index 00000000000..1194122fd89
--- /dev/null
+++ b/sysutils/skill/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.3 2000/02/19 02:03:13 wiz Exp $
+
+--- ./machdep/bsd-44.c.orig	Tue Jan  5 18:23:42 1999
++++ ./machdep/bsd-44.c	Sat Feb 19 02:51:38 2000
+@@ -144,6 +144,7 @@
+ #define	_ALLPROCFLAG	KINFO_PROC_ALL
+ #else
+ #include <sys/sysctl.h>
++#include <limits.h>
+ #define	_ALLPROCFLAG	KERN_PROC_ALL
+ #endif
+ 
+@@ -170,7 +171,7 @@
+ 	static int nproc = -1;
+ 	static struct kinfo_proc *aproc;
+ 	static kvm_t *kd = NULL;
+-	char errbuf[256];
++	char errbuf[_POSIX2_LINE_MAX];
+ 
+ 	/*
+ 	 * If this is our first time here, prepare to read procs from kernel.