Update skill to 4.1.4.

Based on patch provided by Yakovetsky Vladimir in PR 36788.
Add target for FreeBSD and Linux (and IRIX/OSF/AIX/HUPX, not tested).
XXX: Should use distribution's Config script instead?

4.1.2: Minor feature enhancements
This release features support for Cygwin. It validates on Solaris 5.9-10, HP-UX
11.23, and FreeBSD 5.3. There is an HP-UX 64-bit fix. The FreeBSD 5.x special
proc handling was improved, and there were some minor cleanups.

4.1.3: Minor feature enhancements
This release adds support for AIX v5. It has a work-around for a Solaris issue
where the process open() call would hang.

4.1.4: Minor bugfixes
skill and snice now act on each process only once (for systems like BSD that
return the same Process ID multiple times, once for each instantiated thread).
Support has also been added for FreeBSD 6.2 and HP-UX 11.31.

5 files changed, 55 insertions, 18 deletions

diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index a5e529a3051..f7cef646833 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:13 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2007/10/27 02:52:22 obache Exp $
 #
 
-DISTNAME=	skill-4.1.1
+DISTNAME=	skill-4.1.4
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.flux.utah.edu/pub/skill/
 EXTRACT_SUFX=	.tgz
@@ -24,6 +24,19 @@ CPPFLAGS+=	-DHAS_STRERROR=1
 .elif ${OPSYS} == "SunOS"
 BINMODE=	02555
 MAKE_ENV+=	OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS=
+.elif ${OPSYS} == "FreeBSD"
+MAKE_ENV+=	OPSYS=nbsd-44
+.elif ${OPSYS} == "Linux"
+MAKE_ENV+=	OPSYS=linux-1
+CPPFLAGS+=	-DHAS_STRERROR=1
+.elif ${OPSYS} == "IRIX"
+MAKE_ENV+=	OPSYS=irix5
+.elif ${OPSYS} == "OSF"
+MAKE_ENV+=	OPSYS=mach-3
+.elif ${OPSYS} == "AIX"
+MAKE_ENV+=	OPSYS=aix-3
+.elif ${OPSYS} == "HPUX"
+MAKE_ENV+=	OPSYS=hpux-10
 .endif
 
 pre-install:
diff --git a/sysutils/skill/distinfo b/sysutils/skill/distinfo
index fef956087ce..1d9f9f30324 100644
--- a/sysutils/skill/distinfo
+++ b/sysutils/skill/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/12/06 13:27:01 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/10/27 02:52:23 obache Exp $
 
-SHA1 (skill-4.1.1.tgz) = f208730838abff3b3a824c767a963558fe5ee0ed
-RMD160 (skill-4.1.1.tgz) = a32fff409258227bf7c695c1714fde321d9b51a1
-Size (skill-4.1.1.tgz) = 45614 bytes
-SHA1 (patch-aa) = 99e982b6ca126a3844b9e056336276bdf1a062f1
-SHA1 (patch-ab) = 7953603ec4c8e1f9b0c690acef50d51432db7f1e
+SHA1 (skill-4.1.4.tgz) = 8a8dff9dbf9f1aa382887c142ac4dc205d7ddbf3
+RMD160 (skill-4.1.4.tgz) = e28e035879ecb66b6117133caf7ad05f00758371
+Size (skill-4.1.4.tgz) = 46349 bytes
+SHA1 (patch-aa) = 559a2cfec2c9395b88009042f50a017ffecd13d4
+SHA1 (patch-ab) = 20b64bdea73d123c3b10c086e7224f6bd67a04fd
+SHA1 (patch-ac) = 16c56baba8b2aecc6b0593c7e32669eaed54d8c5
diff --git a/sysutils/skill/patches/patch-aa b/sysutils/skill/patches/patch-aa
index 8ba945cea5e..ffbde057eaa 100644
--- a/sysutils/skill/patches/patch-aa
+++ b/sysutils/skill/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2002/06/28 10:45:32 abs Exp $
+$NetBSD: patch-aa,v 1.12 2007/10/27 02:52:23 obache Exp $
 
---- Makefile.orig	Sat Apr  6 05:53:39 2002
+--- Makefile.orig	2007-05-04 20:57:23.000000000 +0000
 +++ Makefile
-@@ -59,15 +59,15 @@ PREFIX=	/usr/local
+@@ -62,15 +62,15 @@ PREFIX=	/usr/local
  
  # CONFIGURE: Set location of executable, it's group and mode.
  BINDIR=	${PREFIX}/bin
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.11 2002/06/28 10:45:32 abs Exp $
  
  # CONFIGURE(Config): Add any OS-specific options here.
  COPTS=	
