- Update to 2.1pl2.

- Move Petal.so back into ${PREFIX}/lib/rosegarden/petal
- Install a wrapper script that adds the dir to TCLLIBPATH so you don't have
  to edit your .profile because of this...
- Fixes for the FreeBSD sound system, midi playback while recording
  works now.

PR:		14234
Submitted by:	Juergen Lock <nox@jelal.kn-bremen.de>

8 files changed, 40 insertions, 26 deletions

diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index e2c4e45dbec4..5775d28c2e96 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -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$
 #
 
-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
 
@@ -31,4 +27,9 @@ do-install:
 	 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>
diff --git a/audio/rosegarden/distinfo b/audio/rosegarden/distinfo
index 9b8a209623d7..9fc58b66c71f 100644
--- a/audio/rosegarden/distinfo
+++ b/audio/rosegarden/distinfo
@@ -1 +1 @@
-MD5 (rosegarden-2.1-sources.tar.gz) = e5d866300965c1d928b6edd280f78b21
+MD5 (rosegarden-2.1pl2.tar.gz) = 994a0d35a68817abc8fa7882d12b4929
diff --git a/audio/rosegarden/files/patch-aa b/audio/rosegarden/files/patch-aa
index f387e163016d..6378b96bdcd0 100644
--- a/audio/rosegarden/files/patch-aa
+++ b/audio/rosegarden/files/patch-aa
@@ -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"
  
diff --git a/audio/rosegarden/files/patch-ad b/audio/rosegarden/files/patch-ad
index 1922be247b1a..815a1db29be8 100644
--- a/audio/rosegarden/files/patch-ad
+++ b/audio/rosegarden/files/patch-ad
@@ -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
diff --git a/audio/rosegarden/files/patch-ak b/audio/rosegarden/files/patch-ak
index b77aa1ea438a..e94a529d37db 100644
--- a/audio/rosegarden/files/patch-ak
+++ b/audio/rosegarden/files/patch-ak
@@ -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>
diff --git a/audio/rosegarden/files/patch-al b/audio/rosegarden/files/patch-al
new file mode 100644
index 000000000000..af31fbaa885a
--- /dev/null
+++ b/audio/rosegarden/files/patch-al
@@ -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>
diff --git a/audio/rosegarden/files/rosegarden b/audio/rosegarden/files/rosegarden
new file mode 100644
index 000000000000..6ab6a8566c21
--- /dev/null
+++ b/audio/rosegarden/files/rosegarden
@@ -0,0 +1,2 @@
+#! /bin/sh
+TCLLIBPATH="$TCLLIBPATH %%PREFIX%%/lib/rosegarden/petal" %%PREFIX%%/bin/rosegarden-bin
diff --git a/audio/rosegarden/pkg-plist b/audio/rosegarden/pkg-plist
index d1239f68f7c9..75cc4d16cda5 100644
--- a/audio/rosegarden/pkg-plist
+++ b/audio/rosegarden/pkg-plist
@@ -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/std.sb
 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