Various C++ tweaks/cleanups to get this package compiling with SunPro.

20 files changed, 404 insertions, 5 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 8d4f8e89913..fce26204aef 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/10/18 18:25:49 ben Exp $
+# $NetBSD: Makefile,v 1.30 2004/11/16 12:05:54 sketch Exp $
 
 DISTNAME=	flac-1.1.1
 PKGREVISION=	1
@@ -32,9 +32,6 @@ CONFIGURE_ARGS+=	--disable-altivec
 .endif
 .endif
 
-# This version of flac doesn't build with SunPro yet.
-NOT_FOR_COMPILER=	sunpro
-
 # This version of flac doesn't seem to build correctly with -O3 using
 # the MIPSpro compiler.
 .include "../../mk/compiler.mk"
@@ -42,6 +39,11 @@ NOT_FOR_COMPILER=	sunpro
 BUILDLINK_TRANSFORM+=	rm:-O3
 .endif
 
+# SunPro does not support __inline
+.if !empty(PKGSRC_COMPILER:Msunpro)
+CFLAGS+=	-D__inline=inline
+.endif
+
 .include "../../multimedia/libogg/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 9ee57fa45ad..8b88813095b 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/10/18 14:23:29 ben Exp $
+$NetBSD: distinfo,v 1.8 2004/11/16 12:05:54 sketch Exp $
 
 SHA1 (flac-1.1.1.tar.gz) = 97832e5acad2f20867aafc30f219e47d26b853ac
 Size (flac-1.1.1.tar.gz) = 1467204 bytes
@@ -7,3 +7,21 @@ SHA1 (patch-ab) = abf4df5033956d9c4214064660f82a82619cb3fd
 SHA1 (patch-ac) = 4da64f547cc44cc48a0fb0a761ce7654aa32704a
 SHA1 (patch-ae) = a9ea14a0d0f05c0b49db08e8e62c46589e2b0f2e
 SHA1 (patch-af) = b679103dcd19573bc340426573b027e97c725f8b
