diff options
author | abs <abs> | 2002-06-28 10:45:31 +0000 |
---|---|---|
committer | abs <abs> | 2002-06-28 10:45:31 +0000 |
commit | 4f76ffb8fa203b4e1a2ffef944e7f16a760afd32 (patch) | |
tree | 444989dc0420c725ed8a9f80708a3a2ff41a6359 | |
parent | 20a80e13426b253fdcee010a4ec4190c57b1c80c (diff) | |
download | pkgsrc-4f76ffb8fa203b4e1a2ffef944e7f16a760afd32.tar.gz |
Updated skill to 4.1nb2
Fix for pre NetBSD-1.5 systems.
-rw-r--r-- | sysutils/skill/Makefile | 4 | ||||
-rw-r--r-- | sysutils/skill/distinfo | 6 | ||||
-rw-r--r-- | sysutils/skill/patches/patch-aa | 10 | ||||
-rw-r--r-- | sysutils/skill/patches/patch-ab | 11 |
4 files changed, 17 insertions, 14 deletions
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile index 0f48cf0a6c3..d7f16dad314 100644 --- a/sysutils/skill/Makefile +++ b/sysutils/skill/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2002/06/23 14:42:00 kent Exp $ +# $NetBSD: Makefile,v 1.15 2002/06/28 10:45:31 abs Exp $ # DISTNAME= skill-4.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ftp://fast.cs.utah.edu/pub/skill/ EXTRACT_SUFX= .tgz diff --git a/sysutils/skill/distinfo b/sysutils/skill/distinfo index c8f321a5b52..424f2ce35ea 100644 --- a/sysutils/skill/distinfo +++ b/sysutils/skill/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/06/23 14:42:00 kent Exp $ +$NetBSD: distinfo,v 1.5 2002/06/28 10:45:31 abs Exp $ SHA1 (skill-4.1.tgz) = d4f548347c34462156276f96185afa9862621338 Size (skill-4.1.tgz) = 45923 bytes -SHA1 (patch-aa) = fc94b72896cb1d1023bb9a254540eb28bf5479cf -SHA1 (patch-ab) = aad60006de98aba965a9cc5c8f0cfc6b358e5c3c +SHA1 (patch-aa) = 99e982b6ca126a3844b9e056336276bdf1a062f1 +SHA1 (patch-ab) = 216bb502ec9d7ccc60988e911bb71b33f507fe25 diff --git a/sysutils/skill/patches/patch-aa b/sysutils/skill/patches/patch-aa index 0770a59a31f..8ba945cea5e 100644 --- a/sysutils/skill/patches/patch-aa +++ b/sysutils/skill/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2002/04/29 10:43:17 wiz Exp $ +$NetBSD: patch-aa,v 1.11 2002/06/28 10:45:32 abs Exp $ ---- Makefile.orig Sat Apr 6 06:53:39 2002 +--- Makefile.orig Sat Apr 6 05:53:39 2002 +++ Makefile -@@ -59,15 +59,15 @@ +@@ -59,15 +59,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.10 2002/04/29 10:43:17 wiz Exp $ # CONFIGURE(Config): Add any OS-specific options here. COPTS= -@@ -79,7 +79,7 @@ +@@ -79,7 +79,7 @@ SRCS= main.c argparse.c getproc.c OBJS= main.o argparse.o getproc.o HDRS= conf.h @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.10 2002/04/29 10:43:17 wiz Exp $ all: skill -@@ -94,20 +94,20 @@ +@@ -94,20 +94,20 @@ ${OBJS}: ${HDRS} install: skill #(SysV) filepriv -d ${DESTDIR}/${BINDIR}/skill diff --git a/sysutils/skill/patches/patch-ab b/sysutils/skill/patches/patch-ab index c136829b584..1b9ba54908b 100644 --- a/sysutils/skill/patches/patch-ab +++ b/sysutils/skill/patches/patch-ab @@ -1,18 +1,21 @@ -$NetBSD: patch-ab,v 1.9 2002/06/23 14:42:01 kent Exp $ +$NetBSD: patch-ab,v 1.10 2002/06/28 10:45:32 abs Exp $ ---- main.c~ Sat Apr 6 13:26:01 2002 +--- main.c.orig Sat Apr 6 05:26:01 2002 +++ main.c -@@ -46,6 +46,9 @@ +@@ -46,6 +46,12 @@ const char *CopyrightVersion = "%s %s\n\ #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 +#endif /* * Processes which could not be checked -- usually due to permission -@@ -137,7 +140,7 @@ +@@ -137,7 +143,7 @@ main(argc, argv) for (i = 0; i < CmdIndx; i++) { cmdp = (CmdList + i); if ((cmdp->flags & CMD_FLAG_EXACT) != 0 && |