pkg/25406: sysutils/cdrdao doesn't compile on -current, patch included

[space7%meinberlikomm.de@localhost]

>Number:         25406
>Category:       pkg
>Synopsis:       sysutils/cdrdao doesn't compile on -current, patch included
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Apr 30 14:17:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Krüger
>Release:        NetBSD 2.0E
>Organization:
        
>Environment:
        
        
System: NetBSD dsl-217-199-71-50.berlikomm.net 2.0E NetBSD 2.0E (PLUTO) #1: Fri 
Apr 30 01:05:21 CEST 2004 
space7%dsl-62-220-19-176.berlikomm.net@localhost:/usr/obj/cvsroot/src/sys/arch/i386/compile/PLUTO
 i386
Architecture: i386
Machine: i386
>Description:
        cdrdao doesn't compile on -current due to the recent addition of
        fgetstr to stdio.h
>How-To-Repeat:
        on -current, cd ../pkgsrc/sysutils/cdrdao; make
>Fix:
diff -uNr cdrdao.orig/distinfo cdrdao/distinfo
--- cdrdao.orig/distinfo        2004-04-30 14:56:14.000000000 +0200
+++ cdrdao/distinfo     2004-04-30 16:05:42.000000000 +0200
@@ -6,3 +6,4 @@
 SHA1 (patch-ab) = 071fedfbc598400d9d41e050aa01c5902e97caaa
 SHA1 (patch-ac) = 7392aad2b18b670023396b47715b292d8046b495
 SHA1 (patch-ad) = e10ec407f4c4200e443364077ab6d56e1d3cd2d3
+SHA1 (patch-ae) = 22b93a8e3be42a34ac3dce59a23f189b74396958
diff -uNr cdrdao.orig/patches/patch-ae cdrdao/patches/patch-ae
--- cdrdao.orig/patches/patch-ae        1970-01-01 01:00:00.000000000 +0100
+++ cdrdao/patches/patch-ae     2004-04-30 16:05:39.000000000 +0200
@@ -0,0 +1,26 @@
+--- scsilib/include/schily.h.orig      2001-11-25 16:35:10.000000000 +0100
++++ scsilib/include/schily.h   2004-04-30 16:05:31.000000000 +0200
+@@ -42,6 +42,10 @@
+ #include <ccomdefs.h>
+ #endif
+ 
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif /* needed for fgetstr test below */
++
+ #ifdef        __cplusplus
+ extern "C" {
+ #endif
+@@ -95,7 +99,11 @@
+ 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));
++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000)
++      /* do nada */
++#else
++      extern  int     fgetstr __PR((FILE *, char *, int));
++#endif        /* fgetstr was added to stdio.h on 2004/04/21 */
+ extern        void    file_raise __PR((FILE *, int));
+ extern        int     fileclose __PR((FILE *));
+ extern        FILE    *fileluopen __PR((int, const char *));
>Release-Note:
>Audit-Trail:
>Unformatted: