diff options
| author | joerg <joerg> | 2005-12-06 13:27:01 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2005-12-06 13:27:01 +0000 |
| commit | 302edc5f9099e40870e3649aa27f7d758822cacb (patch) | |
| tree | 66f148cd7891cbba611a3e15c0b1645f3f411a80 /sysutils/skill | |
| parent | 668ef6a735edc7f915dd753147445cbab69d2b51 (diff) | |
| download | pkgsrc-302edc5f9099e40870e3649aa27f7d758822cacb.tar.gz | |
Fix errno. On DragonFly, define HAS_STRERROR to avoid conflicts with
system headers.
Diffstat (limited to 'sysutils/skill')
| -rw-r--r-- | sysutils/skill/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/skill/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/skill/patches/patch-ab | 24 |
3 files changed, 22 insertions, 11 deletions
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile index 62ef10332d9..214da087f87 100644 --- a/sysutils/skill/Makefile +++ b/sysutils/skill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/08/06 13:06:06 yyamano Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/06 13:27:01 joerg Exp $ # DISTNAME= skill-4.1.1 @@ -18,6 +18,9 @@ NOT_FOR_PLATFORM+= Interix-*-* # currently no machdep support MAKE_ENV+= OSTYPE=nbsd-44 .elif ${OPSYS} == "Darwin" MAKE_ENV+= OSTYPE=nbsd-44 +.elif ${OPSYS} == "DragonFly" +MAKE_ENV+= OSTYPE=nbsd-44 +CPPFLAGS+= -DHAS_STRERROR=1 .elif ${OPSYS} == "SunOS" BINMODE= 02555 MAKE_ENV+= OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS= diff --git a/sysutils/skill/distinfo b/sysutils/skill/distinfo index 0bcc160490d..fef956087ce 100644 --- a/sysutils/skill/distinfo +++ b/sysutils/skill/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2005/02/24 13:40:57 agc Exp $ +$NetBSD: distinfo,v 1.9 2005/12/06 13:27:01 joerg 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) = 325a0e3aef97341ce9de773b6f6f94d53b42c0ec +SHA1 (patch-ab) = 7953603ec4c8e1f9b0c690acef50d51432db7f1e diff --git a/sysutils/skill/patches/patch-ab b/sysutils/skill/patches/patch-ab index 92cfe1b843a..4ad1841e4cb 100644 --- a/sysutils/skill/patches/patch-ab +++ b/sysutils/skill/patches/patch-ab @@ -1,23 +1,22 @@ -$NetBSD: patch-ab,v 1.11 2003/09/23 13:58:37 wiz Exp $ +$NetBSD: patch-ab,v 1.12 2005/12/06 13:27:01 joerg Exp $ ---- main.c.orig Sat Apr 6 05:26:01 2002 -+++ main.c Tue Sep 23 10:53:01 2003 -@@ -46,7 +46,14 @@ +--- main.c.orig 2003-08-19 00:36:08.000000000 +0000 ++++ main.c +@@ -46,6 +46,13 @@ const char *CopyrightVersion = "%s %s\n\ #include <stdio.h> #include <errno.h> #include <pwd.h> +#ifdef __NetBSD__ +#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 - * problems (SunOS 4.1, SysVR4) -- are tallied in "MissedProcCnt". -@@ -137,7 +144,7 @@ +@@ -137,7 +144,7 @@ main(argc, argv) for (i = 0; i < CmdIndx; i++) { cmdp = (CmdList + i); if ((cmdp->flags & CMD_FLAG_EXACT) != 0 && @@ -26,3 +25,12 @@ $NetBSD: patch-ab,v 1.11 2003/09/23 13:58:37 wiz Exp $ break; else if ((cmdp->flags & CMD_FLAG_REGEX) != 0 && RegexMatch(CMD, cmdp) != 0) +@@ -330,8 +337,6 @@ Usage(error) + char * + SysErr() + { +- extern int errno; +- + #if defined(HAS_STRERROR) || defined(_LP64) + char *se = strerror(errno); + return((se==NULL)? "unknown error": se); |