Attachment #42306 for bug #65990

View | Details | Raw Unified | Return to bug 65990
Collapse All | Expand All




#

PORTNAME=	MuSE
PORTVERSION=	0.9
PORTREVISION=	3
CATEGORIES=	audio
MASTER_SITES=	ftp://ftp.dyne.org/muse/releases/ \
		http://www.ljudmila.org/~jaromil/muse/releases/
MASTER_SITE_SUBDIR=	muse
DISTNAME=	MuSE-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Multiple Streaming Engine

LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
		sndfile.1:${PORTSDIR}/audio/libsndfile \
		vorbis.3:${PORTSDIR}/audio/libvorbis

USE_GETOPT_LONG=	yes

USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--disable-debug --disable-lubrify

MAN1=		muse.1
PORTDOCS=	${DOCSFILES:S,doc/,,g}
PLIT_FILES=	bin/muse

CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
		${PTHREAD_CFLAGS}
LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}

DOCFILES=	AUTHORS ChangeLog KNOWN-BUGS NEWS README TODO doc/USAGE

.if defined(WITHOUT_X11)
PKGNAMESUFFIX=	-nox11
CONFIGURE_ARGS+=	--without-x --with-rubik
.else
USE_GNOME+=	gtk20
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|^CFLAGS=.*$$|CFLAGS="\$$CFLAGS"|g ; \
		 s|[$$]GTK_LIBS -lgthread|\$$GTK_LIBS \$$GLIB_LIBS|g ; \
		 s|[$$]GTK_FLAGS|\$$GTK_CFLAGS \$$GLIB_CFLAGS|g' \
			${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/Makefile.in

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/muse ${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/doc/muse.1 ${MANPREFIX}/man/man1
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for file in ${DOCFILES}
	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif

Lines 1-2 Link Here

(-)audio/muse/distinfo (-2 / +2 lines)
1	MD5 (MuSE-0.8.1.tar.gz) = 1ca2c62aa2db10f92ee5a864da736e34	1	MD5 (MuSE-0.9.tar.gz) = 0c2075c9f62ba1d08459f669498b6bcf
2	SIZE (MuSE-0.8.1.tar.gz) = 624750	2	SIZE (MuSE-0.9.tar.gz) = 1363091




--- configure.orig	Sun Apr 18 00:33:26 2004
+++ configure	Mon Apr 19 22:34:18 2004
@@ -3427,7 +3427,7 @@
 #AM_DEFINE_UNQUOTED(HOST_CPU, "${host_cpu}")
 
 #CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe"
-CFLAGS="-pipe -D_REENTRANT"
+CFLAGS="$CFLAGS -D_REENTRANT"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -11182,7 +11182,7 @@
 else
 
 lrint_save_CFLAGS=$CFLAGS
-CFLAGS="-O2 -lm"
+CFLAGS="$CFLAGS -lm"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -11249,7 +11249,7 @@
 else
 
 lrintf_save_CFLAGS=$CFLAGS
-CFLAGS="-O2 -lm"
+CFLAGS="$CFLAGS -lm"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -11836,8 +11836,6 @@
    else
      CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -march=${host_cpu} -ffast-math"
    fi
-else
-   CFLAGS="$CFLAGS -O2 -ffast-math"
 fi
 
 

Lines 1-11 Link Here

(-)audio/muse/files/patch-gtkgui::listpack.cpp (-11 lines)
1	--- gtkgui/listpack.cpp.orig Mon Jul 28 20:31:24 2003
2	+++ gtkgui/listpack.cpp Mon Jul 28 20:32:17 2003
3	@@ -49,7 +49,7 @@
4	item->container = container;
5	item->data = data;
6
7	- func("list_add:: item %p item->pos = %u
8	+ func("list_add:: item %p item->pos = %u\
9	item->container= %p item->data=%p", item, item->pos,
10	item->container, item->data);
11	/*list = g_list_append(list, (void ) item);/

Lines 1-11 Link Here

(-)audio/muse/files/patch-jmixer.cpp (-11 lines)
1	--- jmixer.cpp.orig Tue Jul 23 04:48:56 2002
2	+++ jmixer.cpp Sat Dec 28 09:41:10 2002
3	@@ -808,7 +808,7 @@
4	}
5
6	/* this is the function selecting files for the scandir */
7	-int selector(const struct dirent *dir) {
8	+int selector(struct dirent *dir) {
9	if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
10	#ifdef HAVE_VORBIS
11	\|\| strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0




--- ncursesgui/about.cpp.orig	Thu May 30 22:56:45 2002
+++ ncursesgui/about.cpp	Mon Dec 22 00:47:55 2003
@@ -58,80 +58,80 @@
 	warning ("aboutbox::setitem()");
 	char src[8192];
 	snprintf (src, sizeof(src),
-"MuSE is a [ d y n e . o r g ] production! :)
-		
-MuSE <-------------------------------> Multiple Streaming Engine 
-MuSE is an application for the mixing, encoding, and streaming of sound:
-is an engine that can simultaniously mix up to 6 separate MP3 or OggVorbis
-audio files from the hard drive or the network, where each channel of 
-audio can be dynamicly adjusted for speed and volume plus a soundcard 
-line-in channel. The resulting stream can be played locally on the sound 
-card and/or encoded as an mp3 network stream to an icecast or shoutcast 
-server (ready to be mixed and played again by other muses... ;)
-
-MuSE has been created and is mantained by 
-Denis Rojo aka jaromil <jaromil@dyne.org>
-The GTK+ graphical user interface is developed by 
-nightolo <night@autistici.org>
-The ncurses user interface is developed by
-Luca Profico aka rubik <rubik@olografix.org>
-
-MuSE as it is now would have never existed without the contributions of:
-= Markus Seidl ( funda.ment.org ) for the idea of mixing and streaming 
-  multiple files
-= August Black ( aug.ment.org ) for the original graphical user interface
-= SERVUS.AT for trusting this project since the beginning and supporting it
-= PUBLIC VOICE Lab ( pvl.at ) for recently giving MuSE support and new 
-  horizons of use
-= Asbesto Molesto ( freaknet.org ) for the extensive testing and 
-  documentation
-= Alex, Rasty and Martinez ( ! ) for the good karma
-
-also BIG THANKS to:
-lobo, voyager, void, blicero, saiborg, the freaknet medialab, the ASCII 
-squat, henk, the imc-audio collective, jeff, the LOA hacklab, the TPO, 
-bundes & didi, indymedia italy, neural.it, the autistici.org collective, 
-mag-one, radio onda rossa and all the others i'm forgetting here!
-	
-MuSE redistributes, linking statically, the following libraries:
-= libmpeg by Woo-jae Jung (now mantained by Mikael Hedin)
-= libshout by Jack Moffit, Chad Armstrong and Scott Manley
-= libcdk by Mike Glover
-
-(refer to documentation included into subdirectories for more informations)
-
-MuSE can link dinamically to the following libraries:
-= libogg, libvorbis, libvorbisfile - www.xiph.org
-= glib, libgdk, libgtk - www.gtk.org
-= liblame - www.mp3dev.org/mp3
-= libX11, libXext - www.xfree86.org
-= other common GNU libraries
-
-MuSE sourcecode also got inspirations from:
-= stream mixer code by Scott Manley
-= buffered FIFO pipe code by Charles Samuels.
-
-
-MuSE is copyright (c) 2000, 2001, 2002 by Denis Rojo aka jaromil
-MuSE's GTK+ G.U.I. is (c) 2002 by nightolo
-MuSE's ncurses console U.I is (c) 2002 by Luca Profico aka rubik
-
-
-
----------------------------------------------------------------
-This source code is free software; you can redistribute it and/or
-modify it under the terms of the GNU Public License as published 
-by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-This source code is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-Please refer to the GNU Public License for more details.
-
-You should have received a copy of the GNU Public License along with
-this source code; if not, write to:
-Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"MuSE is a [ d y n e . o r g ] production! :)\n\
+		\n\
+MuSE <-------------------------------> Multiple Streaming Engine \n\
+MuSE is an application for the mixing, encoding, and streaming of sound:\n\
+is an engine that can simultaniously mix up to 6 separate MP3 or OggVorbis\n\
+audio files from the hard drive or the network, where each channel of \n\
+audio can be dynamicly adjusted for speed and volume plus a soundcard \n\
+line-in channel. The resulting stream can be played locally on the sound \n\
+card and/or encoded as an mp3 network stream to an icecast or shoutcast \n\
+server (ready to be mixed and played again by other muses... ;)\n\
+\n\
+MuSE has been created and is mantained by \n\
+Denis Rojo aka jaromil <jaromil@dyne.org>\n\
+The GTK+ graphical user interface is developed by \n\
+nightolo <night@autistici.org>\n\
+The ncurses user interface is developed by\n\
+Luca Profico aka rubik <rubik@olografix.org>\n\
+\n\
+MuSE as it is now would have never existed without the contributions of:\n\
+= Markus Seidl ( funda.ment.org ) for the idea of mixing and streaming \n\
+  multiple files\n\
+= August Black ( aug.ment.org ) for the original graphical user interface\n\
+= SERVUS.AT for trusting this project since the beginning and supporting it\n\
+= PUBLIC VOICE Lab ( pvl.at ) for recently giving MuSE support and new \n\
+  horizons of use\n\
+= Asbesto Molesto ( freaknet.org ) for the extensive testing and \n\
+  documentation\n\
+= Alex, Rasty and Martinez ( ! ) for the good karma\n\
+\n\
+also BIG THANKS to:\n\
+lobo, voyager, void, blicero, saiborg, the freaknet medialab, the ASCII \n\
+squat, henk, the imc-audio collective, jeff, the LOA hacklab, the TPO, \n\
+bundes & didi, indymedia italy, neural.it, the autistici.org collective, \n\
+mag-one, radio onda rossa and all the others i'm forgetting here!\n\
+	\n\
+MuSE redistributes, linking statically, the following libraries:\n\
+= libmpeg by Woo-jae Jung (now mantained by Mikael Hedin)\n\
+= libshout by Jack Moffit, Chad Armstrong and Scott Manley\n\
+= libcdk by Mike Glover\n\
+\n\
+(refer to documentation included into subdirectories for more informations)\n\
+\n\
+MuSE can link dinamically to the following libraries:\n\
+= libogg, libvorbis, libvorbisfile - www.xiph.org\n\
+= glib, libgdk, libgtk - www.gtk.org\n\
+= liblame - www.mp3dev.org/mp3\n\
+= libX11, libXext - www.xfree86.org\n\
+= other common GNU libraries\n\
+\n\
+MuSE sourcecode also got inspirations from:\n\
+= stream mixer code by Scott Manley\n\
+= buffered FIFO pipe code by Charles Samuels.\n\
+\n\
+\n\
+MuSE is copyright (c) 2000, 2001, 2002 by Denis Rojo aka jaromil\n\
+MuSE's GTK+ G.U.I. is (c) 2002 by nightolo\n\
+MuSE's ncurses console U.I is (c) 2002 by Luca Profico aka rubik\n\
+\n\
+\n\
+\n\
+---------------------------------------------------------------\n\
+This source code is free software; you can redistribute it and/or\n\
+modify it under the terms of the GNU Public License as published \n\
+by the Free Software Foundation; either version 2 of the License,\n\
+or (at your option) any later version.\n\
+\n\
+This source code is distributed in the hope that it will be useful,\n\
+but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
+Please refer to the GNU Public License for more details.\n\
+\n\
+You should have received a copy of the GNU Public License along with\n\
+this source code; if not, write to:\n\
+Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\
 ");
 
 	item = splitstring(src);




--- outchannels.cpp.orig	Fri Jun  7 02:44:42 2002
+++ outchannels.cpp	Fri Jun  7 02:44:48 2002
@@ -20,11 +20,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>

Lines 1-10 Link Here

(-)audio/muse/files/patch-shout::mp3.c (-10 lines)
1	--- shout/mp3.c.orig Tue Mar 25 05:30:10 2003
2	+++ shout/mp3.c Thu Apr 24 02:44:09 2003
3	@@ -1,7 +1,6 @@
4	/* mp3.c: libshout MP3 format handler */
5
6	#include <stdio.h>
7	-#include <stdint.h>
8	#include <stdlib.h>
9	#include <string.h>
10	#include <config.h>




--- shout/shout_private.h.orig	Fri Nov 29 20:51:56 2002
+++ shout/shout_private.h	Wed May 14 14:26:24 2003
@@ -14,14 +14,6 @@
 #  include <inttypes.h>
 #endif
 
-#  if SIZEOF_INT == 8
-typedef unsigned int uint64_t;
-#  elif SIZEOF_LONG == 8
-typedef unsigned long uint64_t;
-#  elif SIZEOF_LONG_LONG == 8
-typedef unsigned long long uint64_t;
-#  endif
-
 #define LIBSHOUT_DEFAULT_HOST "localhost"
 #define LIBSHOUT_DEFAULT_PORT 8000
 #define LIBSHOUT_DEFAULT_FORMAT SHOUT_FORMAT_VORBIS

Line 0 Link Here

(-)audio/muse/files/patch-src::Makefile.in (+10 lines)
	1	--- src/Makefile.in.orig Sun Apr 18 00:33:24 2004
	2	+++ src/Makefile.in Mon Apr 19 22:28:56 2004
	3	@@ -207,7 +207,6 @@
	4	muse_LDADD = \
	5	$(top_srcdir)/src/resample/libresample.a \
	6	$(top_srcdir)/src/libmpeg/libmpeg.a \
	7	- -lpthread \
	8	@LIBSHOUT_LIB@ \
	9	@M_LIBS@ \
	10	@LAME_LIBS@ \




--- src/jmixer.cpp.orig	Sat Apr 10 02:50:43 2004
+++ src/jmixer.cpp	Mon Apr 19 22:49:59 2004
@@ -20,18 +20,18 @@
  */
 
 #include <iostream>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/soundcard.h>
-#include <string.h>
-#include <signal.h>
+#include <cstring>
+#include <csignal>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <termios.h>
@@ -624,10 +624,11 @@
   return true;
 }
 
-/* this is the function selecting files for the scandir
-   on freebsd systems you should change the following line to:
-   int selector(struct dirent *dir) {    */
+#if defined(__FreeBSD__)
+int selector(struct dirent *dir) {
+#else
 int selector(const struct dirent *dir) {
+#endif
   if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
 #ifdef HAVE_VORBIS
       || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0




--- src/libmpeg/mpegtoraw.cc.orig	Mon Dec  8 21:20:37 2003
+++ src/libmpeg/mpegtoraw.cc	Mon Apr 19 23:00:18 2004
@@ -9,8 +9,8 @@
 #include <pthread.h>
 #endif
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <unistd.h>
 
 #include "mpegsound.h"
@@ -419,7 +419,7 @@
   return true;
 }
 
-#include <iostream.h>
+#include <iostream>
 // Convert mpeg to raw
 bool Mpegtoraw::run(int frames) {
   clearrawdata();




--- src/outchannels.cpp.orig	Thu Apr 15 22:12:15 2004
+++ src/outchannels.cpp	Mon Apr 19 22:37:58 2004
@@ -24,11 +24,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>




--- src/pipe.cpp.orig	Mon Dec  8 21:20:33 2003
+++ src/pipe.cpp	Mon Apr 19 22:39:37 2004
@@ -25,7 +25,8 @@
 */
 
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
+#include <cerrno>
 #include <audioproc.h>
 #include <pipe.h>
 #include <jutils.h>




--- src/shout/sock.c.orig	Tue Mar 30 01:04:27 2004
+++ src/shout/sock.c	Mon Apr 19 23:32:09 2004
@@ -336,7 +336,11 @@
     int rc = SOCK_ERROR;
     va_list ap_retry;
 
+#if (defined(__FreeBSD__) && __FreeBSD__ < 5)
+    ap_retry = ap;
+#else
     va_copy (ap_retry, ap);
+#endif
 
     len = vsnprintf (buff, sizeof (buffer), fmt, ap);
 

Lines 1-9 Link Here

(-)audio/muse/pkg-plist (-9 lines)
1	bin/muse
2	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
3	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
4	%%PORTDOCS%%%%DOCSDIR%%/KNOWN-BUGS
5	%%PORTDOCS%%%%DOCSDIR%%/NEWS
6	%%PORTDOCS%%%%DOCSDIR%%/README
7	%%PORTDOCS%%%%DOCSDIR%%/TODO
8	%%PORTDOCS%%%%DOCSDIR%%/USAGE
9	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 65990

Lines 7-24 Link Here

(-)audio/muse/Makefile (-19 / +15 lines)
7	#	7	#
8		8
9	PORTNAME= MuSE	9	PORTNAME= MuSE
10	PORTVERSION= 0.8.1	10	PORTVERSION= 0.9
11	PORTREVISION= 3
12	CATEGORIES= audio	11	CATEGORIES= audio
13	MASTER_SITES= ${MASTER_SITE_SAVANNAH} \	12	MASTER_SITES= ftp://ftp.dyne.org/muse/releases/ \
14	http://muse.dyne.org/releases/	13	http://www.ljudmila.org/~jaromil/muse/releases/
15	MASTER_SITE_SUBDIR= muse
16	DISTNAME= MuSE-${PORTVERSION}
17		14
18	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
19	COMMENT= Multiple Streaming Engine	16	COMMENT= Multiple Streaming Engine
20		17
21	LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \	18	LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
		19	sndfile.1:${PORTSDIR}/audio/libsndfile \
22	vorbis.3:${PORTSDIR}/audio/libvorbis	20	vorbis.3:${PORTSDIR}/audio/libvorbis
23		21
24	USE_GETOPT_LONG= yes	22	USE_GETOPT_LONG= yes
Lines 27-59 Link Here
27	USE_GMAKE= yes	25	USE_GMAKE= yes
28	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
29	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
30	CONFIGURE_ARGS= --disable-debug	28	CONFIGURE_ARGS= --disable-debug --disable-lubrify
31		29
32	MAN1= muse.1	30	MAN1= muse.1
		31	PORTDOCS= ${DOCSFILES:S,doc/,,g}
		32	PLIT_FILES= bin/muse
33		33
34	CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}	34	CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
		35	${PTHREAD_CFLAGS}
35	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	36	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
36		37
		38	DOCFILES= AUTHORS ChangeLog KNOWN-BUGS NEWS README TODO doc/USAGE
		39
37	.if defined(WITHOUT_X11)	40	.if defined(WITHOUT_X11)
38	PKGNAMESUFFIX= -nox11	41	PKGNAMESUFFIX= -nox11
39	CONFIGURE_ARGS+= --without-x --with-rubik	42	CONFIGURE_ARGS+= --without-x --with-rubik
40	.else	43	.else
41	USE_GNOME+= gtk12	44	USE_GNOME+= gtk20
42	.endif	45	.endif
43		46
44	post-patch:
45	@${REINPLACE_CMD} -e 's\|^CFLAGS=.*$$\|CFLAGS="\$$CFLAGS"\|g ; \
46	s\|[$$]GTK_LIBS -lgthread\|\$$GTK_LIBS \$$GLIB_LIBS\|g ; \
47	s\|[$$]GTK_FLAGS\|\$$GTK_CFLAGS \$$GLIB_CFLAGS\|g' \
48	${WRKSRC}/configure
49	@${REINPLACE_CMD} -e 's\|-lpthread\|\|g' ${WRKSRC}/Makefile.in
50
51	do-install:	47	do-install:
52	${INSTALL_PROGRAM} ${WRKSRC}/muse ${PREFIX}/bin	48	${INSTALL_PROGRAM} ${WRKSRC}/src/muse ${PREFIX}/bin
53	${INSTALL_MAN} ${WRKSRC}/muse.1 ${MANPREFIX}/man/man1	49	${INSTALL_MAN} ${WRKSRC}/doc/muse.1 ${MANPREFIX}/man/man1
54	.if !defined(NOPORTDOCS)	50	.if !defined(NOPORTDOCS)
55	@${MKDIR} ${DOCSDIR}	51	@${MKDIR} ${DOCSDIR}
56	.for file in AUTHORS ChangeLog KNOWN-BUGS NEWS README TODO USAGE	52	.for file in ${DOCFILES}
57	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	53	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
58	.endfor	54	.endfor
59	.endif	55	.endif

Line 0 Link Here

(-)audio/muse/files/patch-configure (+38 lines)
	1	--- configure.orig Sun Apr 18 00:33:26 2004
	2	+++ configure Mon Apr 19 22:34:18 2004
	3	@@ -3427,7 +3427,7 @@
	4	#AM_DEFINE_UNQUOTED(HOST_CPU, "${host_cpu}")
	5
	6	#CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe"
	7	-CFLAGS="-pipe -D_REENTRANT"
	8	+CFLAGS="$CFLAGS -D_REENTRANT"
	9
	10	ac_ext=c
	11	ac_cpp='$CPP $CPPFLAGS'
	12	@@ -11182,7 +11182,7 @@
	13	else
	14
	15	lrint_save_CFLAGS=$CFLAGS
	16	-CFLAGS="-O2 -lm"
	17	+CFLAGS="$CFLAGS -lm"
	18	cat >conftest.$ac_ext <<_ACEOF
	19	#line $LINENO "configure"
	20	/* confdefs.h. */
	21	@@ -11249,7 +11249,7 @@
	22	else
	23
	24	lrintf_save_CFLAGS=$CFLAGS
	25	-CFLAGS="-O2 -lm"
	26	+CFLAGS="$CFLAGS -lm"
	27	cat >conftest.$ac_ext <<_ACEOF
	28	#line $LINENO "configure"
	29	/* confdefs.h. */
	30	@@ -11836,8 +11836,6 @@
	31	else
	32	CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -march=${host_cpu} -ffast-math"
	33	fi
	34	-else
	35	- CFLAGS="$CFLAGS -O2 -ffast-math"
	36	fi
	37
	38

Lines 1-157 Link Here

(-)audio/muse/files/patch-ncursesgui::about.cpp (-157 lines)
1	--- ncursesgui/about.cpp.orig Thu May 30 22:56:45 2002
2	+++ ncursesgui/about.cpp Mon Dec 22 00:47:55 2003
3	@@ -58,80 +58,80 @@
4	warning ("aboutbox::setitem()");
5	char src[8192];
6	snprintf (src, sizeof(src),
7	-"MuSE is a [ d y n e . o r g ] production! :)
8	-
9	-MuSE <-------------------------------> Multiple Streaming Engine
10	-MuSE is an application for the mixing, encoding, and streaming of sound:
11	-is an engine that can simultaniously mix up to 6 separate MP3 or OggVorbis
12	-audio files from the hard drive or the network, where each channel of
13	-audio can be dynamicly adjusted for speed and volume plus a soundcard
14	-line-in channel. The resulting stream can be played locally on the sound
15	-card and/or encoded as an mp3 network stream to an icecast or shoutcast
16	-server (ready to be mixed and played again by other muses... ;)
17	-
18	-MuSE has been created and is mantained by
19	-Denis Rojo aka jaromil <jaromil@dyne.org>
20	-The GTK+ graphical user interface is developed by
21	-nightolo <night@autistici.org>
22	-The ncurses user interface is developed by
23	-Luca Profico aka rubik <rubik@olografix.org>
24	-
25	-MuSE as it is now would have never existed without the contributions of:
26	-= Markus Seidl ( funda.ment.org ) for the idea of mixing and streaming
27	- multiple files
28	-= August Black ( aug.ment.org ) for the original graphical user interface
29	-= SERVUS.AT for trusting this project since the beginning and supporting it
30	-= PUBLIC VOICE Lab ( pvl.at ) for recently giving MuSE support and new
31	- horizons of use
32	-= Asbesto Molesto ( freaknet.org ) for the extensive testing and
33	- documentation
34	-= Alex, Rasty and Martinez ( ! ) for the good karma
35	-
36	-also BIG THANKS to:
37	-lobo, voyager, void, blicero, saiborg, the freaknet medialab, the ASCII
38	-squat, henk, the imc-audio collective, jeff, the LOA hacklab, the TPO,
39	-bundes & didi, indymedia italy, neural.it, the autistici.org collective,
40	-mag-one, radio onda rossa and all the others i'm forgetting here!
41	-
42	-MuSE redistributes, linking statically, the following libraries:
43	-= libmpeg by Woo-jae Jung (now mantained by Mikael Hedin)
44	-= libshout by Jack Moffit, Chad Armstrong and Scott Manley
45	-= libcdk by Mike Glover
46	-
47	-(refer to documentation included into subdirectories for more informations)
48	-
49	-MuSE can link dinamically to the following libraries:
50	-= libogg, libvorbis, libvorbisfile - www.xiph.org
51	-= glib, libgdk, libgtk - www.gtk.org
52	-= liblame - www.mp3dev.org/mp3
53	-= libX11, libXext - www.xfree86.org
54	-= other common GNU libraries
55	-
56	-MuSE sourcecode also got inspirations from:
57	-= stream mixer code by Scott Manley
58	-= buffered FIFO pipe code by Charles Samuels.
59	-
60	-
61	-MuSE is copyright (c) 2000, 2001, 2002 by Denis Rojo aka jaromil
62	-MuSE's GTK+ G.U.I. is (c) 2002 by nightolo
63	-MuSE's ncurses console U.I is (c) 2002 by Luca Profico aka rubik
64	-
65	-
66	-
67	----------------------------------------------------------------
68	-This source code is free software; you can redistribute it and/or
69	-modify it under the terms of the GNU Public License as published
70	-by the Free Software Foundation; either version 2 of the License,
71	-or (at your option) any later version.
72	-
73	-This source code is distributed in the hope that it will be useful,
74	-but WITHOUT ANY WARRANTY; without even the implied warranty of
75	-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
76	-Please refer to the GNU Public License for more details.
77	-
78	-You should have received a copy of the GNU Public License along with
79	-this source code; if not, write to:
80	-Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
81	+"MuSE is a [ d y n e . o r g ] production! :)\n\
82	+ \n\
83	+MuSE <-------------------------------> Multiple Streaming Engine \n\
84	+MuSE is an application for the mixing, encoding, and streaming of sound:\n\
85	+is an engine that can simultaniously mix up to 6 separate MP3 or OggVorbis\n\
86	+audio files from the hard drive or the network, where each channel of \n\
87	+audio can be dynamicly adjusted for speed and volume plus a soundcard \n\
88	+line-in channel. The resulting stream can be played locally on the sound \n\
89	+card and/or encoded as an mp3 network stream to an icecast or shoutcast \n\
90	+server (ready to be mixed and played again by other muses... ;)\n\
91	+\n\
92	+MuSE has been created and is mantained by \n\
93	+Denis Rojo aka jaromil <jaromil@dyne.org>\n\
94	+The GTK+ graphical user interface is developed by \n\
95	+nightolo <night@autistici.org>\n\
96	+The ncurses user interface is developed by\n\
97	+Luca Profico aka rubik <rubik@olografix.org>\n\
98	+\n\
99	+MuSE as it is now would have never existed without the contributions of:\n\
100	+= Markus Seidl ( funda.ment.org ) for the idea of mixing and streaming \n\
101	+ multiple files\n\
102	+= August Black ( aug.ment.org ) for the original graphical user interface\n\
103	+= SERVUS.AT for trusting this project since the beginning and supporting it\n\
104	+= PUBLIC VOICE Lab ( pvl.at ) for recently giving MuSE support and new \n\
105	+ horizons of use\n\
106	+= Asbesto Molesto ( freaknet.org ) for the extensive testing and \n\
107	+ documentation\n\
108	+= Alex, Rasty and Martinez ( ! ) for the good karma\n\
109	+\n\
110	+also BIG THANKS to:\n\
111	+lobo, voyager, void, blicero, saiborg, the freaknet medialab, the ASCII \n\
112	+squat, henk, the imc-audio collective, jeff, the LOA hacklab, the TPO, \n\
113	+bundes & didi, indymedia italy, neural.it, the autistici.org collective, \n\
114	+mag-one, radio onda rossa and all the others i'm forgetting here!\n\
115	+ \n\
116	+MuSE redistributes, linking statically, the following libraries:\n\
117	+= libmpeg by Woo-jae Jung (now mantained by Mikael Hedin)\n\
118	+= libshout by Jack Moffit, Chad Armstrong and Scott Manley\n\
119	+= libcdk by Mike Glover\n\
120	+\n\
121	+(refer to documentation included into subdirectories for more informations)\n\
122	+\n\
123	+MuSE can link dinamically to the following libraries:\n\
124	+= libogg, libvorbis, libvorbisfile - www.xiph.org\n\
125	+= glib, libgdk, libgtk - www.gtk.org\n\
126	+= liblame - www.mp3dev.org/mp3\n\
127	+= libX11, libXext - www.xfree86.org\n\
128	+= other common GNU libraries\n\
129	+\n\
130	+MuSE sourcecode also got inspirations from:\n\
131	+= stream mixer code by Scott Manley\n\
132	+= buffered FIFO pipe code by Charles Samuels.\n\
133	+\n\
134	+\n\
135	+MuSE is copyright (c) 2000, 2001, 2002 by Denis Rojo aka jaromil\n\
136	+MuSE's GTK+ G.U.I. is (c) 2002 by nightolo\n\
137	+MuSE's ncurses console U.I is (c) 2002 by Luca Profico aka rubik\n\
138	+\n\
139	+\n\
140	+\n\
141	+---------------------------------------------------------------\n\
142	+This source code is free software; you can redistribute it and/or\n\
143	+modify it under the terms of the GNU Public License as published \n\
144	+by the Free Software Foundation; either version 2 of the License,\n\
145	+or (at your option) any later version.\n\
146	+\n\
147	+This source code is distributed in the hope that it will be useful,\n\
148	+but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
149	+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
150	+Please refer to the GNU Public License for more details.\n\
151	+\n\
152	+You should have received a copy of the GNU Public License along with\n\
153	+this source code; if not, write to:\n\
154	+Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\
155	");
156
157	item = splitstring(src);

Lines 1-15 Link Here

(-)audio/muse/files/patch-outchannels.cpp (-15 lines)
1	--- outchannels.cpp.orig Fri Jun 7 02:44:42 2002
2	+++ outchannels.cpp Fri Jun 7 02:44:48 2002
3	@@ -20,11 +20,11 @@
4	#include <stdio.h>
5	#include <stdlib.h>
6	#include <string.h>
7	+#include <sys/types.h>
8	#include <sys/socket.h>
9	#include <netinet/in.h>
10	#include <arpa/inet.h>
11	#include <netdb.h>
12	-#include <sys/types.h>
13	#include <sys/stat.h>
14	#include <fcntl.h>
15	#include <unistd.h>

Lines 1-17 Link Here

(-)audio/muse/files/patch-shout::shout_private.h (-17 lines)
1	--- shout/shout_private.h.orig Fri Nov 29 20:51:56 2002
2	+++ shout/shout_private.h Wed May 14 14:26:24 2003
3	@@ -14,14 +14,6 @@
4	# include <inttypes.h>
5	#endif
6
7	-# if SIZEOF_INT == 8
8	-typedef unsigned int uint64_t;
9	-# elif SIZEOF_LONG == 8
10	-typedef unsigned long uint64_t;
11	-# elif SIZEOF_LONG_LONG == 8
12	-typedef unsigned long long uint64_t;
13	-# endif
14	-
15	#define LIBSHOUT_DEFAULT_HOST "localhost"
16	#define LIBSHOUT_DEFAULT_PORT 8000
17	#define LIBSHOUT_DEFAULT_FORMAT SHOUT_FORMAT_VORBIS

Line 0 Link Here

(-)audio/muse/files/patch-src::jmixer.cpp (+42 lines)
	1	--- src/jmixer.cpp.orig Sat Apr 10 02:50:43 2004
	2	+++ src/jmixer.cpp Mon Apr 19 22:49:59 2004
	3	@@ -20,18 +20,18 @@
	4	*/
	5
	6	#include <iostream>
	7	-#include <math.h>
	8	-#include <stdio.h>
	9	-#include <stdlib.h>
	10	+#include <cmath>
	11	+#include <cstdio>
	12	+#include <cstdlib>
	13	#include <unistd.h>
	14	#include <dirent.h>
	15	#include <sys/ioctl.h>
	16	#include <sys/stat.h>
	17	-#include <errno.h>
	18	+#include <cerrno>
	19	#include <fcntl.h>
	20	#include <sys/soundcard.h>
	21	-#include <string.h>
	22	-#include <signal.h>
	23	+#include <cstring>
	24	+#include <csignal>
	25	#include <sys/types.h>
	26	#include <sys/wait.h>
	27	#include <termios.h>
	28	@@ -624,10 +624,11 @@
	29	return true;
	30	}
	31
	32	-/* this is the function selecting files for the scandir
	33	- on freebsd systems you should change the following line to:
	34	- int selector(struct dirent dir) { /
	35	+#if defined(__FreeBSD__)
	36	+int selector(struct dirent *dir) {
	37	+#else
	38	int selector(const struct dirent *dir) {
	39	+#endif
	40	if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
	41	#ifdef HAVE_VORBIS
	42	\|\| strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0

Line 0 Link Here

(-)audio/muse/files/patch-src::libmpeg::mpegtoraw.cc (+22 lines)
	1	--- src/libmpeg/mpegtoraw.cc.orig Mon Dec 8 21:20:37 2003
	2	+++ src/libmpeg/mpegtoraw.cc Mon Apr 19 23:00:18 2004
	3	@@ -9,8 +9,8 @@
	4	#include <pthread.h>
	5	#endif
	6
	7	-#include <math.h>
	8	-#include <stdlib.h>
	9	+#include <cmath>
	10	+#include <cstdlib>
	11	#include <unistd.h>
	12
	13	#include "mpegsound.h"
	14	@@ -419,7 +419,7 @@
	15	return true;
	16	}
	17
	18	-#include <iostream.h>
	19	+#include <iostream>
	20	// Convert mpeg to raw
	21	bool Mpegtoraw::run(int frames) {
	22	clearrawdata();

Line 0 Link Here

(-)audio/muse/files/patch-src::outchannels.cpp (+15 lines)
	1	--- src/outchannels.cpp.orig Thu Apr 15 22:12:15 2004
	2	+++ src/outchannels.cpp Mon Apr 19 22:37:58 2004
	3	@@ -24,11 +24,11 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6	#include <string.h>
	7	+#include <sys/types.h>
	8	#include <sys/socket.h>
	9	#include <netinet/in.h>
	10	#include <arpa/inet.h>
	11	#include <netdb.h>
	12	-#include <sys/types.h>
	13	#include <sys/stat.h>
	14	#include <fcntl.h>
	15	#include <unistd.h>

Line 0 Link Here

(-)audio/muse/files/patch-src::pipe.cpp (+12 lines)
	1	--- src/pipe.cpp.orig Mon Dec 8 21:20:33 2003
	2	+++ src/pipe.cpp Mon Apr 19 22:39:37 2004
	3	@@ -25,7 +25,8 @@
	4	*/
	5
	6	#include <iostream>
	7	-#include <stdlib.h>
	8	+#include <cstdlib>
	9	+#include <cerrno>
	10	#include <audioproc.h>
	11	#include <pipe.h>
	12	#include <jutils.h>

Line 0 Link Here

(-)audio/muse/files/patch-src::shout::sock.c (+14 lines)
	1	--- src/shout/sock.c.orig Tue Mar 30 01:04:27 2004
	2	+++ src/shout/sock.c Mon Apr 19 23:32:09 2004
	3	@@ -336,7 +336,11 @@
	4	int rc = SOCK_ERROR;
	5	va_list ap_retry;
	6
	7	+#if (defined(__FreeBSD__) && __FreeBSD__ < 5)
	8	+ ap_retry = ap;
	9	+#else
	10	va_copy (ap_retry, ap);
	11	+#endif
	12
	13	len = vsnprintf (buff, sizeof (buffer), fmt, ap);
	14