Attachment 42306 Details for Bug 65990 – file.diff

[patch] file.diff

file.diff (text/plain), 19.16 KB, created by tkato on 2004-04-26 14:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2004-04-26 14:10:16 UTC

Size: 19.16 KB

patch

obsolete

>diff -urN /usr/ports/audio/muse/Makefile audio/muse/Makefile
>--- /usr/ports/audio/muse/Makefile	Wed Feb  4 18:55:26 2004
>+++ audio/muse/Makefile	Sat Apr 24 23:58:36 2004
>@@ -7,18 +7,16 @@
> #
> 
> PORTNAME=	MuSE
>-PORTVERSION=	0.8.1
>-PORTREVISION=	3
>+PORTVERSION=	0.9
> CATEGORIES=	audio
>-MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
>-		http://muse.dyne.org/releases/
>-MASTER_SITE_SUBDIR=	muse
>-DISTNAME=	MuSE-${PORTVERSION}
>+MASTER_SITES=	ftp://ftp.dyne.org/muse/releases/ \
>+		http://www.ljudmila.org/~jaromil/muse/releases/
> 
> 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
>@@ -27,33 +25,31 @@
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>-CONFIGURE_ARGS=	--disable-debug
>+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 ${PTHREAD_CFLAGS}
>+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+=	gtk12
>+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}/muse ${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/muse.1 ${MANPREFIX}/man/man1
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/muse ${PREFIX}/bin
>+	${INSTALL_MAN} ${WRKSRC}/doc/muse.1 ${MANPREFIX}/man/man1
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-.for file in AUTHORS ChangeLog KNOWN-BUGS NEWS README TODO USAGE
>+.for file in ${DOCFILES}
> 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
> .endfor
> .endif
>diff -urN /usr/ports/audio/muse/distinfo audio/muse/distinfo
>--- /usr/ports/audio/muse/distinfo	Wed Jan 28 18:45:04 2004
>+++ audio/muse/distinfo	Sat Apr 24 23:20:54 2004
>@@ -1,2 +1,2 @@
>-MD5 (MuSE-0.8.1.tar.gz) = 1ca2c62aa2db10f92ee5a864da736e34
>-SIZE (MuSE-0.8.1.tar.gz) = 624750
>+MD5 (MuSE-0.9.tar.gz) = 0c2075c9f62ba1d08459f669498b6bcf
>+SIZE (MuSE-0.9.tar.gz) = 1363091
>diff -urN /usr/ports/audio/muse/files/patch-configure audio/muse/files/patch-configure
>--- /usr/ports/audio/muse/files/patch-configure	Thu Jan  1 09:00:00 1970
>+++ audio/muse/files/patch-configure	Sat Apr 24 23:20:54 2004
>@@ -0,0 +1,38 @@
>+--- 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
>+ 
>+ 
>diff -urN /usr/ports/audio/muse/files/patch-gtkgui::listpack.cpp audio/muse/files/patch-gtkgui::listpack.cpp
>--- /usr/ports/audio/muse/files/patch-gtkgui::listpack.cpp	Sat Aug  2 10:40:48 2003
>+++ audio/muse/files/patch-gtkgui::listpack.cpp	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- gtkgui/listpack.cpp.orig	Mon Jul 28 20:31:24 2003
>-+++ gtkgui/listpack.cpp	Mon Jul 28 20:32:17 2003
>-@@ -49,7 +49,7 @@
>- 	item->container = container;
>- 	item->data = data;
>- 
>--	func("list_add:: item %p item->pos = %u
>-+	func("list_add:: item %p item->pos = %u\
>- 			item->container= %p item->data=%p", item, item->pos,
>- 			item->container, item->data);
>- 	/**list = g_list_append(*list, (void *) item);*/
>diff -urN /usr/ports/audio/muse/files/patch-jmixer.cpp audio/muse/files/patch-jmixer.cpp
>--- /usr/ports/audio/muse/files/patch-jmixer.cpp	Sun Dec 29 13:39:22 2002
>+++ audio/muse/files/patch-jmixer.cpp	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- jmixer.cpp.orig	Tue Jul 23 04:48:56 2002
>-+++ jmixer.cpp	Sat Dec 28 09:41:10 2002
>-@@ -808,7 +808,7 @@
>- }
>- 
>- /* this is the function selecting files for the scandir */
>--int selector(const struct dirent *dir) {
>-+int selector(struct dirent *dir) {
>-   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
>diff -urN /usr/ports/audio/muse/files/patch-ncursesgui::about.cpp audio/muse/files/patch-ncursesgui::about.cpp
>--- /usr/ports/audio/muse/files/patch-ncursesgui::about.cpp	Mon Dec 22 20:56:46 2003
>+++ audio/muse/files/patch-ncursesgui::about.cpp	Thu Jan  1 09:00:00 1970
>@@ -1,157 +0,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);
>diff -urN /usr/ports/audio/muse/files/patch-outchannels.cpp audio/muse/files/patch-outchannels.cpp
>--- /usr/ports/audio/muse/files/patch-outchannels.cpp	Fri Jun  7 03:47:52 2002
>+++ audio/muse/files/patch-outchannels.cpp	Thu Jan  1 09:00:00 1970
>@@ -1,15 +0,0 @@
>---- 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>
>diff -urN /usr/ports/audio/muse/files/patch-shout::mp3.c audio/muse/files/patch-shout::mp3.c
>--- /usr/ports/audio/muse/files/patch-shout::mp3.c	Sun Apr 27 07:28:40 2003
>+++ audio/muse/files/patch-shout::mp3.c	Thu Jan  1 09:00:00 1970
>@@ -1,10 +0,0 @@
>---- shout/mp3.c.orig	Tue Mar 25 05:30:10 2003
>-+++ shout/mp3.c	Thu Apr 24 02:44:09 2003
>-@@ -1,7 +1,6 @@
>- /* mp3.c: libshout MP3 format handler */
>- 
>- #include <stdio.h>
>--#include <stdint.h>
>- #include <stdlib.h>
>- #include <string.h>
>- #include <config.h>
>diff -urN /usr/ports/audio/muse/files/patch-shout::shout_private.h audio/muse/files/patch-shout::shout_private.h
>--- /usr/ports/audio/muse/files/patch-shout::shout_private.h	Wed May 14 14:28:56 2003
>+++ audio/muse/files/patch-shout::shout_private.h	Thu Jan  1 09:00:00 1970
>@@ -1,17 +0,0 @@
>---- 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
>diff -urN /usr/ports/audio/muse/files/patch-src::Makefile.in audio/muse/files/patch-src::Makefile.in
>--- /usr/ports/audio/muse/files/patch-src::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ audio/muse/files/patch-src::Makefile.in	Sat Apr 24 23:20:54 2004
>@@ -0,0 +1,10 @@
>+--- src/Makefile.in.orig	Sun Apr 18 00:33:24 2004
>++++ src/Makefile.in	Mon Apr 19 22:28:56 2004
>+@@ -207,7 +207,6 @@
>+ muse_LDADD = \
>+ 	$(top_srcdir)/src/resample/libresample.a \
>+ 	$(top_srcdir)/src/libmpeg/libmpeg.a \
>+-	-lpthread \
>+ 	@LIBSHOUT_LIB@ \
>+ 	@M_LIBS@ \
>+ 	@LAME_LIBS@ \
>diff -urN /usr/ports/audio/muse/files/patch-src::jmixer.cpp audio/muse/files/patch-src::jmixer.cpp
>--- /usr/ports/audio/muse/files/patch-src::jmixer.cpp	Thu Jan  1 09:00:00 1970
>+++ audio/muse/files/patch-src::jmixer.cpp	Sat Apr 24 23:20:54 2004
>@@ -0,0 +1,42 @@
>+--- 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
>diff -urN /usr/ports/audio/muse/files/patch-src::libmpeg::mpegtoraw.cc audio/muse/files/patch-src::libmpeg::mpegtoraw.cc
>--- /usr/ports/audio/muse/files/patch-src::libmpeg::mpegtoraw.cc	Thu Jan  1 09:00:00 1970
>+++ audio/muse/files/patch-src::libmpeg::mpegtoraw.cc	Sat Apr 24 23:20:54 2004
>@@ -0,0 +1,22 @@
>+--- 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();
>diff -urN /usr/ports/audio/muse/files/patch-src::outchannels.cpp audio/muse/files/patch-src::outchannels.cpp
>--- /usr/ports/audio/muse/files/patch-src::outchannels.cpp	Thu Jan  1 09:00:00 1970
>+++ audio/muse/files/patch-src::outchannels.cpp	Sat Apr 24 23:20:54 2004
>@@ -0,0 +1,15 @@
>+--- 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>
>diff -urN /usr/ports/audio/muse/files/patch-src::pipe.cpp audio/muse/files/patch-src::pipe.cpp
>--- /usr/ports/audio/muse/files/patch-src::pipe.cpp	Thu Jan  1 09:00:00 1970
>+++ audio/muse/files/patch-src::pipe.cpp	Sat Apr 24 23:20:54 2004
>@@ -0,0 +1,12 @@
>+--- 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>
>diff -urN /usr/ports/audio/muse/files/patch-src::shout::sock.c audio/muse/files/patch-src::shout::sock.c
>--- /usr/ports/audio/muse/files/patch-src::shout::sock.c	Thu Jan  1 09:00:00 1970
>+++ audio/muse/files/patch-src::shout::sock.c	Sat Apr 24 23:20:54 2004
>@@ -0,0 +1,14 @@
>+--- 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);
>+ 
>diff -urN /usr/ports/audio/muse/pkg-plist audio/muse/pkg-plist
>--- /usr/ports/audio/muse/pkg-plist	Tue Apr 29 13:57:17 2003
>+++ audio/muse/pkg-plist	Thu Jan  1 09:00:00 1970
>@@ -1,9 +0,0 @@
>-bin/muse
>-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>-%%PORTDOCS%%%%DOCSDIR%%/KNOWN-BUGS
>-%%PORTDOCS%%%%DOCSDIR%%/NEWS
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%PORTDOCS%%%%DOCSDIR%%/USAGE
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 65990: 42306