3 files changed, 83 insertions, 11 deletions

diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index e7c211f29c56..d3131109723a 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mma
-PORTVERSION=	14.07
+PORTVERSION=	15.01
 PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mellowood.ca/${PORTNAME}/
@@ -50,14 +50,10 @@ do-build:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/mma.py ${STAGEDIR}${MMABIN}
-.for d in lib includes MMA
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR} "-not -name *\.bak"
-.endfor
-.if ${PORT_OPTIONS:MEXAMPLES}
+	${INSTALL_SCRIPT} ${WRKSRC}/mma.py ${STAGEDIR}${MMABIN}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "lib includes MMA" ${STAGEDIR}${DATADIR} "-not -name *\.bak"
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/egs && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
 	(cd ${WRKDOC} && \
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/pdf/ "! -name README")
diff --git a/audio/mma/distinfo b/audio/mma/distinfo
index 7683c97c6025..9b38ebb592d3 100644
--- a/audio/mma/distinfo
+++ b/audio/mma/distinfo
@@ -1,4 +1,4 @@
-SHA256 (mma-bin-14.07.tar.gz) = 73437946eb21afe4588a6f1e37a7624e0963aaa54ee593f6026334ecaf797283
-SIZE (mma-bin-14.07.tar.gz) = 2288934
-SHA256 (mma-pdf-14.07.tar.gz) = cb078d2846441f57b525aedc489fc2a908fadf448ff378266f34ee60c0f875f7
-SIZE (mma-pdf-14.07.tar.gz) = 1820132
+SHA256 (mma-bin-15.01.tar.gz) = 24b4655de3ebf55b73a69ac167a4631f4c27741b20f9852d8056a6caf3fba66f
+SIZE (mma-bin-15.01.tar.gz) = 2350993
+SHA256 (mma-pdf-15.01.tar.gz) = ccb24a181a17e0ac76ef882c35229cf76581c64b6f9709e5161f9225792dd3af
+SIZE (mma-pdf-15.01.tar.gz) = 1855347
diff --git a/audio/mma/pkg-plist b/audio/mma/pkg-plist
index 2b906d381e8c..69cf2271f709 100644
--- a/audio/mma/pkg-plist
+++ b/audio/mma/pkg-plist
@@ -135,10 +135,37 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dance2_dance2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dance2_dance2end.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dance2_dance2intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop1_dancepop1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop1_dancepop1end.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop1_dancepop1intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop2_dancepop2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop2_dancepop2end.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop2_dancepop2intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop3_dancepop3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop3_dancepop3end.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/dancepop3_dancepop3intro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/digitalrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/digitalrock_digitalrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/digitalrock_digitalrockend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/digitalrock_digitalrockintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/discosoul.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/discosoul_discosoul.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/discosoul_discosoulend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/discosoul_discosoulintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/electricpop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/electricpop_electricpop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/electricpop_electricpopend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/electricpop_electricpopintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/fastbigband.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/fastbigband_fastbigband.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/fastbigband_fastbigbandend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/fastbigband_fastbigbandintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/foxtrot.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/foxtrot_foxtrot.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/foxtrot_foxtrotintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/funk1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/funk1_funk1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/funk1_funk1end.html
@@ -163,6 +190,14 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/house_house.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/house_houseend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/house_houseintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/jazzcombo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/jazzcombo_jazzcombo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/jazzcombo_jazzcomboend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/jazzcombo_jazzcombointro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/jazzwaltz.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/jazzwaltz_jazzwaltz.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/jazzwaltz_jazzwaltzend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/jazzwaltz_jazzwaltzintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/latinfusion.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/latinfusion_latinfusion.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/latinfusion_latinfusionintro.html
@@ -174,6 +209,11 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/mellowrb_mellowrb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/mellowrb_mellowrbend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/mellowrb_mellowrbintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/middlebigband.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/middlebigband_middlebigband.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/middlebigband_middlebigbandend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/middlebigband_middlebigbandintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/modernjazz.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/modernrb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/modernrb_modernr&b.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/modernrb_modernr&bend.html
@@ -208,6 +248,8 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/popshuffle2_popshuffle2intro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/popwaltz.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/popwaltz_popwaltzend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/quickstep.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/quickstep_quickstep.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/r+b.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/r+b_r&b.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/r+b_r&bend.html
@@ -239,10 +281,17 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slow16beat_slow16beat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slow16beat_slow16beatend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slow16beat_slow16beatintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowbigband.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowbigband_slowbigband.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowbigband_slowbigbandend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowbigband_slowbigbandintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowrock_slowrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowrock_slowrockend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowrock_slowrockintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowswing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowswing_slowswing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/slowswing_slowswingintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/soul.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/soul_soul.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/soul_soulend.html
@@ -251,6 +300,8 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/soulpop_soulpop.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/soulpop_soulpopend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/soulpop_soulpopintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/swing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/swing_swing.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/techno.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/techno_techno.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/techno_technoend.html
@@ -258,6 +309,10 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/trance1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/trance1_trance1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/trance2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/triphop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/triphop_triphop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/triphop_triphopend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/triphop_triphopintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/twist.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/twist_twist.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/casio/twist_twistend.html
@@ -706,6 +761,13 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/broadwaywaltz_broadwaywaltzintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/broadwaywaltz_broadwaywaltzintro8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/broadwaywaltz_broadwaywaltzsus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bvfunk.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bvfunk_bvfunk.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bvfunk_bvfunkend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bvfunk_bvfunkhorns.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bvfunk_bvfunkintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bvfunk_bvfunkintro8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bvfunk_bvfunksus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bwmarch.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bwmarch_bwmarch.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bwmarch_bwmarchend.html
@@ -1776,6 +1838,7 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node32.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node33.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node34.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref/node35.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node4.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node5.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node6.html
@@ -1923,6 +1986,14 @@ man/man8/mma-libdoc.8.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solo/solo.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/volume.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/volume.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triggers/auto.mid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triggers/auto.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triggers/chords.mid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triggers/chords.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triggers/hits.mid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triggers/hits.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triggers/trunc.mid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triggers/trunc.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/deep-river.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/deep-river.mma
@@ -2034,6 +2105,8 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/MMA/tempo.pyo
 %%DATADIR%%/MMA/translate.py
 %%DATADIR%%/MMA/translate.pyo
