>Number:         22909
>Category:       pkg
>Synopsis:       Fix pkgsrc patch for sysutils/skill
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Sep 23 10:04:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        N/A
>Organization:
British Broadcasting Corporation
>Environment:
SunOS build1 5.9 Generic_112233-01 sun4u sparc SUNW,UltraSPARC-IIi-cEngine
>Description:
skill's patch-ab is NetBSD-specific, and breaks builds on all other
platforms.  The below patch fixes that, and adds a HOMEPAGE to appease
pkglint while here (managed to find one linked from freshmeat.net)

Tested on SunOS-5.9/sparc and NetBSD-1.6ZC/sparc64
>How-To-Repeat:
===> Building for skill-4.1nb2
/home/jonp/pkg/gcc-3.3/bin/gcc -O    -c main.c
main.c: In function `main':
main.c:146: error: `KI_MAXCOMLEN' undeclared (first use in this function)
main.c:146: error: (Each undeclared identifier is reported only once
main.c:146: error: for each function it appears in.)
*** Error code 1
>Fix:
http://www.perkin.org.uk/projects/netbsd/skill.diff

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/skill/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	2002/06/28 10:45:31	1.15
+++ Makefile	2003/09/23 09:58:42
@@ -8,6 +8,7 @@
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kim@tac.nyc.ny.us
+HOMEPAGE=	http://www.cs.utah.edu/~forys/software.html
 COMMENT=	Signal processes given user names, ttys, commands, or pids
 
 .include "../../mk/bsd.prefs.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/skill/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	2002/06/28 10:45:31	1.5
+++ distinfo	2003/09/23 09:58:42
@@ -3,4 +3,4 @@
 SHA1 (skill-4.1.tgz) = d4f548347c34462156276f96185afa9862621338
 Size (skill-4.1.tgz) = 45923 bytes
 SHA1 (patch-aa) = 99e982b6ca126a3844b9e056336276bdf1a062f1
-SHA1 (patch-ab) = 216bb502ec9d7ccc60988e911bb71b33f507fe25
+SHA1 (patch-ab) = 325a0e3aef97341ce9de773b6f6f94d53b42c0ec
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/skill/patches/patch-ab,v
retrieving revision 1.10
diff -u -r1.10 patch-ab
--- patches/patch-ab	2002/06/28 10:45:32	1.10
+++ patches/patch-ab	2003/09/23 09:58:42
@@ -1,21 +1,23 @@
 $NetBSD: patch-ab,v 1.10 2002/06/28 10:45:32 abs Exp $
 
 --- main.c.orig	Sat Apr  6 05:26:01 2002
-+++ main.c
-@@ -46,6 +46,12 @@ const char *CopyrightVersion = "%s %s\n\
++++ main.c	Tue Sep 23 10:53:01 2003
+@@ -46,7 +46,14 @@
  #include <stdio.h>
  #include <errno.h>
  #include <pwd.h>
 +#ifdef __NetBSD__
-+# include <sys/sysctl.h>
-+# ifndef KI_MAXCOMLEN	/* Pre 1.5 */
-+#  define       KI_MAXCOMLEN    24
-+# endif
++#include <sys/sysctl.h>
 +#endif
  
++#ifndef KI_MAXCOMLEN	/* Pre NetBSD/1.5.  Missing on !NetBSD */
++#define KI_MAXCOMLEN	24
++#endif
++
  /*
   * Processes which could not be checked -- usually due to permission
-@@ -137,7 +143,7 @@ main(argc, argv)
+  * problems (SunOS 4.1, SysVR4) -- are tallied in "MissedProcCnt".
+@@ -137,7 +144,7 @@
  			for (i = 0; i < CmdIndx; i++) {
  				cmdp = (CmdList + i);
  				if ((cmdp->flags & CMD_FLAG_EXACT) != 0 &&
>Release-Note:
>Audit-Trail:
>Unformatted: