diff options
author | wiz <wiz> | 2002-03-19 12:21:06 +0000 |
---|---|---|
committer | wiz <wiz> | 2002-03-19 12:21:06 +0000 |
commit | 5d35be21ab9b235d654bf59c97c694ebff95607c (patch) | |
tree | 415c48ccebc9a370002fe05e0d4acf6555acff5e /audio | |
parent | b44ee1a47a5e11acbd55b90309aebf29393c36ed (diff) | |
download | pkgsrc-5d35be21ab9b235d654bf59c97c694ebff95607c.tar.gz |
Update to 2.1.3, provided by Hume Smith in pkg/15027, with some minor
changes and buildlinking by me.
Bugfix release.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/rosegarden/DESCR | 6 | ||||
-rw-r--r-- | audio/rosegarden/Makefile | 22 | ||||
-rw-r--r-- | audio/rosegarden/PLIST | 25 | ||||
-rw-r--r-- | audio/rosegarden/distinfo | 17 | ||||
-rw-r--r-- | audio/rosegarden/patches/patch-aa | 59 | ||||
-rw-r--r-- | audio/rosegarden/patches/patch-ab | 8 | ||||
-rw-r--r-- | audio/rosegarden/patches/patch-ac | 4 | ||||
-rw-r--r-- | audio/rosegarden/patches/patch-ad | 8 | ||||
-rw-r--r-- | audio/rosegarden/patches/patch-ae | 6 | ||||
-rw-r--r-- | audio/rosegarden/patches/patch-af | 6 | ||||
-rw-r--r-- | audio/rosegarden/patches/patch-ag | 18 |
11 files changed, 87 insertions, 92 deletions
diff --git a/audio/rosegarden/DESCR b/audio/rosegarden/DESCR index 0d8750ea9af..89f572892fa 100644 --- a/audio/rosegarden/DESCR +++ b/audio/rosegarden/DESCR @@ -1,2 +1,4 @@ -Notation and MIDI editor -(I only use it for notation editing, so I won't say the MIDI works) +Decent Notation and MIDI `piano roll' editor + +Caveats: I use only the notation editor. I've never gotten MIDI of any sort +up on my machines, so I have no idea if the MIDI player works. diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index f8036ec2093..7f4c09cc81a 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -1,21 +1,23 @@ -# $NetBSD: Makefile,v 1.4 2001/08/28 05:41:34 rh Exp $ +# $NetBSD: Makefile,v 1.5 2002/03/19 12:21:06 wiz Exp $ -DISTNAME= rosegarden-2.1pl2 -PKGNAME= rosegarden-2.1p2 +DISTNAME= rosegarden-2.1pl3 +PKGNAME= rosegarden-2.1.3 CATEGORIES= audio MASTER_SITES= http://www.cannam.demon.co.uk/rosegarden/distribution/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.all-day-breakfast.com/rosegarden/ -COMMENT= notation editor & midi sequencer - -CPPFLAGS+= -I${PREFIX}/include +COMMENT= notation editor & MIDI sequencer GNU_CONFIGURE= YES -USE_GMAKE= yes +USE_GMAKE= YES MAKE_ENV+= GCC=yes -USE_X11BASE= yes +USE_X11BASE= YES -.include "../../mk/bsd.pkg.mk" +USE_BUILDLINK_ONLY= YES -#eof +post-extract: + cd ${WRKSRC} && ${MV} Rosegarden Rosegarden.in + +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/audio/rosegarden/PLIST b/audio/rosegarden/PLIST index ad840c637ff..1933aa75a5c 100644 --- a/audio/rosegarden/PLIST +++ b/audio/rosegarden/PLIST @@ -1,15 +1,24 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:48 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/19 12:21:06 wiz Exp $ bin/rosegarden -lib/rosegarden/bin/sequencer +lib/X11/app-defaults/Rosegarden 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.info lib/rosegarden/help/rosehelp.hnx -lib/X11/app-defaults/Rosegarden -@dirrm lib/rosegarden/bin -@dirrm lib/rosegarden/example +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/rosegarden/synth-patches/drums.sb +lib/rosegarden/synth-patches/std.sb @dirrm lib/rosegarden/synth-patches +@dirrm lib/rosegarden/rosepetal-filters +@dirrm lib/rosegarden/petal @dirrm lib/rosegarden/help +@dirrm lib/rosegarden/example +@dirrm lib/rosegarden/bin @dirrm lib/rosegarden + diff --git a/audio/rosegarden/distinfo b/audio/rosegarden/distinfo index 12ce45e7e06..ae0a8479bca 100644 --- a/audio/rosegarden/distinfo +++ b/audio/rosegarden/distinfo @@ -1,10 +1,11 @@ SHA1 (patch-Makefile.in) = bf77b6cdb830dcbdbe52bf0613d8fbc3653e6e80 -SHA1 (rosegarden-2.1pl2.tar.gz) = d85f9fa66c69d2d7636660e091cf063f991c53bd -Size (rosegarden-2.1pl2.tar.gz) = 607980 bytes -SHA1 (patch-aa) = bf77b6cdb830dcbdbe52bf0613d8fbc3653e6e80 -SHA1 (patch-ab) = 055ed2fa8d18f44ffd974905ce5a8ceb2060d604 -SHA1 (patch-ac) = 95f57f3a893f34545a45d185b1ab39defd333993 -SHA1 (patch-ad) = 72d2cabf742ed2b6053ca3f7363efd9efef03e8c -SHA1 (patch-ae) = 320c383e19984156915e7834c26d3d783f670ad7 -SHA1 (patch-af) = ea66d32449a6b589545a3a83b5a275182016fb94 +SHA1 (rosegarden-2.1pl3.tar.gz) = db03538e285f632024945539e1912ef44716aff7 +Size (rosegarden-2.1pl3.tar.gz) = 584431 bytes +SHA1 (patch-aa) = 4c45840c9a7d0b3ee43ddb300de55a442df0f7da +SHA1 (patch-ab) = 3319061b197bd135c4267c39ddd9fd92709347e1 +SHA1 (patch-ac) = 3f4f3ed849d037d3371b9ab786cb547d6e1c8daa +SHA1 (patch-ad) = 22b2a1a060e8b2b3f7dda5d7c7189fc96b99c1a0 +SHA1 (patch-ae) = b6fb9815ee6918dbc5b28fd1fec6bca1d42cf028 +SHA1 (patch-af) = f3c99ccf142420255ae10f19bed37933ee24c744 +SHA1 (patch-ag) = f572f2ecee63bee1e62a9363c14bb468e4539937 diff --git a/audio/rosegarden/patches/patch-aa b/audio/rosegarden/patches/patch-aa index 8daafa753f1..51bbbf4eab8 100644 --- a/audio/rosegarden/patches/patch-aa +++ b/audio/rosegarden/patches/patch-aa @@ -1,60 +1,23 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/05/31 16:40:56 agc Exp $ +$NetBSD: patch-aa,v 1.2 2002/03/19 12:21:07 wiz Exp $ ---- Makefile.in.orig Sat Nov 22 10:50:07 1997 -+++ Makefile.in Thu May 17 16:34:48 2001 +--- Makefile.in.orig Fri Dec 21 15:12:43 2001 ++++ Makefile.in @@ -43,7 +43,7 @@ # Compile defines -DEFINES = @defines@ -+DEFINES = -DRGLIBDIR=\"${RGLIBDIR}\" @defines@ ++DEFINES = '-DRGLIBDIR=\"${RGLIBDIR}\"' @defines@ # Name of the compiler, plus any flags common to both compile # and link stages; also exported -@@ -57,7 +57,7 @@ - - # Nothing below this line will be exported, so leave it alone - --EXPORTATION = ROSEGARDEN="$(ROSEGARDEN)" ; SYSINCDIRS="$(SYSINCDIRS)" ; SYSLDFLAGS="$(SYSLDFLAGS)" ; CC="$(CC)" ; DEFINES="$(DEFINES)" ; RANLIB="$(RANLIB)" ; OPTFLAGS="$(OPTFLAGS)" ; MAKEDEPEND="$(MAKEDEPEND)" ; SYSEXTRALIBS="$(SYSEXTRALIBS)" ; export ROSEGARDEN SYSINCDIRS DEFINES SYSLDFLAGS CC RANLIB OPTFLAGS MAKEDEPEND SYSEXTRALIBS -+EXPORTATION = ROSEGARDEN="$(ROSEGARDEN)" ; SYSINCDIRS="$(SYSINCDIRS)" ; SYSLDFLAGS="$(SYSLDFLAGS)" ; CC="$(CC)" ; DEFINES='$(DEFINES)' ; RANLIB="$(RANLIB)" ; OPTFLAGS="$(OPTFLAGS)" ; MAKEDEPEND="$(MAKEDEPEND)" ; SYSEXTRALIBS="$(SYSEXTRALIBS)" ; export ROSEGARDEN SYSINCDIRS DEFINES SYSLDFLAGS CC RANLIB OPTFLAGS MAKEDEPEND SYSEXTRALIBS - - LISTLIB = $(ROSEGARDEN)/lists/lib/libLists.a - YAWNLIB = $(ROSEGARDEN)/yawn/lib/libY.a -@@ -196,3 +196,34 @@ +@@ -197,3 +197,9 @@ chmod +x $(ROSEGARDEN)/scripts/make-structure.sh $(ROSEGARDEN)/scripts/make-structure.sh $(ROSEGARDEN) - + +prefix=@prefix@ -+RGBINDIR=${prefix}/bin -+RGLIBDIR=${prefix}/lib/rosegarden -+install=/usr/bin/install -+sed=/usr/bin/sed -+install: bin/rosegarden -+ $(install) -d $(RGBINDIR) -+ $(install) -s -c ./bin/rosegarden $(RGBINDIR) -+ $(install) -d $(RGLIBDIR)/bin -+ $(install) -s -c ./bin/sequencer $(RGLIBDIR)/bin -+ $(install) -s -c ./bin/editor $(RGLIBDIR)/bin -+ $(install) -d $(RGLIBDIR)/example -+ $(install) -c -m 644 ./common/music/glazunov.rose $(RGLIBDIR)/example -+ $(install) -d $(RGLIBDIR)/synth-patches -+ $(install) -c -m 644 ./common/synth-patches/std.sb $(RGLIBDIR)/synth-patches -+ $(install) -c -m 644 ./common/synth-patches/drums.sb $(RGLIBDIR)/synth-patches -+ $(install) -d $(RGLIBDIR)/help -+ $(install) -c -m 644 ./common/help/rosehelp.info $(RGLIBDIR)/help -+ $(install) -c -m 644 ./common/help/rosehelp.hnx $(RGLIBDIR)/help -+ $(sed) -e s,/usr/local/lib/rosegarden,${RGLIBDIR}, < ./Rosegarden > ${prefix}/lib/X11/app-defaults/Rosegarden -+ -+# this isn't used yet -+install-tcl: -+ $(install) -d $(RGLIBDIR)/petal -+ $(install) -m 644 ./petal/Petal.so $(RGLIBDIR)/petal -+ $(install) -c ./petal/Petal.tcl $(RGLIBDIR)/petal -+ $(install) -c ./petal/petaleditor/PetalEditor.tcl $(RGLIBDIR)/petal -+ $(install) -c ./petal/petalmidi/PetalMidi.tcl $(RGLIBDIR)/petal -+ ( cd $(RGLIBDIR)/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh ) -+ $(install) -d $(RGLIBDIR)/rosepetal-filters -+ $(install) -c ./petal/harmonizer.tcl $(RGLIBDIR)/rosepetal-filters -+ $(install) -c ./petal/pattern.tcl $(RGLIBDIR)/rosepetal-filters -+ -+#eof ++iBINDIR=${prefix}/bin ++iLIBDIR=${prefix}/lib ++RGLIBDIR=${iLIBDIR}/rosegarden ++install: do-install ++ (echo ${iBINDIR}; echo ${iLIBDIR})|/bin/sh do-install diff --git a/audio/rosegarden/patches/patch-ab b/audio/rosegarden/patches/patch-ab index e984c12817a..eb63397af2d 100644 --- a/audio/rosegarden/patches/patch-ab +++ b/audio/rosegarden/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/05/31 16:40:56 agc Exp $ +$NetBSD: patch-ab,v 1.2 2002/03/19 12:21:07 wiz Exp $ ---- editor/src/Filter.c.orig Sat Oct 25 12:50:22 1997 -+++ editor/src/Filter.c Thu May 17 16:08:15 2001 -@@ -594,7 +594,7 @@ +--- editor/src/Filter.c.orig Mon Jul 2 09:10:49 2001 ++++ editor/src/Filter.c +@@ -597,7 +597,7 @@ char path[3000]; fprintf(stderr, "Rosegarden: Environment variable TCLLIBPATH is not set; " "guessing!\n"); diff --git a/audio/rosegarden/patches/patch-ac b/audio/rosegarden/patches/patch-ac index 2d771c92326..925be5846f9 100644 --- a/audio/rosegarden/patches/patch-ac +++ b/audio/rosegarden/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/05/31 16:40:56 agc Exp $ +$NetBSD: patch-ac,v 1.2 2002/03/19 12:21:07 wiz Exp $ --- editor/src/Resources.h.orig Fri Oct 10 06:22:00 1997 -+++ editor/src/Resources.h Thu May 17 16:08:03 2001 ++++ editor/src/Resources.h @@ -118,7 +118,7 @@ sizeof(char *), XtOffset(AppDataPtr, filtersDirectory), diff --git a/audio/rosegarden/patches/patch-ad b/audio/rosegarden/patches/patch-ad index 9da8edcadf5..8fb3757e45d 100644 --- a/audio/rosegarden/patches/patch-ad +++ b/audio/rosegarden/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/05/31 16:40:56 agc Exp $ +$NetBSD: patch-ad,v 1.2 2002/03/19 12:21:07 wiz Exp $ ---- sequencer/src/Filter.c@ Sat Oct 25 13:50:42 1997 -+++ sequencer/src/Filter.c Thu May 17 16:15:12 2001 -@@ -345,7 +345,7 @@ +--- sequencer/src/Filter.c.orig Mon Jul 2 08:59:48 2001 ++++ sequencer/src/Filter.c +@@ -347,7 +347,7 @@ char path[3000]; fprintf(stderr, "Rosegarden: Environment variable TCLLIBPATH is not set; " "guessing!\n"); diff --git a/audio/rosegarden/patches/patch-ae b/audio/rosegarden/patches/patch-ae index d0bc16c8503..c68c022ce3a 100644 --- a/audio/rosegarden/patches/patch-ae +++ b/audio/rosegarden/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/05/31 16:40:56 agc Exp $ +$NetBSD: patch-ae,v 1.2 2002/03/19 12:21:07 wiz Exp $ ---- sequencer/src/Resources.h@ Fri Oct 10 06:21:47 1997 -+++ sequencer/src/Resources.h Thu May 17 16:16:03 2001 +--- sequencer/src/Resources.h.orig Fri Oct 10 06:21:47 1997 ++++ sequencer/src/Resources.h @@ -135,7 +135,7 @@ sizeof(String), XtOffset(AppDataPtr, midiFmPatchFile), diff --git a/audio/rosegarden/patches/patch-af b/audio/rosegarden/patches/patch-af index 20819368e56..0534317f76f 100644 --- a/audio/rosegarden/patches/patch-af +++ b/audio/rosegarden/patches/patch-af @@ -1,13 +1,13 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/05/31 16:40:56 agc Exp $ +$NetBSD: patch-af,v 1.2 2002/03/19 12:21:07 wiz Exp $ --- topbox/src/Resources.h.orig Fri Oct 10 06:22:12 1997 -+++ topbox/src/Resources.h Thu May 17 16:58:23 2001 ++++ topbox/src/Resources.h @@ -61,7 +61,7 @@ sizeof(char *), XtOffset(AppDataPtr,helpFile), XtRImmediate, - "/usr/local/lib/rosegarden/rosehelp.info", -+ RGLIBDIR"/help/rosehelp.info" ++ RGLIBDIR"/help/rosehelp.info", }, { XtNhelpTextFont, diff --git a/audio/rosegarden/patches/patch-ag b/audio/rosegarden/patches/patch-ag new file mode 100644 index 00000000000..91f04a45679 --- /dev/null +++ b/audio/rosegarden/patches/patch-ag @@ -0,0 +1,18 @@ +$NetBSD: patch-ag,v 1.1 2002/03/19 12:21:08 wiz Exp $ + +--- do-install.orig Tue Oct 21 18:20:43 1997 ++++ do-install +@@ -57,9 +57,10 @@ + $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 ++ADDIR=$LIBDIR/X11/app-defaults ++test -d $ADDIR &&\ ++ sed -e s:/usr/local/lib:$LIBDIR: -e s:/usr/local/bin:$BINDIR: Rosegarden.in >Rosegarden &&\ ++ $install -c -m 644 Rosegarden $ADDIR + + ) + |