CVS commit: pkgsrc/sysutils/sformat

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat May 16 02:15:53 UTC 2020

Modified Files:
        pkgsrc/sysutils/sformat: distinfo
        pkgsrc/sysutils/sformat/patches: patch-include_schily_h

Log Message:
Drop unused but conflicting prototype.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/sformat/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/sformat/patches/patch-include_schily_h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/sformat/distinfo
diff -u pkgsrc/sysutils/sformat/distinfo:1.5 pkgsrc/sysutils/sformat/distinfo:1.6
--- pkgsrc/sysutils/sformat/distinfo:1.5        Wed Nov  4 01:32:31 2015
+++ pkgsrc/sysutils/sformat/distinfo    Sat May 16 02:15:53 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 01:32:31 agc Exp $
+$NetBSD: distinfo,v 1.6 2020/05/16 02:15:53 joerg Exp $
 
 SHA1 (sformat-3.5.tar.gz) = 1ebde6c9d58f376ad2d82f6f8e3bb2e89da00920
 RMD160 (sformat-3.5.tar.gz) = 5dd3e15d1fca7dd961694996bd094e3f2abce28f
@@ -6,7 +6,7 @@ SHA512 (sformat-3.5.tar.gz) = 6dc90e16d3
 Size (sformat-3.5.tar.gz) = 526375 bytes
 SHA1 (patch-RULES_rules1_dir) = 25b5f88d65b4d8265417bc97cee63f6346e3b008
 SHA1 (patch-aa) = e398bc734a7bc48668a0b61d3535c0d87b1a4ccf
-SHA1 (patch-include_schily_h) = 68bd5500c199edbbd48dba4d197ad70dc319bc84
+SHA1 (patch-include_schily_h) = 56eb9cf6f87623bcca5d4d83ab27deeee237bc07
 SHA1 (patch-lib_stdio_fgetline_c) = 0d9aacf5cebc70522b085d71ef90f9665d8c5d6a
 SHA1 (patch-libscg_scsitransp_c) = 889ec76b497782ffd42ef13214f0e1ab3187ceaf
 SHA1 (patch-sformat_defect_c) = 20ba1dfd1f671e216fd04e8dfbf02e6ca605ebf3

Index: pkgsrc/sysutils/sformat/patches/patch-include_schily_h
diff -u pkgsrc/sysutils/sformat/patches/patch-include_schily_h:1.1 pkgsrc/sysutils/sformat/patches/patch-include_schily_h:1.2
--- pkgsrc/sysutils/sformat/patches/patch-include_schily_h:1.1  Sat Jun 16 08:55:55 2012
+++ pkgsrc/sysutils/sformat/patches/patch-include_schily_h      Sat May 16 02:15:53 2020
@@ -1,10 +1,19 @@
-$NetBSD: patch-include_schily_h,v 1.1 2012/06/16 08:55:55 dholland Exp $
+$NetBSD: patch-include_schily_h,v 1.2 2020/05/16 02:15:53 joerg Exp $
 
 Fix symbol name conflict with POSIX getline().
 
---- include/schily.h   Sat Jun 16 04:48:53 2012 -0400
-+++ include/schily.h   Sat Jun 16 04:50:37 2012 -0400
-@@ -153,7 +153,7 @@
+--- include/schily.h.orig      2001-02-23 16:28:17.000000000 +0000
++++ include/schily.h
+@@ -90,8 +90,6 @@ extern       int     fexecle __PR((const char *, F
+               /* 6th arg not const, fexecv forces av[ac] = NULL */
+ extern        int     fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
+                                                       char **));
+-extern        int     fexecve __PR((const char *, FILE *, FILE *, FILE *,
+-                                      char * const *, char * const *));
+ extern        int     fgetline __PR((FILE *, char *, int));
+ extern        int     fgetstr __PR((FILE *, char *, int));
+ extern        void    file_raise __PR((FILE *, int));
+@@ -153,7 +151,7 @@ extern     char    *fillbytes __PR((void *, int
  extern        char    *findbytes __PR((const void *, int, char));
  extern        int     findline __PR((const char *, char, const char *,
                                                        int, char **, int));