13 files changed, 274 insertions, 82 deletions

diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 4d0046874bcd..e11b422a64bf 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,29 +1,33 @@
 # New ports collection makefile for:	rosegarden
-# Version required:	2.0.1
+# Version required:	2.1
 # Date created:		04 Aug 1996
-# Whom:			shanee
+# Whom:			shanee@augusta.de
 #
-# $Id: Makefile,v 1.6 1998/09/21 01:35:21 steve Exp $
+# $Id: Makefile,v 1.7 1998/12/09 22:35:04 billf Exp $
 #
 
-DISTNAME=	rosegarden-2.0.1
+DISTNAME=	rosegarden-2.1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.maths.bath.ac.uk/pub/dream/ROSE/ \
-		ftp://ftp.sao.ru/pub1/src/dream/ROSE/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/sound/ \
-		ftp://ftp.uni-trier.de/pub/unix/audio/rosegarden/ \
-		ftp://ftp.funet.fi/pub/sci/audio/rosegarden/
-EXTRACT_SUFX=	-sources.tgz
+		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
 
 MAINTAINER=	shanee@augusta.de
 
-LIB_DEPENDS=	Xaw3d.6:$(PORTSDIR)/x11-toolkits/Xaw3d
-RUN_DEPENDS=	playmidi:${PORTSDIR}/audio/playmidi
+BUILD_DEPENDS=	${LOCALBASE}/lib/tclmidi/tclmidi31.so:$(PORTSDIR)/audio/tclmidi
+RUN_DEPENDS=	${LOCALBASE}/lib/tclmidi/tclmidi31.so:$(PORTSDIR)/audio/tclmidi	
 
-ALL_TARGET=	all ROSEGARDEN=$(WRKSRC) SYSLIBS="\"-lXaw3d -lXext -lXmu -lXt -lX11\"" SYSEXTRALIBS=""
+GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+USE_XLIB=	yes
+CONFIGURE_ARGS=	--with-tclincl=${LOCALBASE}/include/tcl8.0/
+CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib"
 
-WRKSRC=		${WRKDIR}/rosegarden
-MAKEFILE=	Makefile.FreeBSD
-MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}"
+do-install:
+	@( \
+	 cd ${WRKSRC} ; ${SETENV} PREFIX="${PREFIX}" ./do-install \
+	)
 
 .include <bsd.port.mk>
diff --git a/audio/rosegarden/distinfo b/audio/rosegarden/distinfo
index fbc4a443fa66..9b8a209623d7 100644
--- a/audio/rosegarden/distinfo
+++ b/audio/rosegarden/distinfo
@@ -1 +1 @@
-MD5 (rosegarden-2.0.1-sources.tgz) = e9407ba667a120cfc685b5b6b314494a
+MD5 (rosegarden-2.1-sources.tar.gz) = e5d866300965c1d928b6edd280f78b21
diff --git a/audio/rosegarden/files/patch-aa b/audio/rosegarden/files/patch-aa
index e6eba615dafb..f86c64861c6d 100644
--- a/audio/rosegarden/files/patch-aa
+++ b/audio/rosegarden/files/patch-aa
@@ -1,30 +1,51 @@
---- Makefile.FreeBSD.orig	Tue Sep 10 16:04:21 1996
-+++ Makefile.FreeBSD	Fri Sep 25 11:19:37 1998
-@@ -139,6 +139,9 @@
- # System library directories, also exported
+--- /tmp/rosegarden-2.1/configure.in	Wed Oct 15 20:42:59 1997
++++ ./configure.in	Fri May 14 20:29:22 1999
+@@ -4,6 +4,14 @@
  
- SYSLDFLAGS	= -L/usr/lib -L/usr/X11R6/lib
-+.if ${PORTOBJFORMAT} == "elf"
-+SYSLDFLAGS	+= -Wl,-rpath,/usr/X11R6/lib
-+.endif
- SYSEXTRALIBS	= -lmalloc
+ AC_CONFIG_HEADER(config.h)
  
- 
-@@ -264,6 +267,17 @@
- 		  $(MAKE) depend )
- 		( $(EXPORTATION) ; cd $(ROSEGARDEN)/topbox/src ; \
- 		  $(MAKE) depend )
++AC_ARG_WITH(tcl,
++    [--with-tclincl        Set tcl iclude Path],     
++    [ with_tcl=$withval ],   
++    [ with_tcl=/usr/local/include ],   
++)
++
++CFLAGS="${CFLAGS} -I ${with_tcl}"
 +