-@@ -79,7 +79,7 @@ SRCS=	main.c argparse.c getproc.c
+@@ -82,7 +82,7 @@ SRCS=	main.c argparse.c getproc.c
  OBJS=	main.o argparse.o getproc.o
  HDRS=	conf.h
  
@@ -30,9 +30,14 @@ $NetBSD: patch-aa,v 1.11 2002/06/28 10:45:32 abs Exp $
  
  all:	skill
  
-@@ -94,20 +94,20 @@ ${OBJS}: ${HDRS}
+@@ -96,23 +96,23 @@ getproc.c:
+ ${OBJS}: ${HDRS}
  
  install: skill
+-	-test -d ${DESTDIR}/${BINDIR} || mkdir -p -m 755 ${DESTDIR}/${BINDIR}
+-	-test -d ${DESTDIR}/${MANDIR} || mkdir -p -m 755 ${DESTDIR}/${MANDIR}
++#	-test -d ${DESTDIR}/${BINDIR} || mkdir -p -m 755 ${DESTDIR}/${BINDIR}
++#	-test -d ${DESTDIR}/${MANDIR} || mkdir -p -m 755 ${DESTDIR}/${MANDIR}
  #(SysV)	filepriv -d ${DESTDIR}/${BINDIR}/skill
 -	rm -f ${DESTDIR}/${BINDIR}/skill ${DESTDIR}/${MANDIR}/skill.${MANSFX}
 -	rm -f ${DESTDIR}/${BINDIR}/snice ${DESTDIR}/${MANDIR}/snice.${MANSFX}
diff --git a/sysutils/skill/patches/patch-ab b/sysutils/skill/patches/patch-ab
index 4ad1841e4cb..af70c3b7f79 100644
--- a/sysutils/skill/patches/patch-ab
+++ b/sysutils/skill/patches/patch-ab
@@ -1,9 +1,14 @@
-$NetBSD: patch-ab,v 1.12 2005/12/06 13:27:01 joerg Exp $
+$NetBSD: patch-ab,v 1.13 2007/10/27 02:52:23 obache Exp $
 
---- main.c.orig	2003-08-19 00:36:08.000000000 +0000
+--- main.c.orig	2007-05-04 20:56:20.000000000 +0000
 +++ main.c
-@@ -46,6 +46,13 @@ const char *CopyrightVersion = "%s %s\n\
+@@ -44,8 +44,18 @@ const char *CopyrightVersion = "%s %s\n\
+ #include "conf.h"
+ 
  #include <stdio.h>
++#ifdef __STDC__
++#include <stdlib.h>
++#endif
  #include <errno.h>
  #include <pwd.h>
 +#ifdef __NetBSD__
@@ -16,7 +21,7 @@ $NetBSD: patch-ab,v 1.12 2005/12/06 13:27:01 joerg Exp $
  
  /*
   * Processes which could not be checked -- usually due to permission
-@@ -137,7 +144,7 @@ main(argc, argv)
+@@ -137,7 +147,7 @@ main(argc, argv)
  			for (i = 0; i < CmdIndx; i++) {
  				cmdp = (CmdList + i);
  				if ((cmdp->flags & CMD_FLAG_EXACT) != 0 &&
@@ -25,7 +30,7 @@ $NetBSD: patch-ab,v 1.12 2005/12/06 13:27:01 joerg Exp $
  					break;
  				else if ((cmdp->flags & CMD_FLAG_REGEX) != 0 &&
  						RegexMatch(CMD, cmdp) != 0)
-@@ -330,8 +337,6 @@ Usage(error)
+@@ -384,8 +394,6 @@ Usage(error)
  char *
  SysErr()
  {
diff --git a/sysutils/skill/patches/patch-ac b/sysutils/skill/patches/patch-ac
new file mode 100644
index 00000000000..c0715d64823
--- /dev/null
+++ b/sysutils/skill/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/10/27 02:52:23 obache Exp $
+
+--- argparse.c.orig	2005-04-06 23:43:29.000000000 +0000
++++ argparse.c
+@@ -30,5 +30,8 @@ #undef	NO_AEXTERN
+ 
+ #include <stdio.h>
++#ifdef __STDC__
++#include <stdlib.h>
++#endif
+ #include <ctype.h>
+ #include <pwd.h>
+