Re: pkg/36788 (sysutils/skill: update to 4.1.4, and make this build on linux and freebsd too)

[Yakovetsky Vladimir <yx%x.ua@localhost>]

On Sat, Oct 27, 2007 at 02:54:46AM +0000, obache%NetBSD.org@localhost wrote:
> Synopsis: sysutils/skill: update to 4.1.4, and make this build on linux and 
> freebsd too
> 
> Responsible-Changed-From-To: pkg-manager->obache
> Responsible-Changed-By: obache%netbsd.org@localhost
> Responsible-Changed-When: Sat, 27 Oct 2007 02:54:45 +0000
> Responsible-Changed-Why:
> I commited it.
> 
  Sorry, but please correct again (look in the original patches).


        1) typo in sysutils/skill/Makefile - s/OPSYS=/OSTYPE=/
           i.e.
--- sysutils/skill/Makefile.orig
+++ sysutils/skill/Makefile
@@ -25,18 +25,18 @@
 BINMODE=       02555
 MAKE_ENV+=     OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS=
 .elif ${OPSYS} == "FreeBSD"
-MAKE_ENV+=     OPSYS=nbsd-44
+MAKE_ENV+=     OSTYPE=nbsd-44
 .elif ${OPSYS} == "Linux"
-MAKE_ENV+=     OPSYS=linux-1
+MAKE_ENV+=     OSTYPE=linux-1
 CPPFLAGS+=     -DHAS_STRERROR=1
 .elif ${OPSYS} == "IRIX"
-MAKE_ENV+=     OPSYS=irix5
+MAKE_ENV+=     OSTYPE=irix5
 .elif ${OPSYS} == "OSF"
-MAKE_ENV+=     OPSYS=mach-3
+MAKE_ENV+=     OSTYPE=mach-3
 .elif ${OPSYS} == "AIX"
-MAKE_ENV+=     OPSYS=aix-3
+MAKE_ENV+=     OSTYPE=aix-3
 .elif ${OPSYS} == "HPUX"
-MAKE_ENV+=     OPSYS=hpux-10
+MAKE_ENV+=     OSTYPE=hpux-10
 .endif
 
 pre-install:


        2) incorrect patch-ac for linux `patch' tool:

% uname -sr
Linux 2.6.21.5
% patch -v | head -1
patch 2.5.9
% cd /usr/pkgsrc/sysutils/skill && bmake
...
=> Applying pkgsrc patches for skill-4.1.4
1 out of 1 hunk FAILED -- saving rejects to file argparse.c.rej
Patch /usr/pkgsrc/sysutils/skill/patches/patch-ac failed
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /usr/pkgsrc/sysutils/skill/patches/patch-ac
*** Error code 1

        fix: use original patch-ac
--- argparse.c.orig     
+++ argparse.c
@@ -29,6 +29,9 @@
 #undef NO_AEXTERN
 
 #include <stdio.h>
+#ifdef __STDC__
+#include <stdlib.h>
+#endif
 #include <ctype.h>
 #include <pwd.h>

        i.e. 
-@@ -30,5 +30,8 @@ #undef       NO_AEXTERN
+@@ -29,6 +29,9 @@



Thanks in advance,

-- 
Yakovetsky Vladimir