- Update to 1.7

- Add do-build, post-install targets to Makefile
- Add files/patch-mma.py
- Install all files without using the cp-install script
- Remove files/patch-cp-install

5 files changed, 405 insertions, 232 deletions

diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index b038994142f1..f0d245f9bc4e 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mma
-DISTVERSION=	1.6
-PORTREVISION=	1
+DISTVERSION=	1.7
+PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mellowood.ca/${PORTNAME}/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
@@ -16,19 +16,17 @@ DISTFILES=	${PORTNAME}-bin-${DISTVERSION}.tar.gz
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Musical MIDI Accompaniment generator
 
-NO_BUILD=	yes
-
 USE_PYTHON=	2.5+
 
 OPTIONS=	TIMIDITY	"Install timidity++ as MIDI player" Off \
 		PLAYMIDI	"Install playmidi as MIDI player" Off
 
+REINPLACE_ARGS=	-i.bak -e 's,%%DATADIR%%,${DATADIR},'
+
 WRKSRC=	${WRKDIR}/${PORTNAME}-bin-${DISTVERSION}
 WRKDOC=	${WRKDIR}/${PORTNAME}-pdf-${DISTVERSION:S,a,,}
 
-CP_INSTALL_MMA=	${WRKSRC}/cp-install
-FIND_FILES=	${WRKSRC} -type f -and \( -name "*.py" -or -name 'cp-install' -or -name 'mkall' \) -print0
-FIND_FILES_BAK=	${WRKSRC} -type f -and \( -name "*.orig" -or -name "*.bak" \)
+MMABIN=	${PREFIX}/bin/mma
 
 .if !defined (NOPORTDOCS)
 DISTFILES+=	${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz
@@ -38,31 +36,34 @@ MAN8=	mma-libdoc.8
 .endif
 .endif
 
-.include <bsd.port.pre.mk>
-
-XARGS_ARGS=	-0
-REINPLACE_ARGS=	-i.bak -e 's,/usr/local/share/mma,${DATADIR},' \
-		-e 's,/usr/local/etc,${LOCALBASE}/etc,' \
-		-e 's,%%DOCSDIR%%,${DOCSDIR},' \
-		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},' \
-		-e 's,%%PREFIX%%,${PREFIX},' \
-		-e 's,/usr/bin/env python,&${PYTHON_VER},'
-
 post-patch:
-	@${FIND} ${FIND_FILES} | ${XARGS} ${XARGS_ARGS} ${REINPLACE_CMD}
-	@${FIND} ${FIND_FILES_BAK} -delete
-	@${TOUCH} ${WRKSRC}/includes/aria/.keepme
+	@${REINPLACE_CMD} ${WRKSRC}/mma.py
+
+do-build:
+	@${PYTHON_CMD} -OO -m compileall -f ${WRKSRC}/MMA
 
 do-install:
