diff options
author | agc <agc> | 2004-04-26 07:46:11 +0000 |
---|---|---|
committer | agc <agc> | 2004-04-26 07:46:11 +0000 |
commit | 46a4b67792de36c43a78134c41ef1dc5889b15ce (patch) | |
tree | 71025907b096b03954d7d8e01dbdce93a44e1f35 | |
parent | 36581afda4b60d6ac408e580ef7b180d21261e37 (diff) | |
download | pkgsrc-46a4b67792de36c43a78134c41ef1dc5889b15ce.tar.gz |
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.
-rw-r--r-- | sysutils/cdrecord/distinfo | 4 | ||||
-rw-r--r-- | sysutils/cdrecord/patches/patch-cd | 13 | ||||
-rw-r--r-- | sysutils/cdrecord/patches/patch-ce | 20 |
3 files changed, 36 insertions, 1 deletions
diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo index 8ae46ebedd1..91e0cce4315 100644 --- a/sysutils/cdrecord/distinfo +++ b/sysutils/cdrecord/distinfo @@ -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-bb) = c5ee1e00e1f8723fe28d4d360bcede7680a7e4b9 SHA1 (patch-ca) = 5dbc3d3f248781627b6d6100808c70db60e83bd4 SHA1 (patch-cb) = 8119e171e7308c0bb095b6a1d760473d8cc89120 SHA1 (patch-cc) = a14098dd14e0b58d3fed1167341a22167eea7c19 +SHA1 (patch-cd) = a3368559694a181574889f8d4da124be6a0e8e85 +SHA1 (patch-ce) = eb12b12d26f8451654124abcd0424ff29e89bcf8 diff --git a/sysutils/cdrecord/patches/patch-cd b/sysutils/cdrecord/patches/patch-cd new file mode 100644 index 00000000000..f3f3e47d769 --- /dev/null +++ b/sysutils/cdrecord/patches/patch-cd @@ -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 --git a/sysutils/cdrecord/patches/patch-ce b/sysutils/cdrecord/patches/patch-ce new file mode 100644 index 00000000000..854715ceecb --- /dev/null +++ b/sysutils/cdrecord/patches/patch-ce @@ -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)); + } |