iostream.h -> iostream on all platforms.

Set LICENSE while here.

4 files changed, 35 insertions, 11 deletions

diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 318eb44a766..a68209b7005 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2011/11/22 16:38:28 marino Exp $
+# $NetBSD: Makefile,v 1.35 2011/11/22 20:50:53 wiz Exp $
 #
 
 DISTNAME=	MuSE-0.9
@@ -11,6 +11,7 @@ MASTER_SITES=	ftp://ftp.dyne.org/muse/releases/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://muse.dyne.org/
 COMMENT=	Multiple Streaming Engine
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -32,15 +33,6 @@ SUBST_FILES.dsp=	src/jmixer.cpp src/libmpeg/fileplayer.cc
 SUBST_SED.dsp=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_MESSAGE.dsp=	Fixing hardcoded audio device.
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "DragonFly"
-SUBST_CLASSES+=		iostream
-SUBST_STAGE.iostream=	post-patch
-SUBST_FILES.iostream=	src/libmpeg/fileplayer.cc src/libmpeg/mpegtoraw.cc
-SUBST_SED.iostream=	-e 's,<iostream.h>,<iostream>,'
-SUBST_MESSAGE.iostream=	Fixing old iostream headers includes
-.endif
-
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
diff --git a/audio/muse/distinfo b/audio/muse/distinfo
index bb171440cf7..13d77c8f20a 100644
--- a/audio/muse/distinfo
+++ b/audio/muse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2011/11/22 16:38:28 marino Exp $
+$NetBSD: distinfo,v 1.11 2011/11/22 20:50:53 wiz Exp $
 
 SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118
 RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d
@@ -11,3 +11,5 @@ SHA1 (patch-ae) = 54d5cd059c72ecd2b60d1ac188540c29343322f7
 SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc
 SHA1 (patch-ag) = 65515e3a2e8947a1ac1b01e5585a1ca04513bd70
 SHA1 (patch-ah) = 458d747f30e7767f53bc5dd890da1dd9e94cabfa
+SHA1 (patch-src_libmpeg_fileplayer.cc) = 2100250fb8c0dd7ee1d0a1a4549888d30b47334d
+SHA1 (patch-src_libmpeg_mpegtoraw.cc) = 9b9eaf8006f78855454af9baa03726e3352b2e9d
diff --git a/audio/muse/patches/patch-src_libmpeg_fileplayer.cc b/audio/muse/patches/patch-src_libmpeg_fileplayer.cc
new file mode 100644
index 00000000000..a6bc06bfd1c
--- /dev/null
+++ b/audio/muse/patches/patch-src_libmpeg_fileplayer.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libmpeg_fileplayer.cc,v 1.1 2011/11/22 20:50:54 wiz Exp $
+
+iostream.h is deprecated.
+
+--- src/libmpeg/fileplayer.cc.orig	2011-11-22 20:45:56.000000000 +0000
++++ src/libmpeg/fileplayer.cc
+@@ -10,7 +10,7 @@
+ #endif
+ 
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/audio/muse/patches/patch-src_libmpeg_mpegtoraw.cc b/audio/muse/patches/patch-src_libmpeg_mpegtoraw.cc
new file mode 100644
index 00000000000..19cc961bce8
--- /dev/null
+++ b/audio/muse/patches/patch-src_libmpeg_mpegtoraw.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libmpeg_mpegtoraw.cc,v 1.1 2011/11/22 20:50:54 wiz Exp $
+
+iostream.h is deprecated.
+
+--- src/libmpeg/mpegtoraw.cc.orig	2003-12-08 12:20:37.000000000 +0000
++++ src/libmpeg/mpegtoraw.cc
+@@ -419,7 +419,7 @@ bool Mpegtoraw::loadheader(void)
+   return true;
+ }
+ 
+-#include <iostream.h>
++#include <iostream>
+ // Convert mpeg to raw
+ bool Mpegtoraw::run(int frames) {
+   clearrawdata();