-+install:
-+		$(MKDIR) $(PREFIX)/lib/rosegarden
-+		$(MKDIR) $(PREFIX)/lib/rosegarden/music
-+		$(INSTALL_PROGRAM) ./bin/rosegarden $(PREFIX)/bin
-+		$(INSTALL_PROGRAM) ./bin/editor $(PREFIX)/lib/rosegarden
-+		$(INSTALL_PROGRAM) ./bin/sequencer $(PREFIX)/lib/rosegarden
-+		$(INSTALL_DATA) ./common/help/* $(PREFIX)/lib/rosegarden
-+		$(INSTALL_DATA) ./common/synth-patches/std.sb $(PREFIX)/lib/rosegarden
-+		$(INSTALL_DATA) ./common/music/*.rose $(PREFIX)/lib/rosegarden/music
-+		$(INSTALL_DATA) Rosegarden $(X11BASE)/lib/X11/app-defaults/
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_LN_S
+@@ -67,11 +75,11 @@
+ 
+ Petal=Petal
+ 
+-AC_CHECK_HEADER(tcl.h, TCL_CHECK=1, TCL_CHECK=0)
++TCL_CHECK=1
+ 
+ if test $TCL_CHECK -eq 1
+ then
+-     AC_PATH_PROG(TCLSH, tclsh)
++     AC_PATH_PROG(TCLSH, tclsh8.0)
+      if test -n "$TCLSH"
+      then
+ 	# Check Tcl version:
+@@ -88,7 +96,7 @@
+ 	then
+ 		# Check for TclMIDI
+ 		AC_CHECKING(if TclMIDI is installed)
+-		TCL_MIDI_CHECK=`echo "package require tclmidi" | $TCLSH 2>&1`
++		TCL_MIDI_CHECK=
+ 		if test -n "$TCL_MIDI_CHECK"
+ 		then
+ 			Petal=""
+@@ -153,8 +161,8 @@
+ 	*freebsd*)
+ 	defines="-DNO_SYS_ERRLIST"
+ 	AC_CHECK_HEADER(sys/soundcard.h, sound_system="-DSYSTEM_FREEBSD")
+-	extra_libs="-lmalloc"
+-	# LDFLAGS="-L/usr/lib -L/usr/X11R6/lib"
++	# extra_libs="-lmalloc"
++	LDFLAGS="-L/usr/lib -L/usr/X11R6/lib"
  
- clean:
- 		( $(EXPORTATION) ; cd $(ROSEGARDEN)/lists/src ; \
+ 	PETAL_LD=ld
+ 	PETAL_CFLAGS="-fPIC"
diff --git a/audio/rosegarden/files/patch-ab b/audio/rosegarden/files/patch-ab
index 0a967fc4aa82..c079741f5dd1 100644
--- a/audio/rosegarden/files/patch-ab
+++ b/audio/rosegarden/files/patch-ab
@@ -1,28 +1,20 @@
-*** Rosegarden.orig	Wed Sep 11 06:25:10 1996
---- Rosegarden	Thu Aug 28 15:51:58 1997
-***************
-*** 8,19 ****
-  Rosegarden*sequencerName:	/usr/local/lib/rosegarden/sequencer
-  Rosegarden*helpFile:		/usr/local/lib/rosegarden/rosehelp.info
-  Rosegarden*midiFmPatchFile:	/usr/local/lib/rosegarden/std.sb
-! Rosegarden*externalPlayer:	/usr/local/bin/playmidi
-  
-! Rosegarden*musicDirectory:	/usr/local/lib/music
-  Rosegarden*midiFmPatchFile:	/usr/local/lib/rosegarden/std.sb
-! !Rosegarden*midiPort:		/dev/sequencer2
-! Rosegarden*externalPlayer:	/usr/local/bin/xplaymidi
-  
-  Rosegarden*shouldWarpPointer:	False
-  
---- 8,18 ----
-  Rosegarden*sequencerName:	/usr/local/lib/rosegarden/sequencer
-  Rosegarden*helpFile:		/usr/local/lib/rosegarden/rosehelp.info
-  Rosegarden*midiFmPatchFile:	/usr/local/lib/rosegarden/std.sb
-! Rosegarden*externalPlayer:	/usr/local/bin/playmidi -f
-  
-! Rosegarden*musicDirectory:	/usr/local/lib/rosegarden/music
-  Rosegarden*midiFmPatchFile:	/usr/local/lib/rosegarden/std.sb
-! Rosegarden*midiPort:		/dev/sequencer
-  
-  Rosegarden*shouldWarpPointer:	False
-  
+--- /tmp/rosegarden-2.1/petal/Makefile.in	Sat Oct 18 11:43:27 1997
++++ ./petal/Makefile.in	Fri May 14 17:29:54 1999
+@@ -7,7 +7,7 @@
+ 
+ pkgIndex.tcl : Petal.so Petal.tcl
+ 	@echo "The error message for Petal.tcl is normal"
+-	echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh
++	echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh8.0
+ 
+ petaleditor/pkgIndex.tcl : petaleditor/PetalEditor.tcl
+ 	cd petaleditor; make
+@@ -19,7 +19,7 @@
+ 	$(LD) $(LDFLAGS) Petal.o -o Petal.so
+ 
+ Petal.o : Petal.c
+-	$(CC) $(CFLAGS) -c -o Petal.o Petal.c
++	$(CC) $(CFLAGS) -I/usr/local/include -c -o Petal.o Petal.c
+ 
+ clean :
+ 	rm -f Petal.o Petal.so
diff --git a/audio/rosegarden/files/patch-ac b/audio/rosegarden/files/patch-ac
new file mode 100644
index 000000000000..e04e0eadef01
--- /dev/null
+++ b/audio/rosegarden/files/patch-ac
@@ -0,0 +1,9 @@
+--- /tmp/rosegarden-2.1/petal/petaleditor/Makefile	Sun Mar  2 20:03:35 1997
++++ ./petal/petaleditor/Makefile	Fri May 14 17:20:35 1999
+@@ -2,5 +2,5 @@
+ 
+ pkgIndex.tcl : PetalEditor.tcl
+ 	@echo "The error message for PetalEditor.tcl is normal"
+-	echo "pkg_mkIndex . PetalEditor.tcl" | tclsh
++	echo "pkg_mkIndex . PetalEditor.tcl" | tclsh8.0
+ 
diff --git a/audio/rosegarden/files/patch-ad b/audio/rosegarden/files/patch-ad
new file mode 100644
index 000000000000..1922be247b1a
--- /dev/null
+++ b/audio/rosegarden/files/patch-ad
@@ -0,0 +1,69 @@
+--- do-install.orig	Tue Oct 21 14:32:43 1997
++++ do-install	Mon Jul 12 13:17:27 1999
+@@ -1,27 +1,23 @@
+ #!/bin/sh
+ 
+-BINDIR=/usr/local/bin
+-LIBDIR=/usr/local/lib
++BINDIR=${PREFIX}/bin
++LIBDIR=${PREFIX}/lib
++APP=${PREFIX}/lib/X11/app-defaults
+ 
+-install="sh ./install-sh"
+-
+-if [ ! -f ./bin/rosegarden ]; then
+-  echo "You're supposed to build it first..."
+-  exit 1
+-fi
++install=/usr/bin/install
+ 
+ echo
+ echo Rosegarden 2.1 basic install script
+ echo
+-echo 'Enter directory for the main rosegarden executable ['$BINDIR']'
+-read newbin
+-if [ t"$newbin" != t ]; then BINDIR="$newbin"; fi
+-echo 'Enter directory to contain the rosegarden lib directory ['$LIBDIR']'
+-read newlib
+-if [ t"$newlib" != t ]; then LIBDIR="$newlib"; fi
+-echo
+-echo Thanks
+-echo
++# echo 'Enter directory for the main rosegarden executable ['$BINDIR']'
++# read newbin
++# if [ t"$newbin" != t ]; then BINDIR="$newbin"; fi
++# echo 'Enter directory to contain the rosegarden lib directory ['$LIBDIR']'
++# read newlib
++# if [ t"$newlib" != t ]; then LIBDIR="$newlib"; fi
++# echo
++# echo Thanks
++# echo
+ 
+ ROSELIBDIR=$LIBDIR/rosegarden
+ 
+@@ -46,20 +42,20 @@
+ $install -c -m 644 ./common/help/rosehelp.hnx  $ROSELIBDIR/help
+ 
+ $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/
+ $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 )
+ 
+ $install -d $ROSELIBDIR/rosepetal-filters
+ $install -c ./petal/harmonizer.tcl $ROSELIBDIR/rosepetal-filters
+ $install -c ./petal/pattern.tcl $ROSELIBDIR/rosepetal-filters
+ 
+-test -d $HOME/.. || exit 0  # not set
+-test -f $HOME/Rosegarden && mv $HOME/Rosegarden $HOME/Rosegarden.SAVED
+-$install -c -m 644 Rosegarden $HOME
++
++test -f $APP/Rosegarden && mv $APP/Rosegarden $APP/Rosegarden.SAVED
++$install -c -m 644 Rosegarden $APP
+ 
+  )
+ 
diff --git a/audio/rosegarden/files/patch-ae b/audio/rosegarden/files/patch-ae
new file mode 100644
index 000000000000..9be375d06cbb
--- /dev/null
+++ b/audio/rosegarden/files/patch-ae
@@ -0,0 +1,11 @@
+--- /tmp/rosegarden-2.1/petal/dump.tcl	Mon Oct 20 19:23:58 1997
++++ ./petal/dump.tcl	Fri May 14 17:22:47 1999
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+-# the next line restarts using tclsh \
+-exec tclsh "$0" "$@"
++# the next line restarts using tclsh8.0 \
++exec tclsh8.0 "$0" "$@"
+ 
+ package require "Petal"
+ PetalInit
diff --git a/audio/rosegarden/files/patch-af b/audio/rosegarden/files/patch-af
new file mode 100644
index 000000000000..0fd1360e7738
--- /dev/null
+++ b/audio/rosegarden/files/patch-af
@@ -0,0 +1,11 @@
+--- /tmp/rosegarden-2.1/petal/Petal.c	Sun Mar  2 20:03:31 1997
++++ ./petal/Petal.c	Fri May 14 17:25:50 1999
+@@ -2,7 +2,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <string.h>
+-#include <tcl.h>
++#include <tcl8.0/tcl.h>
+ 
+ #define NB_MODES 7
+ #define NB_TONALITIES 17 /* names, actually */
diff --git a/audio/rosegarden/files/patch-ag b/audio/rosegarden/files/patch-ag
new file mode 100644
index 000000000000..904d093fb3dd
--- /dev/null
+++ b/audio/rosegarden/files/patch-ag
@@ -0,0 +1,12 @@
+--- /tmp/rosegarden-2.1/petal/harmonizer.tcl	Wed Oct 22 22:18:27 1997
++++ ./petal/harmonizer.tcl	Fri May 14 17:22:11 1999
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # FilterName: Harmonize
+-# the next line restarts using tclsh \
+-exec tclsh "$0" "$@"
++# the next line restarts using tclsh8.0 \
++exec tclsh8.0 "$0" "$@"
+ 
+ # Trivial harmonizer
+ 
diff --git a/audio/rosegarden/files/patch-ah b/audio/rosegarden/files/patch-ah
new file mode 100644
index 000000000000..40fd06cb7f90
--- /dev/null
+++ b/audio/rosegarden/files/patch-ah
@@ -0,0 +1,12 @@
+--- /tmp/rosegarden-2.1/petal/pattern.tcl	Wed Oct 22 22:18:28 1997
++++ ./petal/pattern.tcl	Fri May 14 17:22:36 1999
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # FilterName: Instantiate Pattern
+-# the next line restarts using tclsh \
+-exec tclsh "$0" "$@"
++# the next line restarts using tclsh8.0 \
++exec tclsh8.0 "$0" "$@"
+ 
+ # Pattern instantiator (very dumb)
+ # Main staff is the pattern,
diff --git a/audio/rosegarden/files/patch-ai b/audio/rosegarden/files/patch-ai
new file mode 100644
index 000000000000..3b32c83bfd92
--- /dev/null
+++ b/audio/rosegarden/files/patch-ai
@@ -0,0 +1,33 @@
+--- /tmp/rosegarden-2.1/Rosegarden	Wed Oct 22 22:16:41 1997
++++ ./Rosegarden	Fri May 14 19:58:16 1999
+@@ -8,15 +8,15 @@
+ 
+ !!! Paths, edit these
+ 
+-Rosegarden*editorName:		/usr/local/lib/rosegarden/bin/editor
+-Rosegarden*sequencerName:	/usr/local/lib/rosegarden/bin/sequencer
+-Rosegarden*helpFile:		/usr/local/lib/rosegarden/help/rosehelp.info
+-Rosegarden*midiFmPatchFile:	/usr/local/lib/rosegarden/synth-patches/std.sb
+-Rosegarden*midiFmDrumPFile:	/usr/local/lib/rosegarden/synth-patches/drums.sb
++Rosegarden*editorName:		/usr/X11R6/lib/rosegarden/bin/editor
++Rosegarden*sequencerName:	/usr/X11R6/lib/rosegarden/bin/sequencer
++Rosegarden*helpFile:		/usr/X11R6/lib/rosegarden/help/rosehelp.info
++Rosegarden*midiFmPatchFile:	/usr/X11R6/lib/rosegarden/synth-patches/std.sb
++Rosegarden*midiFmDrumPFile:	/usr/X11R6/lib/rosegarden/synth-patches/drums.sb
+ 
+ !!! directory for Petal filters.  ~/.rosepetal-filters will also be searched
+ 
+-Rosegarden*filtersDirectory:	/usr/local/lib/rosegarden/rosepetal-filters
++Rosegarden*filtersDirectory:	/usr/X11R6/lib/rosegarden/rosepetal-filters
+ 
+ !!! this is the default directory used for file dialogs:
+ 
+@@ -24,7 +24,7 @@
+ 
+ !!! this is for the sequencer's "Play through Slave":
+ 
+-Rosegarden*externalPlayer:	/usr/local/bin/xplaymidi
++Rosegarden*externalPlayer:	/usr/X11R6/bin/xplaymidi
+ 
+ !!! midi device location
+ !!! for OSS this is normally /dev/sequencer, for ZILOG it's
diff --git a/audio/rosegarden/files/patch-aj b/audio/rosegarden/files/patch-aj
new file mode 100644
index 000000000000..4b6f08fa0584
--- /dev/null
+++ b/audio/rosegarden/files/patch-aj
@@ -0,0 +1,9 @@
+--- /tmp/rosegarden-2.1/petal/petalmidi/Makefile	Sun Mar  2 20:03:37 1997
++++ ./petal/petalmidi/Makefile	Fri May 14 17:24:26 1999
+@@ -2,5 +2,5 @@
+ 
+ pkgIndex.tcl : PetalMidi.tcl
+ 	@echo "The error message for PetalMidi.tcl is normal"
+-	echo "pkg_mkIndex . PetalMidi.tcl" | tclsh
++	echo "pkg_mkIndex . PetalMidi.tcl" | tclsh8.0
+ 
diff --git a/audio/rosegarden/pkg-plist b/audio/rosegarden/pkg-plist
index 6e5452f931a6..d1239f68f7c9 100644
--- a/audio/rosegarden/pkg-plist
+++ b/audio/rosegarden/pkg-plist
@@ -1,14 +1,23 @@
-@cwd /usr/local
+lib/tclmidi/Petal.so
 bin/rosegarden
