pkg/43638: misc/libcdio fails to build on OpenSolaris [patch]

[cheusov%tut.by@localhost]

>Number:         43638
>Category:       pkg
>Synopsis:       misc/libcdio fails to build on OpenSolaris [patch]
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 18 15:20:00 +0000 2010
>Originator:     Aleksey Cheusov
>Release:        NetBSD 5.1_RC3
>Organization:
>Environment:
System: NetBSD asrock.chizhovka.net 5.1_RC3 NetBSD 5.1_RC3 (GENERIC) #1: Mon 
Jun 28 00:06:07 EEST 2010 
cheusov%asrock.chizhovka.net@localhost:/srv/obj/sys/arch/amd64/compile/GENERIC 
amd64
Architecture: x86_64
Machine: amd64
>Description:
misc/libcdio package fails to build on OpenSolaris with the following
error message.

    libtool: compile:  g++ -DHAVE_CONFIG_H -I. -I../.. -I../../include/ 
-I../../include 
-I/tmp/obj_pkgsrc34/misc/libcdio/work/.buildlink/include/ncurses 
-I/tmp/obj_pkgsrc34/misc/libcdio/work/.buildlink/include -O -MT iso9660.lo -MD 
-MP -MF .deps/iso9660.Tpo -c iso9660.cpp  -fPIC -DPIC -o .libs/iso9660.o
    In file included from iso9660.cpp:24:
    ../../include/cdio++/iso9660.hpp:151: error: expected identifier before 
numeric constant
    ../../include/cdio++/iso9660.hpp:151: error: expected unqualified-id before 
numeric constant
    iso9660.cpp:34: error: expected unqualified-id before numeric constant
    iso9660.cpp:34: error: expected init-declarator before numeric constant
    iso9660.cpp:34: error: expected `,' or `;' before numeric constant

This happens because FS is used as a class name and
macro FS is also defined to 1 in system's headers.

>Fix:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/misc/libcdio/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- distinfo    31 Oct 2009 02:49:09 -0000      1.20
+++ distinfo    18 Jul 2010 15:11:49 -0000
@@ -4,4 +4,5 @@
 RMD160 (libcdio-0.82.tar.gz) = 48dc71f349235ab501985a296fd3deee295c167f
 Size (libcdio-0.82.tar.gz) = 2240599 bytes
 SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e
+SHA1 (patch-ab) = 40621be2dad62f781f6ead7be374b6e85e104c35
 SHA1 (patch-ac) = 7bea49d753bb88d8fa2b5b87a4e9a327c5d7f05f
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ab    18 Jul 2010 15:11:49 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- include/cdio++/iso9660.hpp.orig    2008-11-29 04:52:43.000000000 +0000
++++ include/cdio++/iso9660.hpp
+@@ -33,6 +33,10 @@
+ #include <cstring>
+ using namespace std;
+ 
++#ifdef FS
++#undef FS
++#endif
++
+ /** ISO 9660 class.
+ */
+ class ISO9660