-	@cd ${WRKSRC} && ${CP_INSTALL_MMA}
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/mma.py ${MMABIN}
+.for d in lib includes MMA
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR}
+.endfor
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR} && cd ${WRKSRC}/egs && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
+.endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/pdf && ${CP} ${WRKDOC}/*.pdf ${DOCSDIR}/pdf/
-	@cd ${DOCSDIR} && ${RM} -R man
+	@${MKDIR} ${DOCSDIR}/pdf && ${CP} ${WRKDOC}/*.pdf ${DOCSDIR}/pdf/ && \
+	cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${DOCSDIR}/html
 .if !defined(NO_INSTALL_MANPAGES)
 	@cd ${WRKSRC}/docs/man && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/ && ${INSTALL_MAN} ${MAN8} ${MANPREFIX}/man/man8/
 .endif
 .endif
 
+post-install:
+	${MMABIN} -G
+
+.include <bsd.port.pre.mk>
+
 .if defined (WITH_TIMIDITY)
 RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity++
 .endif
diff --git a/audio/mma/distinfo b/audio/mma/distinfo
index 82b4775efa83..80d1c147d650 100644
--- a/audio/mma/distinfo
+++ b/audio/mma/distinfo
@@ -1,4 +1,4 @@
-SHA256 (mma-bin-1.6.tar.gz) = 2d0673f2f43a37793334742bf8e2a88c272ca05d4c4c416777cb2949c5f02a0c
-SIZE (mma-bin-1.6.tar.gz) = 1505372
-SHA256 (mma-pdf-1.6.tar.gz) = 6f54f960efb3b26e95823ad322c7aa269d7dd9db9dbb3c764640c750fe99cd22
-SIZE (mma-pdf-1.6.tar.gz) = 1417727
+SHA256 (mma-bin-1.7.tar.gz) = a37af204bcbe1222b949063604c1f55ef45baad7d7e845dc0f04bfe813cabcf2
+SIZE (mma-bin-1.7.tar.gz) = 1747041
+SHA256 (mma-pdf-1.7.tar.gz) = 85575891d418bce01447556e717494e6e8dbc588abb372275a801bbddb685022
+SIZE (mma-pdf-1.7.tar.gz) = 1500980
diff --git a/audio/mma/files/patch-cp-install b/audio/mma/files/patch-cp-install
deleted file mode 100644
index c365a914ed00..000000000000
--- a/audio/mma/files/patch-cp-install
+++ /dev/null
@@ -1,83 +0,0 @@
---- cp-install	2008-09-28 20:33:38.000000000 +0200
-+++ cp-install.port	2008-10-03 11:21:43.000000000 +0200
-@@ -42,7 +42,7 @@
- except:
- 	u=1
- 
--if u:
-+if 0:
- 	okay("""You do not appear to be running this script as 'root' user.
- Continuing will probably cause all kinds of strange errors
- and a generally unsatisfactory experience. But, we can try...
-@@ -64,14 +64,14 @@
- 
- """
- 
--okay("")
-+#okay("")
- 
- ###########################################
- ######## Copy the executable.
- 
--bin='/usr/local/bin/mma'
-+bin='%%PREFIX%%/bin/mma'
- 
--if os.path.exists(bin):
-+if 0:
- 	okay("Existing mma executable '%s' is being overwritten." % bin)
- 	os.remove(bin)
- 
-@@ -84,7 +84,7 @@
- 
- dest = '/usr/local/share/mma'
- 
--if os.path.exists(dest):
-+if 0:
-    bu=dest.rsplit('/', 1)[0] + '/mma-old'
-    if os.path.exists(bu):
-       print "This script was going to move the existing MMA tree to"
-@@ -117,9 +117,18 @@
- ###########################################
- ######## Copy the html docs
- 
--print "Copying HTML documentation to", dest
-+if not os.environ.has_key('NOPORTDOCS'):
-+    docsdir = '%%DOCSDIR%%'
-+    print "Copying HTML documentation to", docsdir
-+    shutil.copytree( "docs", docsdir)
- 
--shutil.copytree( "docs", dest+"/docs")
-+###########################################
-+######## Copy examples
-+
-+if not os.getenv('NOPORTEXAMPLES'):
-+    examplesdir = '%%EXAMPLESDIR%%'
-+    print "Copying example files to", examplesdir
-+    shutil.copytree( "egs", examplesdir)
- 
- ###########################################
- ######## Set permissions/udate database
-@@ -127,18 +136,18 @@
- print
- print "Updating database file. This uses mma with the -G option."
- print "If this fails, something was not installed properly"
--print "and you should contact Bob and we'll figure it out."
-+#print "and you should contact Bob and we'll figure it out."
- 
--okay("")
-+#okay("")
- 
- os.system("%s -G" % bin)
- 
--print "Setting permissions on MMADIR database file for user update."
--os.system("chmod a+w " + dest+"/lib/stdlib/.mmaDB")
-+#print "Setting permissions on MMADIR database file for user update."
-+#os.system("chmod a+w " + dest+"/lib/stdlib/.mmaDB")
- 
- ## man pages
- 
--print "There are some man pages in %s/docs/man that you may wish to install." % dest
-+#print "There are some man pages in %s/docs/man that you may wish to install." % dest
- 
- 
- print "Install complete. Have fun!"
diff --git a/audio/mma/files/patch-mma.py b/audio/mma/files/patch-mma.py
new file mode 100644
index 000000000000..86343157f3b5
--- /dev/null
+++ b/audio/mma/files/patch-mma.py
@@ -0,0 +1,12 @@
+--- ./mma.py.orig	2011-02-27 11:14:24.000000000 +0100
++++ ./mma.py	2011-02-27 11:17:00.000000000 +0100
+@@ -67,6 +67,9 @@
+     dirlist = ( sys.path[0], "/Users/Shared/mma", 
+              "/usr/local/share/mma", "/usr/share/mma", '.' )
+     midiPlayer = ['']   # must be a list!
++elif platform == 'FreeBSD':
++    dirlist = ( sys.path[0], '%%DATADIR%%', '.' )
++    midiPlayer = ['timidity', 'playmidi']
+ else:
+     dirlist = ( sys.path[0], "/usr/local/share/mma", "/usr/share/mma", '.' )
+     midiPlayer = ["aplaymidi"] # Must be a list!
diff --git a/audio/mma/pkg-plist b/audio/mma/pkg-plist
index f80663086675..a45b8a6361f5 100644
--- a/audio/mma/pkg-plist
+++ b/audio/mma/pkg-plist
@@ -1,41 +1,129 @@
 @comment $FreeBSD$
 bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/README
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/black.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/blue.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpendingc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpfilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpfillb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpfillc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpfilld.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/2beatp_2beatpintroc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotowna.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownendingc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownfilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownfillb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownfillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownfillc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownfilld.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/8beatmotown_8beatmotownintroc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sending-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sending-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sending-c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sfill-in-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sfill-in-ba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sfill-in-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sfill-in-cc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sfill-in-dd.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sintro-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sintro-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50sintro-c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50smain-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50smain-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50smain-c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50smain-d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rocka.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockendingc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockfillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockfillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockfillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockfillcc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockfilldd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/K50s_rock_50s_rockintroc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_ending-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_fill-in-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_fill-in-ab.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_fill-in-ba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_fill-in-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_intro-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_main-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_main-b.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_kfunk1a.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_kfunk1b.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_kfunk1endinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_kfunk1fillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_kfunk1fillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_kfunk1fillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_kfunk1fillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/Kfunk1_kfunk1introa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/fasttwist.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/fasttwist_fasttwista.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/fasttwist_fasttwistb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/fasttwist_fasttwistendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/fasttwist_fasttwistendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/fasttwist_fasttwistfilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/fasttwist_fasttwistfillb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/fasttwist_fasttwistintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/fasttwist_fasttwistintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshufflea.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshuffleb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshufflec.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshuffled.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshuffleendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshuffleendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshuffleendingc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshufflefilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshufflefillb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshufflefillc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshufflefilld.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshuffleintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshuffleintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/happyshuffle_happyshuffleintroc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossac.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossaendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossaendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossaendingc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossaendingd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossafilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossafillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossafillb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossafillc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossaintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossaintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kbossa_kbossaintroc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballada.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadendingc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadendingd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadfilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadfillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadfillb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadfillc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/kwestballad_kwestballadintrob.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_ending-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_fill-in-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_fill-in-ab.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_fill-in-ba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_fill-in-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_intro-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_main-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_main-b.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_twiendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_twifillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_twifillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_twifillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_twifillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_twiintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_twimaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/kara/twi_twimainb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/or-bar.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/50srock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/50srock_50srock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/50srock_50srock1.html
@@ -67,10 +155,15 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beat1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beat1plus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beat1sus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beat1susplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beatend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beatfill.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beatintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beatplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beatsus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat_8beatsusplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/ballad.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/ballad128.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/ballad128_ballad128.html
@@ -103,6 +196,7 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrock4.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrock4sus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrockend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrockintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrocksus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/beguine.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/beguine_beguine.html
@@ -361,6 +455,18 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastswing_fastswingsus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastswing_fastswingwalk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastswing_fastswingwalksus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltz.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzintro8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzsus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzsusplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzwalk.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzwalkplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzwalksus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastwaltz_fastwaltzwalksusplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/folk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/folk_folk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/folk_folkarticulated.html
@@ -461,12 +567,23 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzguitar_jazzguitar3walksus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzguitar_jazzguitarend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzguitar_jazzguitarend1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzguitar_jazzguitarfill.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzguitar_jazzguitarfill1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzguitar_jazzguitarintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzguitar_jazzguitarsus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzguitar_jazzguitarwalk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzguitar_jazzguitarwalksus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrhumba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrhumba_jazzrhumba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrhumba_jazzrhumbaend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrhumba_jazzrhumbafill.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrhumba_jazzrhumbaintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrhumba_jazzrhumbaplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrhumba_jazzrhumbasus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrhumba_jazzrhumbasusplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrock_jazzrock.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrock_jazzrockend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrock_jazzrockfill.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrock_jazzrockintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazzrock_jazzrockintro8.html
@@ -841,6 +958,7 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/swing_swing2sus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/swing_swing2triple.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/swing_swingend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/swing_swingfill.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/swing_swingintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/swing_swingintro2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/swing_swingplus.html
@@ -895,105 +1013,157 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/zydeco_zydecoplusend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/zydeco_zydecosus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/zydeco_zydecosusplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtrioendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtrioendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtriofillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtriofillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtriofillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtriofillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtriointroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtriointrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtriomaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzGrtrio_jazzgrtriomainb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasiea.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasieb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasieendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasieendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasieendingc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasiefillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasiefillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasiefillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasiefillcc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasiefilldd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasieintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasieintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasieintroc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasiemainc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbasie_jazzbasiemaind.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbossa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbossa_jazzbossaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbossa_jazzbossab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbossa_jazzbossaendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbossa_jazzbossafillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbossa_jazzbossafillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbossa_jazzbossaintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbouncy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbouncy_jazzbouncyendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbouncy_jazzbouncyfillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbouncy_jazzbouncyfillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbouncy_jazzbouncyintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbouncy_jazzbouncymaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzbouncy_jazzbouncymainb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzcountry.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzcountry_jazzcountryendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzcountry_jazzcountryfillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzcountry_jazzcountryfillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzcountry_jazzcountryintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzcountry_jazzcountrymaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzcountry_jazzcountrymainb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzswing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzswing_jazzswingendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzswing_jazzswingfillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzswing_jazzswingfillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzswing_jazzswingintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzswing_jazzswingmaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzswing_jazzswingmainb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazztrio.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazztrio_jazztrioendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazztrio_jazztriofillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazztrio_jazztriofillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazztrio_jazztriointroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazztrio_jazztriomaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazztrio_jazztriomainb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzwaltz.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzwaltz_jazzwaltzendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzwaltz_jazzwaltzfillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzwaltz_jazzwaltzfillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzwaltz_jazzwaltzintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzwaltz_jazzwaltzmaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/jazzwaltz_jazzwaltzmainb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_break-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_break-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_ending-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_ending-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_fill-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_fill-ab.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_fill-ba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_fill-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_intro-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_intro-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_main-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_main-b.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambobreakaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambobreakbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mamboendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mamboendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambofillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambofillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambofillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambofillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambointroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambointrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambomaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo_mambomainb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_ending-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_ending-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_ending-c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_fill-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_fill-ba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_fill-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_fill-cc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_fill-dd.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_intro-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_intro-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_intro-c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_main-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_main-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_main-c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_main-d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsendingc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsfillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsfillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsfillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsfillcc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsfilldd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsintroc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsmaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsmainb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsmainc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280_quandogsmaind.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_ending-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_ending-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_fill-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_fill-ab.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_fill-ba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_fill-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_intro-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_intro-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_main-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_main-b.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1endinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1endingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1fillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1fillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1fillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1fillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1introa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1introb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1maina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1_salsa1mainb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_ending-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_ending-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_fill-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_fill-ab.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_fill-ba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_fill-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_intro-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_intro-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_main-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_main-b.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2endinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2endingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2fillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2fillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2fillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2fillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2introa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2introb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2maina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2_salsa2mainb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_ending-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_ending-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_fill-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_fill-ab.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_fill-ba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_fill-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_intro-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_main-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_main-b.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_w-rockendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_w-rockendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_w-rockfillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_w-rockfillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_w-rockfillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_w-rockfillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_w-rockintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_w-rockmaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock_w-rockmainb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_ending-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_ending-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_fill-aa.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_fill-ab.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_fill-ba.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_fill-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_intro-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_intro-b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_main-a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_main-b.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernendinga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernendingb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernfillaa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernfillab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernfillba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernfillbb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernintroa.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernintrob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernmaina.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western_westernmainb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/mma.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img1.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img10.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img11.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img12.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img13.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img14.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img15.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img16.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img17.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img18.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img19.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img2.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img20.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img21.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img22.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img23.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img24.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img25.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img3.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img4.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img5.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img6.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img7.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img8.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/img9.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/mma.css
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/mma.html
@@ -1095,9 +1265,16 @@ bin/mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lyrics/twinkle3.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lyrics/twinkle3.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/README-riffs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/drum.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/frankie.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/frankie.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/frankie2.mid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/frankie2.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/frankie3.mid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/frankie3.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/frankie4.mid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/frankie4.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/rec1.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/midi-inc/rec2.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/cascade.mid
@@ -1113,6 +1290,7 @@ bin/mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/midinote.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/midinote.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/repeats.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/roman.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/volumes.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/volumes.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mkall
@@ -1129,6 +1307,8 @@ bin/mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/bill-bailey.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/marine-hymn.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/marine-hymn.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solo/solo.mid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solo/solo.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/deep-river.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/deep-river.mma
@@ -1138,92 +1318,143 @@ bin/mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial/fella2.mma
 %%DATADIR%%/MMA/__init__.py
 %%DATADIR%%/MMA/__init__.pyc
+%%DATADIR%%/MMA/__init__.pyo
 %%DATADIR%%/MMA/alloc.py
 %%DATADIR%%/MMA/alloc.pyc
+%%DATADIR%%/MMA/alloc.pyo
 %%DATADIR%%/MMA/auto.py
 %%DATADIR%%/MMA/auto.pyc
+%%DATADIR%%/MMA/auto.pyo
 %%DATADIR%%/MMA/chords.py
 %%DATADIR%%/MMA/chords.pyc
+%%DATADIR%%/MMA/chords.pyo
 %%DATADIR%%/MMA/chordtable.py
 %%DATADIR%%/MMA/chordtable.pyc
+%%DATADIR%%/MMA/chordtable.pyo
 %%DATADIR%%/MMA/common.py
 %%DATADIR%%/MMA/common.pyc
+%%DATADIR%%/MMA/common.pyo
 %%DATADIR%%/MMA/docs.py
 %%DATADIR%%/MMA/docs.pyc
+%%DATADIR%%/MMA/docs.pyo
+%%DATADIR%%/MMA/exits.py
+%%DATADIR%%/MMA/exits.pyc
+%%DATADIR%%/MMA/exits.pyo
 %%DATADIR%%/MMA/file.py
 %%DATADIR%%/MMA/file.pyc
+%%DATADIR%%/MMA/file.pyo
 %%DATADIR%%/MMA/gbl.py
 %%DATADIR%%/MMA/gbl.pyc
+%%DATADIR%%/MMA/gbl.pyo
 %%DATADIR%%/MMA/grooves.py
 %%DATADIR%%/MMA/grooves.pyc
+%%DATADIR%%/MMA/grooves.pyo
 %%DATADIR%%/MMA/harmony.py
 %%DATADIR%%/MMA/harmony.pyc
+%%DATADIR%%/MMA/harmony.pyo
 %%DATADIR%%/MMA/keysig.py
 %%DATADIR%%/MMA/keysig.pyc
+%%DATADIR%%/MMA/keysig.pyo
 %%DATADIR%%/MMA/lyric.py
 %%DATADIR%%/MMA/lyric.pyc
+%%DATADIR%%/MMA/lyric.pyo
 %%DATADIR%%/MMA/macro.py
 %%DATADIR%%/MMA/macro.pyc
+%%DATADIR%%/MMA/macro.pyo
 %%DATADIR%%/MMA/main.py
 %%DATADIR%%/MMA/main.pyc
+%%DATADIR%%/MMA/main.pyo
 %%DATADIR%%/MMA/mdefine.py
 %%DATADIR%%/MMA/mdefine.pyc
+%%DATADIR%%/MMA/mdefine.pyo
 %%DATADIR%%/MMA/midi.py
 %%DATADIR%%/MMA/midi.pyc
+%%DATADIR%%/MMA/midi.pyo
 %%DATADIR%%/MMA/midiC.py
 %%DATADIR%%/MMA/midiC.pyc
+%%DATADIR%%/MMA/midiC.pyo
 %%DATADIR%%/MMA/midiIn.py
 %%DATADIR%%/MMA/midiIn.pyc
+%%DATADIR%%/MMA/midiIn.pyo
 %%DATADIR%%/MMA/midiM.py
 %%DATADIR%%/MMA/midiM.pyc
+%%DATADIR%%/MMA/midiM.pyo
 %%DATADIR%%/MMA/midifuncs.py
 %%DATADIR%%/MMA/midifuncs.pyc
+%%DATADIR%%/MMA/midifuncs.pyo
 %%DATADIR%%/MMA/midinote.py
 %%DATADIR%%/MMA/midinote.pyc
+%%DATADIR%%/MMA/midinote.pyo
 %%DATADIR%%/MMA/miditables.py
 %%DATADIR%%/MMA/miditables.pyc
+%%DATADIR%%/MMA/miditables.pyo
 %%DATADIR%%/MMA/notelen.py
 %%DATADIR%%/MMA/notelen.pyc
+%%DATADIR%%/MMA/notelen.pyo
 %%DATADIR%%/MMA/options.py
 %%DATADIR%%/MMA/options.pyc
+%%DATADIR%%/MMA/options.pyo
 %%DATADIR%%/MMA/parse.py
 %%DATADIR%%/MMA/parse.pyc
+%%DATADIR%%/MMA/parse.pyo
 %%DATADIR%%/MMA/pat.py
 %%DATADIR%%/MMA/pat.pyc
+%%DATADIR%%/MMA/pat.pyo
 %%DATADIR%%/MMA/patAria.py
 %%DATADIR%%/MMA/patAria.pyc
+%%DATADIR%%/MMA/patAria.pyo
 %%DATADIR%%/MMA/patArpeggio.py
 %%DATADIR%%/MMA/patArpeggio.pyc
+%%DATADIR%%/MMA/patArpeggio.pyo
 %%DATADIR%%/MMA/patBass.py
 %%DATADIR%%/MMA/patBass.pyc
+%%DATADIR%%/MMA/patBass.pyo
 %%DATADIR%%/MMA/patChord.py
 %%DATADIR%%/MMA/patChord.pyc
+%%DATADIR%%/MMA/patChord.pyo
 %%DATADIR%%/MMA/patDrum.py
 %%DATADIR%%/MMA/patDrum.pyc
+%%DATADIR%%/MMA/patDrum.pyo
 %%DATADIR%%/MMA/patPlectrum.py
 %%DATADIR%%/MMA/patPlectrum.pyc
+%%DATADIR%%/MMA/patPlectrum.pyo
 %%DATADIR%%/MMA/patScale.py
 %%DATADIR%%/MMA/patScale.pyc
+%%DATADIR%%/MMA/patScale.pyo
 %%DATADIR%%/MMA/patSolo.py
 %%DATADIR%%/MMA/patSolo.pyc
+%%DATADIR%%/MMA/patSolo.pyo
 %%DATADIR%%/MMA/patWalk.py
 %%DATADIR%%/MMA/patWalk.pyc
+%%DATADIR%%/MMA/patWalk.pyo
 %%DATADIR%%/MMA/patch.py
 %%DATADIR%%/MMA/patch.pyc
+%%DATADIR%%/MMA/patch.pyo
 %%DATADIR%%/MMA/paths.py
 %%DATADIR%%/MMA/paths.pyc
+%%DATADIR%%/MMA/paths.pyo
 %%DATADIR%%/MMA/player.py
 %%DATADIR%%/MMA/player.pyc
+%%DATADIR%%/MMA/player.pyo
+%%DATADIR%%/MMA/roman.py
+%%DATADIR%%/MMA/roman.pyc
+%%DATADIR%%/MMA/roman.pyo
 %%DATADIR%%/MMA/safe_eval.py
 %%DATADIR%%/MMA/safe_eval.pyc
+%%DATADIR%%/MMA/safe_eval.pyo
 %%DATADIR%%/MMA/seqrnd.py
 %%DATADIR%%/MMA/seqrnd.pyc
+%%DATADIR%%/MMA/seqrnd.pyo
+%%DATADIR%%/MMA/swing.py
+%%DATADIR%%/MMA/swing.pyc
+%%DATADIR%%/MMA/swing.pyo
 %%DATADIR%%/MMA/translate.py
 %%DATADIR%%/MMA/translate.pyc
+%%DATADIR%%/MMA/translate.pyo
 %%DATADIR%%/MMA/volume.py
 %%DATADIR%%/MMA/volume.pyc
+%%DATADIR%%/MMA/volume.pyo
 %%DATADIR%%/includes/README
-%%DATADIR%%/includes/aria/.keepme
 %%DATADIR%%/includes/casio-wk3000.mma
 %%DATADIR%%/includes/init-long.mma
 %%DATADIR%%/includes/init.mma
@@ -1233,14 +1464,16 @@ bin/mma
 %%DATADIR%%/includes/stdpats54.mma
 %%DATADIR%%/lib/README
 %%DATADIR%%/lib/kara/.mmaDB
+%%DATADIR%%/lib/kara/2beatp.mma
+%%DATADIR%%/lib/kara/8beatmotown.mma
 %%DATADIR%%/lib/kara/K50s_rock.mma
+%%DATADIR%%/lib/kara/Kfunk1.mma
 %%DATADIR%%/lib/kara/README
+%%DATADIR%%/lib/kara/fasttwist.mma
+%%DATADIR%%/lib/kara/happyshuffle.mma
+%%DATADIR%%/lib/kara/kbossa.mma
+%%DATADIR%%/lib/kara/kwestballad.mma
 %%DATADIR%%/lib/kara/twi.mma
-%%DATADIR%%/lib/stdlib/#bluegrass.mma#
-%%DATADIR%%/lib/stdlib/#charleston.mma#
-%%DATADIR%%/lib/stdlib/#modernjazz.mma#
-%%DATADIR%%/lib/stdlib/#quickstep.mma#
-%%DATADIR%%/lib/stdlib/#slowdixie.mma#
 %%DATADIR%%/lib/stdlib/.mmaDB
 %%DATADIR%%/lib/stdlib/50srock.mma
 %%DATADIR%%/lib/stdlib/60srock.mma
@@ -1272,11 +1505,10 @@ bin/mma
 %%DATADIR%%/lib/stdlib/easyswing.mma
 %%DATADIR%%/lib/stdlib/fastblues.mma
 %%DATADIR%%/lib/stdlib/fastswing.mma
+%%DATADIR%%/lib/stdlib/fastwaltz.mma
 %%DATADIR%%/lib/stdlib/folk.mma
 %%DATADIR%%/lib/stdlib/folkballad.mma
 %%DATADIR%%/lib/stdlib/folkyjazz.mma
-%%DATADIR%%/lib/stdlib/foo
-%%DATADIR%%/lib/stdlib/foo.html
 %%DATADIR%%/lib/stdlib/foxtrot.mma
 %%DATADIR%%/lib/stdlib/frenchwaltz.mma
 %%DATADIR%%/lib/stdlib/guitarballad.mma
@@ -1284,6 +1516,7 @@ bin/mma
 %%DATADIR%%/lib/stdlib/jazz-54.mma
 %%DATADIR%%/lib/stdlib/jazzcombo.mma
 %%DATADIR%%/lib/stdlib/jazzguitar.mma
+%%DATADIR%%/lib/stdlib/jazzrhumba.mma
 %%DATADIR%%/lib/stdlib/jazzrock.mma
 %%DATADIR%%/lib/stdlib/jazzwaltz.mma
 %%DATADIR%%/lib/stdlib/jive.mma
@@ -1328,6 +1561,14 @@ bin/mma
 %%DATADIR%%/lib/stdlib/zydeco.mma
 %%DATADIR%%/lib/yamaha/.mmaDB
 %%DATADIR%%/lib/yamaha/README
+%%DATADIR%%/lib/yamaha/jazzGrtrio.mma
+%%DATADIR%%/lib/yamaha/jazzbasie.mma
+%%DATADIR%%/lib/yamaha/jazzbossa.mma
+%%DATADIR%%/lib/yamaha/jazzbouncy.mma
+%%DATADIR%%/lib/yamaha/jazzcountry.mma
+%%DATADIR%%/lib/yamaha/jazzswing.mma
+%%DATADIR%%/lib/yamaha/jazztrio.mma
+%%DATADIR%%/lib/yamaha/jazzwaltz.mma
 %%DATADIR%%/lib/yamaha/mambo.mma
 %%DATADIR%%/lib/yamaha/quando-g.s280.mma
 %%DATADIR%%/lib/yamaha/salsa1.mma
@@ -1343,6 +1584,7 @@ bin/mma
 @dirrm %%DATADIR%%/MMA
 @dirrm %%DATADIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorial
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/solo
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/simple
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/scales
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rndset
@@ -1365,3 +1607,4 @@ bin/mma
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/lib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@exec mkdir -p %D/%%DATADIR%%/includes/aria