Upgrade to 2.0.1.

PR:		4421
Submitted by:	Andreas Kohout <shanee@augusta.de>

6 files changed, 58 insertions, 41 deletions

diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index c148f8cf8721..a1d04452043f 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,22 +1,25 @@
 # New ports collection makefile for:	rosegarden
-# Version required:	2.0b3
+# Version required:	2.0.1
 # Date created:		04 Aug 1996
 # Whom:			shanee
 #
-# $Id: Makefile,v 1.2 1996/08/08 00:22:40 chuckr Exp $
+# $Id: Makefile,v 1.3 1996/08/18 13:49:33 chuckr Exp $
 #
 
-DISTNAME=	rosegarden
-PKGNAME=	rosegarden-2.0
-MASTER_SITES=	ftp://ftp.maths.bath.ac.uk/pub/dream/ROSE/
+DISTNAME=	rosegarden-2.0.1
 CATEGORIES=	audio
-EXTRACT_SUFX=	-2.0-BETA3-sources.tgz
+MASTER_SITES=	ftp://ftp.maths.bath.ac.uk/pub/dream/ROSE/
+EXTRACT_SUFX=	-sources.tgz
 
-MAINTAINER=	shanee@rabbit.augusta.de
+MAINTAINER=	shanee@augusta.de
 
 LIB_DEPENDS=	Xaw3d\\.6\\.:$(PORTSDIR)/x11/Xaw3d
 RUN_DEPENDS=	playmidi:${PORTSDIR}/audio/playmidi
 
 ALL_TARGET=	all ROSEGARDEN=$(WRKSRC) SYSLIBS="\"-lXaw3d -lXext -lXmu -lXt -lX11\"" SYSEXTRALIBS=""
 
+WRKSRC=		${WRKDIR}/rosegarden
+MAKEFILE=	Makefile.FreeBSD
+MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}"
+
 .include <bsd.port.mk>
diff --git a/audio/rosegarden/distinfo b/audio/rosegarden/distinfo
index f3d5ed826f10..fbc4a443fa66 100644
--- a/audio/rosegarden/distinfo
+++ b/audio/rosegarden/distinfo
@@ -1 +1 @@
-MD5 (rosegarden-2.0-BETA3-sources.tgz) = a1c91f8fb40a871811911649b4e9419f
+MD5 (rosegarden-2.0.1-sources.tgz) = e9407ba667a120cfc685b5b6b314494a
diff --git a/audio/rosegarden/files/patch-aa b/audio/rosegarden/files/patch-aa
index a0471bd6e78f..d2e8803d324f 100644
--- a/audio/rosegarden/files/patch-aa
+++ b/audio/rosegarden/files/patch-aa
@@ -1,19 +1,22 @@
-*** ./sequencer/src/Record_LINUX.c.orig	Mon Aug  5 00:08:18 1996
---- ./sequencer/src/Record_LINUX.c	Mon Aug  5 00:08:33 1996
+*** Makefile.FreeBSD.orig	Wed Sep 11 06:04:21 1996
+--- Makefile.FreeBSD	Thu Aug 28 15:53:28 1997
 ***************
-*** 24,30 ****
-  #undef POSIX_PLEASE
-  #undef _POSIX_SOURCE
-  
-! #include <sys/soundcard.h>
-  #include <sys/ioctl.h>
-  #include <errno.h>
-  
---- 24,30 ----
-  #undef POSIX_PLEASE
-  #undef _POSIX_SOURCE
-  
-! #include <machine/soundcard.h>
-  #include <sys/ioctl.h>
-  #include <errno.h>
+*** 265,270 ****
+--- 265,281 ----
+  		( $(EXPORTATION) ; cd $(ROSEGARDEN)/topbox/src ; \
+  		  $(MAKE) depend )
   
++ 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/
++ 
+  clean:
+  		( $(EXPORTATION) ; cd $(ROSEGARDEN)/lists/src ; \
+  		  $(MAKE) clean )
diff --git a/audio/rosegarden/files/patch-ab b/audio/rosegarden/files/patch-ab
index 7594d55a8b67..0a967fc4aa82 100644
--- a/audio/rosegarden/files/patch-ab
+++ b/audio/rosegarden/files/patch-ab
@@ -1,19 +1,28 @@
-*** ./sequencer/src/Sequence_LINUX.c.orig	Mon Aug  5 00:09:00 1996
---- ./sequencer/src/Sequence_LINUX.c	Mon Aug  5 00:09:14 1996
+*** Rosegarden.orig	Wed Sep 11 06:25:10 1996
+--- Rosegarden	Thu Aug 28 15:51:58 1997
 ***************
-*** 41,47 ****
-  #undef _POSIX_SOURCE
+*** 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
   
-  /* include our linux soundcard header */
-! #include <sys/soundcard.h>
-  #include <sys/ioctl.h>
-  #include <errno.h>
+! Rosegarden*musicDirectory:	/usr/local/lib/music
+  Rosegarden*midiFmPatchFile:	/usr/local/lib/rosegarden/std.sb
+! !Rosegarden*midiPort:		/dev/sequencer2
+! Rosegarden*externalPlayer:	/usr/local/bin/xplaymidi
   
---- 41,47 ----
-  #undef _POSIX_SOURCE
+  Rosegarden*shouldWarpPointer:	False
   
-  /* include our linux soundcard header */
-! #include <machine/soundcard.h>
-  #include <sys/ioctl.h>
-  #include <errno.h>
+--- 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
   
diff --git a/audio/rosegarden/pkg-descr b/audio/rosegarden/pkg-descr
index b325b39fff7a..f5349d009c63 100644
--- a/audio/rosegarden/pkg-descr
+++ b/audio/rosegarden/pkg-descr
@@ -1,6 +1,6 @@
 Rosegarden is a free integrated musical notation editor and MIDI
-sequencer for Unix/X platforms, with specific support for Linux PCs
-and SGI IRIX workstations.
+sequencer for Unix/X platforms, with specific support for FreeBSD,
+Linux PCs and SGI IRIX workstations.
 
 See the Rosegarden Web page at http://www.bath.ac.uk/~masjpf/rose.html
 for more information, or anonymous ftp to ftp.maths.bath.ac.uk,
diff --git a/audio/rosegarden/pkg-plist b/audio/rosegarden/pkg-plist
index 4afb1baa8a3f..6e5452f931a6 100644
--- a/audio/rosegarden/pkg-plist
+++ b/audio/rosegarden/pkg-plist
@@ -8,5 +8,7 @@ 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/X11/app-defaults/Rosegarden