+SHA1 (patch-ag) = db7f1db8bc3283fdc698be41754e27bfe344d29e
+SHA1 (patch-ah) = df7c6432123988b2b3675ce93e8faf3c1c9ef691
+SHA1 (patch-ai) = 7c3844526cfd7ec5a8e59ff4052bdb86da0a61e0
+SHA1 (patch-aj) = 71bf6ecc177a58d4e809424feb5f541d8203594f
+SHA1 (patch-ak) = 5e360edc4dfe585f6ea06e23ccd986397280610d
+SHA1 (patch-al) = 09209de67a72a7d3bf01bfc4d347ce160028f837
+SHA1 (patch-am) = e7b4eaf58e92fd851084347029557f330a78b874
+SHA1 (patch-an) = c1c7fcc50e7fcff14895bdb39b4bde8b7951ab2e
+SHA1 (patch-ao) = d0b10b55eace36c763b70ad2b8307fbd82702144
+SHA1 (patch-ap) = 36a6271b5a76b1e6f974206e60cdc73adb115ddc
+SHA1 (patch-aq) = cb470aa3b5960c7aeef09b10a2c80f4073278944
+SHA1 (patch-ar) = c8c8eb0e4e3111782aecbcf156761b8f15a801bc
+SHA1 (patch-as) = 22ca67dc39346476d771c30d66d5576ca61e99f2
+SHA1 (patch-at) = 30fae8796b6d3c52ae6195dc6072dc4ce8cefa54
+SHA1 (patch-au) = 4be24f28f1b6fe73cf8141a3150a3ec9c0d0b4cc
+SHA1 (patch-av) = 5428cb54b0df1cf3efab0c8493b395d67dc549f9
+SHA1 (patch-aw) = 2b1b16c8519598981ce19b96b9228ecc92649ae7
+SHA1 (patch-ax) = 360964ea0ed90a587a738d94283f178a934e4975
diff --git a/audio/flac/patches/patch-ag b/audio/flac/patches/patch-ag
new file mode 100644
index 00000000000..a8528928d80
--- /dev/null
+++ b/audio/flac/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/file_decoder.cpp.orig	2004-11-15 18:13:52.244390000 +0000
++++ ./src/libFLAC++/file_decoder.cpp	2004-11-15 18:14:06.428905000 +0000
+@@ -232,5 +232,5 @@
+ 			instance->error_callback(status);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-ah b/audio/flac/patches/patch-ah
new file mode 100644
index 00000000000..34aff724663
--- /dev/null
+++ b/audio/flac/patches/patch-ah
@@ -0,0 +1,40 @@
+$NetBSD: patch-ah,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./include/FLAC++/decoder.h.orig	2004-11-15 18:15:26.796748000 +0000
++++ ./include/FLAC++/decoder.h	2004-11-15 18:19:27.953373000 +0000
+@@ -141,7 +141,7 @@
+ 			virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ 			virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -236,7 +236,7 @@
+ 			virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ 			virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -329,7 +329,7 @@
+ 			virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ 			virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -346,7 +346,7 @@
+ 
+ 		/* \} */
+ 
+-	};
++	}
+ };
+ 
+ #endif
diff --git a/audio/flac/patches/patch-ai b/audio/flac/patches/patch-ai
new file mode 100644
index 00000000000..5c0c833b577
--- /dev/null
+++ b/audio/flac/patches/patch-ai
@@ -0,0 +1,29 @@
+$NetBSD: patch-ai,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/file_encoder.cpp.orig	2004-11-15 18:20:18.800446000 +0000
++++ ./src/libFLAC++/file_encoder.cpp	2004-11-15 18:26:18.841164000 +0000
+@@ -168,7 +168,7 @@
+ 		bool File::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
+ 		{
+ 			FLAC__ASSERT(is_valid());
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ 			// MSVC++ can't handle:
+ 			// ::FLAC__StreamMetadata *m[num_blocks];
+ 			// so we do this ugly workaround
+@@ -180,7 +180,7 @@
+ 				// we can get away with this since we know the encoder will only correct the is_last flags
+ 				m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]);
+ 			}
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ 			// complete the hack
+ 			const bool ok = (bool)::FLAC__file_encoder_set_metadata(encoder_, m, num_blocks);
+ 			delete [] m;
+@@ -368,5 +368,5 @@
+ 			instance->progress_callback(bytes_written, samples_written, frames_written, total_frames_estimate);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-aj b/audio/flac/patches/patch-aj
new file mode 100644
index 00000000000..351b7daa464
--- /dev/null
+++ b/audio/flac/patches/patch-aj
@@ -0,0 +1,40 @@
+$NetBSD: patch-aj,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./include/FLAC++/encoder.h.orig	2004-11-15 18:22:45.246765000 +0000
++++ ./include/FLAC++/encoder.h	2004-11-15 18:23:16.227987000 +0000
+@@ -159,7 +159,7 @@
+ 			virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
+ 			virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -259,7 +259,7 @@
+ 			virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
+ 			virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -360,7 +360,7 @@
+ 		protected:
+ 			virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -375,7 +375,7 @@
+ 
+ 		/* \} */
+ 
+-	};
++	}
+ };
+ 
+ #endif
diff --git a/audio/flac/patches/patch-ak b/audio/flac/patches/patch-ak
new file mode 100644
index 00000000000..27648ab12cc
--- /dev/null
+++ b/audio/flac/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./include/FLAC++/metadata.h.orig	2004-11-15 18:23:49.895423000 +0000
++++ ./include/FLAC++/metadata.h	2004-11-15 18:24:03.120333000 +0000
+@@ -978,7 +978,7 @@
+ 
+ 		/* \} */
+ 
+-	};
++	}
+ };
+ 
+ #endif
diff --git a/audio/flac/patches/patch-al b/audio/flac/patches/patch-al
new file mode 100644
index 00000000000..6ab7d370e55
--- /dev/null
+++ b/audio/flac/patches/patch-al
@@ -0,0 +1,20 @@
+$NetBSD: patch-al,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/metadata.cpp.orig	2004-11-16 11:00:08.317545000 +0000
++++ ./src/libFLAC++/metadata.cpp	2004-11-16 11:00:19.507566000 +0000
+@@ -75,7 +75,7 @@
+ 				return ret;
+ 			}
+ 
+-		};
++		}
+ 
+ 		FLACPP_API Prototype *clone(const Prototype *object)
+ 		{
+@@ -1283,5 +1283,5 @@
+ 			return ret;
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-am b/audio/flac/patches/patch-am
new file mode 100644
index 00000000000..0c9196f1c9e
--- /dev/null
+++ b/audio/flac/patches/patch-am
@@ -0,0 +1,11 @@
+$NetBSD: patch-am,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/seekable_stream_decoder.cpp.orig	2004-11-16 11:01:24.773461000 +0000
++++ ./src/libFLAC++/seekable_stream_decoder.cpp	2004-11-16 11:01:30.719312000 +0000
+@@ -282,5 +282,5 @@
+ 			instance->error_callback(status);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-an b/audio/flac/patches/patch-an
new file mode 100644
index 00000000000..8847fe4267c
--- /dev/null
+++ b/audio/flac/patches/patch-an
@@ -0,0 +1,29 @@
+$NetBSD: patch-an,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/seekable_stream_encoder.cpp.orig	2004-11-16 11:02:36.626862000 +0000
++++ ./src/libFLAC++/seekable_stream_encoder.cpp	2004-11-16 11:03:14.289382000 +0000
+@@ -168,7 +168,7 @@
+ 		bool SeekableStream::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
+ 		{
+ 			FLAC__ASSERT(is_valid());
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ 			// MSVC++ can't handle:
+ 			// ::FLAC__StreamMetadata *m[num_blocks];
+ 			// so we do this ugly workaround
+@@ -180,7 +180,7 @@
+ 				// we can get away with this since we know the encoder will only correct the is_last flags
+ 				m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]);
+ 			}
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ 			// complete the hack
+ 			const bool ok = (bool)::FLAC__seekable_stream_encoder_set_metadata(encoder_, m, num_blocks);
+ 			delete [] m;
+@@ -371,5 +371,5 @@
+ 			return instance->write_callback(buffer, bytes, samples, current_frame);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-ao b/audio/flac/patches/patch-ao
new file mode 100644
index 00000000000..7f8341ecf60
--- /dev/null
+++ b/audio/flac/patches/patch-ao
@@ -0,0 +1,11 @@
+$NetBSD: patch-ao,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/stream_decoder.cpp.orig	2004-11-16 11:04:04.924224000 +0000
++++ ./src/libFLAC++/stream_decoder.cpp	2004-11-16 11:04:10.117270000 +0000
+@@ -218,5 +218,5 @@
+ 			instance->error_callback(status);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-ap b/audio/flac/patches/patch-ap
new file mode 100644
index 00000000000..43e915a0407
--- /dev/null
+++ b/audio/flac/patches/patch-ap
@@ -0,0 +1,29 @@
+$NetBSD: patch-ap,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libFLAC++/stream_encoder.cpp.orig	2004-11-16 11:05:01.874049000 +0000
++++ ./src/libFLAC++/stream_encoder.cpp	2004-11-16 11:05:29.674481000 +0000
+@@ -169,7 +169,7 @@
+ 		bool Stream::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
+ 		{
+ 			FLAC__ASSERT(is_valid());
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ 			// MSVC++ can't handle:
+ 			// ::FLAC__StreamMetadata *m[num_blocks];
+ 			// so we do this ugly workaround
+@@ -181,7 +181,7 @@
+ 				// we can get away with this since we know the encoder will only correct the is_last flags
+ 				m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]);
+ 			}
+-#ifdef _MSC_VER
++#if (defined _MSC_VER) || (defined __SUNPRO_CC)
+ 			// complete the hack
+ 			const bool ok = (bool)::FLAC__stream_encoder_set_metadata(encoder_, m, num_blocks);
+ 			delete [] m;
+@@ -356,5 +356,5 @@
+ 			instance->metadata_callback(metadata);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-aq b/audio/flac/patches/patch-aq
new file mode 100644
index 00000000000..317a28632d5
--- /dev/null
+++ b/audio/flac/patches/patch-aq
@@ -0,0 +1,11 @@
+$NetBSD: patch-aq,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libOggFLAC++/file_decoder.cpp.orig	2004-11-16 11:08:42.176457000 +0000
++++ ./src/libOggFLAC++/file_decoder.cpp	2004-11-16 11:08:59.074183000 +0000
+@@ -238,5 +238,5 @@
+ 			instance->error_callback(status);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-ar b/audio/flac/patches/patch-ar
new file mode 100644
index 00000000000..7c34b0be12a
--- /dev/null
+++ b/audio/flac/patches/patch-ar
@@ -0,0 +1,40 @@
+$NetBSD: patch-ar,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./include/OggFLAC++/decoder.h.orig	2004-11-16 11:09:28.868389000 +0000
++++ ./include/OggFLAC++/decoder.h	2004-11-16 11:10:55.717825000 +0000
+@@ -144,7 +144,7 @@
+ 			virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ 			virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -240,7 +240,7 @@
+ 			virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ 			virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -334,7 +334,7 @@
+ 			virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ 			virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -351,7 +351,7 @@
+ 
+ 		/* \} */
+ 
+-	};
++	}
+ };
+ 
+ #endif
diff --git a/audio/flac/patches/patch-as b/audio/flac/patches/patch-as
new file mode 100644
index 00000000000..ae33be1df07
--- /dev/null
+++ b/audio/flac/patches/patch-as
@@ -0,0 +1,40 @@
+$NetBSD: patch-as,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./include/OggFLAC++/encoder.h.orig	2004-11-16 11:11:52.196262000 +0000
++++ ./include/OggFLAC++/encoder.h	2004-11-16 11:12:18.445244000 +0000
+@@ -162,7 +162,7 @@
+ 			virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
+ 			virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -263,7 +263,7 @@
+ 			virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
+ 			virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -365,7 +365,7 @@
+ 		protected:
+ 			virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
+ 
+-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
++#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+ 			// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+ 			friend State;
+ #endif
+@@ -380,7 +380,7 @@
+ 
+ 		/* \} */
+ 
+-	};
++	}
+ };
+ 
+ #endif
diff --git a/audio/flac/patches/patch-at b/audio/flac/patches/patch-at
new file mode 100644
index 00000000000..9c0842e3448
--- /dev/null
+++ b/audio/flac/patches/patch-at
@@ -0,0 +1,11 @@
+$NetBSD: patch-at,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libOggFLAC++/file_encoder.cpp.orig	2004-11-16 11:12:44.142879000 +0000
++++ ./src/libOggFLAC++/file_encoder.cpp	2004-11-16 11:12:52.120091000 +0000
+@@ -349,5 +349,5 @@
+ 			instance->progress_callback(bytes_written, samples_written, frames_written, total_frames_estimate);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-au b/audio/flac/patches/patch-au
new file mode 100644
index 00000000000..47442fa4101
--- /dev/null
+++ b/audio/flac/patches/patch-au
@@ -0,0 +1,11 @@
+$NetBSD: patch-au,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libOggFLAC++/seekable_stream_decoder.cpp.orig	2004-11-16 11:14:14.924132000 +0000
++++ ./src/libOggFLAC++/seekable_stream_decoder.cpp	2004-11-16 11:14:19.658710000 +0000
+@@ -288,5 +288,5 @@
+ 			instance->error_callback(status);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-av b/audio/flac/patches/patch-av
new file mode 100644
index 00000000000..6018a2c5d97
--- /dev/null
+++ b/audio/flac/patches/patch-av
@@ -0,0 +1,11 @@
+$NetBSD: patch-av,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libOggFLAC++/seekable_stream_encoder.cpp.orig	2004-11-16 11:15:04.815910000 +0000
++++ ./src/libOggFLAC++/seekable_stream_encoder.cpp	2004-11-16 11:15:09.120236000 +0000
+@@ -362,5 +362,5 @@
+ 			return instance->write_callback(buffer, bytes, samples, current_frame);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-aw b/audio/flac/patches/patch-aw
new file mode 100644
index 00000000000..1a546481319
--- /dev/null
+++ b/audio/flac/patches/patch-aw
@@ -0,0 +1,11 @@
+$NetBSD: patch-aw,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libOggFLAC++/stream_decoder.cpp.orig	2004-11-16 11:15:53.283905000 +0000
++++ ./src/libOggFLAC++/stream_decoder.cpp	2004-11-16 11:15:57.951343000 +0000
+@@ -224,5 +224,5 @@
+ 			instance->error_callback(status);
+ 		}
+ 
+-	};
++	}
+ };
diff --git a/audio/flac/patches/patch-ax b/audio/flac/patches/patch-ax
new file mode 100644
index 00000000000..fd42b8ccdbc
--- /dev/null
+++ b/audio/flac/patches/patch-ax
@@ -0,0 +1,11 @@
+$NetBSD: patch-ax,v 1.1 2004/11/16 12:05:54 sketch Exp $
+
+--- ./src/libOggFLAC++/stream_encoder.cpp.orig	2004-11-16 11:17:13.087258000 +0000
++++ ./src/libOggFLAC++/stream_encoder.cpp	2004-11-16 11:17:17.124073000 +0000
+@@ -342,5 +342,5 @@
+ 			instance->metadata_callback(metadata);
+ 		}
+ 
+-	};
++	}
+ };