Wed Apr 23 20:14:03 2014 UTC ()
Fix build on FreeBSD 10.


(asau)
diff -r1.12 -r1.13 pkgsrc/audio/muse/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/muse/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/audio/muse/patches/patch-ab
cvs diff -r1.12 -r1.13 pkgsrc/audio/muse/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/muse/distinfo 2012/01/11 19:59:35 1.12
+++ pkgsrc/audio/muse/distinfo 2014/04/23 20:14:03 1.13
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.12 2012/01/11 19:59:35 hans Exp $ 1$NetBSD: distinfo,v 1.13 2014/04/23 20:14:03 asau Exp $
2 2
3SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118 3SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118
4RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d 4RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d
5Size (MuSE-0.9.tar.gz) = 1363091 bytes 5Size (MuSE-0.9.tar.gz) = 1363091 bytes
6SHA1 (patch-aa) = 5020bece9b44c5006efe0c90b23f3c54f9313b57 6SHA1 (patch-aa) = 5bbea372750e4747cdc6ec40b531937ff0174ccb
7SHA1 (patch-ab) = e283bc69d90c330ecc2b06ebed70b574ef0f31c5 7SHA1 (patch-ab) = 56a51f8cdb2c70cea7fad40a73c5720ad9aa8d7c
8SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa 8SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa
9SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd 9SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd
10SHA1 (patch-ae) = 7b176763091b03671ec7455ecea11fb5d31536c6 10SHA1 (patch-ae) = 7b176763091b03671ec7455ecea11fb5d31536c6
11SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc 11SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc
12SHA1 (patch-ag) = 65515e3a2e8947a1ac1b01e5585a1ca04513bd70 12SHA1 (patch-ag) = 65515e3a2e8947a1ac1b01e5585a1ca04513bd70
13SHA1 (patch-ah) = 458d747f30e7767f53bc5dd890da1dd9e94cabfa 13SHA1 (patch-ah) = 458d747f30e7767f53bc5dd890da1dd9e94cabfa
14SHA1 (patch-src_libmpeg_fileplayer.cc) = 2100250fb8c0dd7ee1d0a1a4549888d30b47334d 14SHA1 (patch-src_libmpeg_fileplayer.cc) = 2100250fb8c0dd7ee1d0a1a4549888d30b47334d
15SHA1 (patch-src_libmpeg_mpegtoraw.cc) = 9b9eaf8006f78855454af9baa03726e3352b2e9d 15SHA1 (patch-src_libmpeg_mpegtoraw.cc) = 9b9eaf8006f78855454af9baa03726e3352b2e9d
cvs diff -r1.2 -r1.3 pkgsrc/audio/muse/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/muse/patches/patch-aa 2009/03/11 14:42:35 1.2
+++ pkgsrc/audio/muse/patches/patch-aa 2014/04/23 20:14:03 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.2 2009/03/11 14:42:35 hasso Exp $ 1$NetBSD: patch-aa,v 1.3 2014/04/23 20:14:03 asau Exp $
2 2
3--- src/shout/sock.h.orig 2004-04-30 01:49:50.000000000 +0200 3--- src/shout/sock.h.orig 2004-04-30 01:49:50.000000000 +0200
4+++ src/shout/sock.h 2004-04-30 01:50:10.000000000 +0200 4+++ src/shout/sock.h 2004-04-30 01:50:10.000000000 +0200
5@@ -31,7 +31,7 @@ 5@@ -31,7 +31,7 @@
6 #include <unistd.h> 6 #include <unistd.h>
7 #endif 7 #endif
8  8
9-#ifdef HAVE_SYS_UIO_H 9-#ifdef HAVE_SYS_UIO_H
10+#if defined(HAVE_SYS_UIO_H) || defined(__NetBSD__) || defined(__DragonFly__) 10+#if defined(HAVE_SYS_UIO_H) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
11 #include <sys/uio.h> 11 #include <sys/uio.h>
12 #else 12 #else
13 #ifndef _SYS_UIO_H 13 #ifndef _SYS_UIO_H
cvs diff -r1.3 -r1.4 pkgsrc/audio/muse/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/muse/patches/patch-ab 2011/11/22 16:38:28 1.3
+++ pkgsrc/audio/muse/patches/patch-ab 2014/04/23 20:14:03 1.4
@@ -1,25 +1,13 @@ @@ -1,25 +1,13 @@
1$NetBSD: patch-ab,v 1.3 2011/11/22 16:38:28 marino Exp $ 1$NetBSD: patch-ab,v 1.4 2014/04/23 20:14:03 asau Exp $
2 2
3--- src/jmixer.cpp.orig 2004-04-09 17:50:43.000000000 +0000 3--- src/jmixer.cpp.orig 2004-04-09 17:50:43.000000000 +0000
4+++ src/jmixer.cpp 4+++ src/jmixer.cpp
5@@ -98,7 +98,7 @@ Stream_mixer::Stream_mixer() { 5@@ -98,7 +98,7 @@ Stream_mixer::Stream_mixer() {
6 error("error initializing POSIX thread mutex"); 6 error("error initializing POSIX thread mutex");
7 if(pthread_cond_init (&_cond, NULL) == -1) 7 if(pthread_cond_init (&_cond, NULL) == -1)
8 error("error initializing POSIX thread condtition");  8 error("error initializing POSIX thread condtition");
9- unlock(); 9- unlock();
10+ //unlock(); 10+ //unlock();
11 } 11 }
12  12
13 Stream_mixer::~Stream_mixer() { 13 Stream_mixer::~Stream_mixer() {
14@@ -627,7 +627,11 @@ bool Stream_mixer::set_playmode(int ch,  
15 /* this is the function selecting files for the scandir 
16 on freebsd systems you should change the following line to: 
17 int selector(struct dirent *dir) { */ 
18+#if defined(__FreeBSD__) 
19+int selector(struct dirent *dir) { 
20+#else 
21 int selector(const struct dirent *dir) { 
22+#endif 
23 if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0 
24 #ifdef HAVE_VORBIS 
25 || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0