+%%DATADIR%%/MMA/trigger.py
+%%DATADIR%%/MMA/trigger.pyo
 %%DATADIR%%/MMA/truncate.py
 %%DATADIR%%/MMA/truncate.pyo
 %%DATADIR%%/MMA/tweaks.py
@@ -2063,6 +2136,7 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/lib/kara/kbossa.mma
 %%DATADIR%%/lib/kara/kwestballad.mma
 %%DATADIR%%/lib/kara/twi.mma
+%%DATADIR%%/lib/stdlib/#68swing.mma#
 %%DATADIR%%/lib/stdlib/.mmaDB
 %%DATADIR%%/lib/stdlib/50srock.mma
 %%DATADIR%%/lib/stdlib/60srock.mma
@@ -2090,6 +2164,7 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/lib/stdlib/bossanova.mma
 %%DATADIR%%/lib/stdlib/broadway.mma
 %%DATADIR%%/lib/stdlib/broadwaywaltz.mma
+%%DATADIR%%/lib/stdlib/bvfunk.mma
 %%DATADIR%%/lib/stdlib/bwmarch.mma
 %%DATADIR%%/lib/stdlib/calypso.mma
 %%DATADIR%%/lib/stdlib/chacha.mma
@@ -2187,3 +2262,4 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/lib/yamaha/salsa2.mma
 %%DATADIR%%/lib/yamaha/w-rock.mma
 %%DATADIR%%/lib/yamaha/western.mma
+@dir %%DATADIR%%/includes/aria