Attachment 6193 Details for Bug 14234 – file.diff

[patch] file.diff

file.diff (text/plain), 5.86 KB, created by Juergen Lock on 1999-10-09 15:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juergen Lock

Created: 1999-10-09 15:40:01 UTC

Size: 5.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/cvs/cvs/ports/audio/rosegarden/Makefile,v
>retrieving revision 1.12
>diff -u -u -r1.12 Makefile
>--- Makefile	1999/10/03 03:34:28	1.12
>+++ Makefile	1999/10/03 19:49:44
>@@ -1,18 +1,14 @@
> # New ports collection makefile for:	rosegarden
>-# Version required:	2.1
>+# Version required:	2.1pl2
> # Date created:		04 Aug 1996
> # Whom:			shanee@augusta.de
> #
> # $FreeBSD: ports/audio/rosegarden/Makefile,v 1.12 1999/10/03 03:34:28 cpiazza Exp $
> #
> 
>-DISTNAME=	rosegarden-2.1
>+DISTNAME=	rosegarden-2.1pl2
> CATEGORIES=	audio
>-MASTER_SITES=	ftp://ftp.maths.bath.ac.uk/pub/dream/ROSE/ \
>-		ftp://ftp.unina.it/pub/Unix/pkgs/audio/rosegarden/ \
>-		ftp://sunsite.auc.dk//disk6/linuxberg.com/files/x11/media/ \
>-		ftp://ftp.flashnet.it//mirror/8/linuxberg/files/x11/media/
>-EXTRACT_SUFX=	-sources.tar.gz
>+MASTER_SITES=	http://www.all-day-breakfast.com/rosegarden/patches/
> 
> MAINTAINER=	shanee@augusta.de
> 
>@@ -30,5 +26,10 @@
> 	@( \
> 	 cd ${WRKSRC} ; ${SETENV} PREFIX="${PREFIX}" ./do-install \
> 	)
>+
>+post-install:
>+	${MV} -i ${PREFIX}/bin/rosegarden ${PREFIX}/bin/rosegarden-bin
>+	${SED} s-%%PREFIX%%-${PREFIX}-g ${FILESDIR}/rosegarden >${WRKDIR}/rosegarden
>+	${INSTALL_SCRIPT} ${WRKDIR}/rosegarden ${PREFIX}/bin
> 
> .include <bsd.port.mk>
>Index: files/md5
>===================================================================
>RCS file: /home/cvs/cvs/ports/audio/rosegarden/files/md5,v
>retrieving revision 1.3
>diff -u -u -r1.3 md5
>--- md5	1999/07/11 20:52:09	1.3
>+++ md5	1999/10/02 18:24:36
>@@ -1 +1 @@
>-MD5 (rosegarden-2.1-sources.tar.gz) = e5d866300965c1d928b6edd280f78b21
>+MD5 (rosegarden-2.1pl2.tar.gz) = 994a0d35a68817abc8fa7882d12b4929
>Index: patches/patch-aa
>===================================================================
>RCS file: /home/cvs/cvs/ports/audio/rosegarden/patches/patch-aa,v
>retrieving revision 1.5
>diff -u -u -r1.5 patch-aa
>--- patch-aa	1999/09/20 02:24:29	1.5
>+++ patch-aa	1999/10/02 19:09:34
>@@ -38,14 +38,12 @@
>  		if test -n "$TCL_MIDI_CHECK"
>  		then
>  			Petal=""
>-@@ -152,9 +160,9 @@
>- 
>+@@ -153,8 +161,8 @@
>  	*freebsd*)
>  	defines="-DNO_SYS_ERRLIST"
>--	AC_CHECK_HEADER(sys/soundcard.h, sound_system="-DSYSTEM_FREEBSD")
>+ 	AC_CHECK_HEADER(machine/soundcard.h, sound_system="-DSYSTEM_OSS")
> -	extra_libs="-lmalloc"
> -	# LDFLAGS="-L/usr/lib -L/usr/X11R6/lib"
>-+	AC_CHECK_HEADER(sys/soundcard.h, sound_system="-DSYSTEM_OSS")
> +	# extra_libs="-lmalloc"
> +	LDFLAGS="-L/usr/lib -L/usr/X11R6/lib"
>  
>Index: patches/patch-ad
>===================================================================
>RCS file: /home/cvs/cvs/ports/audio/rosegarden/patches/patch-ad,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-ad
>--- patch-ad	1999/07/11 20:52:12	1.1
>+++ patch-ad	1999/10/03 18:53:24
>@@ -1,5 +1,4 @@
>---- do-install.orig	Tue Oct 21 14:32:43 1997
>-+++ do-install	Mon Jul 12 13:17:27 1999
>+Index: do-install
> @@ -1,27 +1,23 @@
>  #!/bin/sh
>  
>@@ -46,13 +45,13 @@
>  
>  $install -d $ROSELIBDIR/petal
> -test -f ./petal/Petal.so && $install -m 644 ./petal/Petal.so $ROSELIBDIR/petal
>-+test -f ./petal/Petal.so && $install -m 644 ./petal/Petal.so ${PREFIX}/lib/tclmidi/
>++test -f ./petal/Petal.so && $install -c -m 644 ./petal/Petal.so $ROSELIBDIR/petal
>  $install -c ./petal/Petal.tcl $ROSELIBDIR/petal
>  $install -c ./petal/petaleditor/PetalEditor.tcl $ROSELIBDIR/petal
>  $install -c ./petal/petalmidi/PetalMidi.tcl $ROSELIBDIR/petal
>  
> -( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh )
>-+( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . *.tcl" | tclsh8.0 )
>++( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh8.0 )
>  
>  $install -d $ROSELIBDIR/rosepetal-filters
>  $install -c ./petal/harmonizer.tcl $ROSELIBDIR/rosepetal-filters
>Index: patches/patch-ak
>===================================================================
>RCS file: /home/cvs/cvs/ports/audio/rosegarden/patches/patch-ak,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-ak
>--- patch-ak	1999/09/20 02:24:29	1.1
>+++ patch-ak	1999/10/02 18:51:38
>@@ -1,12 +1,15 @@
>---- mapper/src/Mapper_OSS.c.orig	Sat Sep 18 16:18:42 1999
>-+++ mapper/src/Mapper_OSS.c	Sat Sep 18 16:19:17 1999
>-@@ -13,6 +13,9 @@
>- #include <sys/stat.h>
>- #include <unistd.h>
>- #include <fcntl.h>
>+Index: mapper/src/Mapper_OSS.c
>+@@ -964,6 +964,13 @@
>+ 
>+ BEGIN("Mapper_ReadEvent");
>+ 
> +#ifdef __FreeBSD__
>-+#include <errno.h>
>++    /* on FreeBSD the read() will block when there is no data available... */
>++    out = 0;
>++    ioctl(seqfd, SNDCTL_SEQ_GETINCOUNT, &out);
>++    if (!out)
>++        RETURN_BOOL(False);
> +#endif
>+     if ( ( out = read(seqfd, &InBytes, sizeof(InBytes)) ) <= 0 )
>+         RETURN_BOOL(False);
>  
>- #include <MidiFile.h>
>- #include <MidiErrorHandler.h>
>Index: pkg/PLIST
>===================================================================
>RCS file: /home/cvs/cvs/ports/audio/rosegarden/pkg/PLIST,v
>retrieving revision 1.3
>diff -u -u -r1.3 PLIST
>--- PLIST	1999/07/11 20:52:15	1.3
>+++ PLIST	1999/10/03 19:53:22
>@@ -1,5 +1,5 @@
>-lib/tclmidi/Petal.so
> bin/rosegarden
>+bin/rosegarden-bin
> lib/rosegarden/bin/editor
> lib/rosegarden/bin/sequencer
> lib/rosegarden/example/glazunov.rose
>@@ -7,6 +7,7 @@
> lib/rosegarden/synth-patches/drums.sb
> lib/rosegarden/help/rosehelp.hnx
> lib/rosegarden/help/rosehelp.info
>+lib/rosegarden/petal/Petal.so
> lib/rosegarden/petal/Petal.tcl
> lib/rosegarden/petal/PetalEditor.tcl
> lib/rosegarden/petal/PetalMidi.tcl
>--- /dev/null	Sun Oct  3 22:40:01 1999
>+++ patches/patch-al	Sat Oct  2 21:03:38 1999
>@@ -0,0 +1,10 @@
>+Index: include/Mapper_OSS.h
>+@@ -4,7 +4,7 @@
>+ #undef MIDI_PITCH_BEND
>+ #endif
>+ 
>+-#ifdef SYSTEM_FREEBSD || defined (__FreeBSD__)
>++#if defined(SYSTEM_FREEBSD) || defined (__FreeBSD__)
>+ #include <machine/soundcard.h>
>+ #elif SYSTEM_OSS
>+ #include <sys/soundcard.h>
>--- /dev/null	Sun Oct  3 22:40:01 1999
>+++ files/rosegarden	Sun Oct  3 21:48:34 1999
>@@ -0,0 +1,2 @@
>+#! /bin/sh
>+TCLLIBPATH="$TCLLIBPATH %%PREFIX%%/lib/rosegarden/petal" %%PREFIX%%/bin/rosegarden-bin

Actions: View | Diff

Attachments on bug 14234: 6193