[pkgsrc/trunk]: pkgsrc/sysutils/cdrecord Make this build on NetBSD 2.0D and l...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34f98843707d
branches:  trunk
changeset: 474206:34f98843707d
user:      agc <agc%pkgsrc.org@localhost>
date:      Mon Apr 26 07:46:11 2004 +0000

description:
Make this build on NetBSD 2.0D and later - make cdrecord's fgetstr() local
to the package, rather than attempting to use the one with the different
signature in libc.

diffstat:

 sysutils/cdrecord/distinfo         |   4 +++-
 sysutils/cdrecord/patches/patch-cd |  13 +++++++++++++
 sysutils/cdrecord/patches/patch-ce |  20 ++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletions(-)

diffs (56 lines):

diff -r 11805d39c239 -r 34f98843707d sysutils/cdrecord/distinfo
--- a/sysutils/cdrecord/distinfo        Mon Apr 26 07:11:46 2004 +0000
+++ b/sysutils/cdrecord/distinfo        Mon Apr 26 07:46:11 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2003/06/05 16:12:10 drochner Exp $
+$NetBSD: distinfo,v 1.12 2004/04/26 07:46:11 agc Exp $
 
 SHA1 (cdrtools-2.00.3.tar.gz) = 744795871f516dd8dc3918d3cf59f880abc73e4c
 Size (cdrtools-2.00.3.tar.gz) = 1638876 bytes
@@ -11,3 +11,5 @@
 SHA1 (patch-ca) = 5dbc3d3f248781627b6d6100808c70db60e83bd4
 SHA1 (patch-cb) = 8119e171e7308c0bb095b6a1d760473d8cc89120
 SHA1 (patch-cc) = a14098dd14e0b58d3fed1167341a22167eea7c19
+SHA1 (patch-cd) = a3368559694a181574889f8d4da124be6a0e8e85
+SHA1 (patch-ce) = eb12b12d26f8451654124abcd0424ff29e89bcf8
diff -r 11805d39c239 -r 34f98843707d sysutils/cdrecord/patches/patch-cd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrecord/patches/patch-cd        Mon Apr 26 07:46:11 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-cd,v 1.1 2004/04/26 07:46:11 agc Exp $
+
+--- include/schily.h   2004/04/26 07:40:33     1.1
++++ include/schily.h   2004/04/26 07:40:49
+@@ -115,7 +115,7 @@
+ extern        int     fspawnv_nowait __PR((FILE *, FILE *, FILE *,
+                                       const char *, int, char *const*));
+ extern        int     fgetline __PR((FILE *, char *, int));
+-extern        int     fgetstr __PR((FILE *, char *, int));
++extern        int     schily_fgetstr __PR((FILE *, char *, int));
+ extern        void    file_raise __PR((FILE *, int));
+ extern        int     fileclose __PR((FILE *));
+ extern        FILE    *fileluopen __PR((int, const char *));
diff -r 11805d39c239 -r 34f98843707d sysutils/cdrecord/patches/patch-ce
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrecord/patches/patch-ce        Mon Apr 26 07:46:11 2004 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ce,v 1.1 2004/04/26 07:46:11 agc Exp $
+
+--- libschily/stdio/fgetstr.c  2004/04/26 07:42:03     1.1
++++ libschily/stdio/fgetstr.c  2004/04/26 07:42:22
+@@ -26,7 +26,7 @@
+  */
+ 
+ EXPORT int
+-fgetstr(f, buf, len)
++schily_fgetstr(f, buf, len)
+       register        FILE    *f;
+                       char    *buf;
+       register        int     len;
+@@ -60,5 +60,5 @@
+       char    *buf;
+       int     len;
+ {
+-      return (fgetstr(stdin, buf, len));
++      return (schily_fgetstr(stdin, buf, len));
+ }