-lib/rosegarden/editor
-lib/rosegarden/rosehelp.hnx
-lib/rosegarden/rosehelp.info
-lib/rosegarden/sequencer
-lib/rosegarden/std.sb
-lib/rosegarden/music/glazunov.rose
-lib/rosegarden/music/sonataC.rose
-lib/rosegarden/music/vivaldi.rose
-@dirrm lib/rosegarden/music
-@dirrm lib/rosegarden
-@cwd /usr/X11R6
+lib/rosegarden/bin/editor
+lib/rosegarden/bin/sequencer
+lib/rosegarden/example/glazunov.rose
+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.tcl
+lib/rosegarden/petal/PetalEditor.tcl
+lib/rosegarden/petal/PetalMidi.tcl
+lib/rosegarden/petal/pkgIndex.tcl
+lib/rosegarden/rosepetal-filters/harmonizer.tcl
+lib/rosegarden/rosepetal-filters/pattern.tcl
 lib/X11/app-defaults/Rosegarden
+@dirrm lib/rosegarden/example
+@dirrm lib/rosegarden/help
+@dirrm lib/rosegarden/bin
+@dirrm lib/rosegarden/petal
+@dirrm lib/rosegarden/rosepetal-filters
+@dirrm lib/rosegarden/synth-patches
+@dirrm lib/rosegarden