- Update to 1.3.a

- Turn off WITH_TIMIDITY option

4 files changed, 45 insertions, 35 deletions

diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index 919ab56817d7..342eeb2f9f60 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	mma
-PORTVERSION=	1.2
+DISTVERSION=	1.3a
 #PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mellowood.ca/${PORTNAME}/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
-DISTFILES=	${PORTNAME}-bin-${PORTVERSION}.tar.gz
+DISTFILES=	${PORTNAME}-bin-${DISTVERSION}.tar.gz
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Musical MIDI Accompaniment generator
@@ -20,18 +20,18 @@ NO_BUILD=	yes
 
 USE_PYTHON=	2.4+
 
-OPTIONS=	TIMIDITY	"Install timidity++ as MIDI player" On \
+OPTIONS=	TIMIDITY	"Install timidity++ as MIDI player" Off \
 		PLAYMIDI	"Install playmidi as MIDI player" Off
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-bin-${PORTVERSION}
-WRKDOC=	${WRKDIR}/${PORTNAME}-pdf-${PORTVERSION}
+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" \)
 
 .if !defined (NOPORTDOCS)
-DISTFILES+=	${PORTNAME}-pdf-${PORTVERSION}.tar.gz
+DISTFILES+=	${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/audio/mma/distinfo b/audio/mma/distinfo
index 7032320be49b..e0440c7125bf 100644
--- a/audio/mma/distinfo
+++ b/audio/mma/distinfo
@@ -1,6 +1,6 @@
-MD5 (mma-bin-1.2.tar.gz) = aaa2c2dbd0295195162b7e9bd0816940
-SHA256 (mma-bin-1.2.tar.gz) = 7dc8225b9d39486ac7962c83db14b4679d46f086d8eaa564d3b3367281f78687
-SIZE (mma-bin-1.2.tar.gz) = 636046
-MD5 (mma-pdf-1.2.tar.gz) = ffe8e6957e613090d6984fa9846d7810
-SHA256 (mma-pdf-1.2.tar.gz) = 206520e83a264ad7ff6ee57fc065390a28ab06da44ef6040ee49f551cc86e500
-SIZE (mma-pdf-1.2.tar.gz) = 1159416
+MD5 (mma-bin-1.3a.tar.gz) = 8ab4eab5a108de3f0413a26a627da310
+SHA256 (mma-bin-1.3a.tar.gz) = b8c10f7f6395211ed2d4008ff378576c0d454692f0c8373785b8b4407cd8433a
+SIZE (mma-bin-1.3a.tar.gz) = 664676
+MD5 (mma-pdf-1.3.tar.gz) = 535cc45ee14c8180f207edbf6f5ba78c
+SHA256 (mma-pdf-1.3.tar.gz) = cc7cb70e32c201551b9861359408d36a40b74cd9d8854e9c62a94237068ff7d9
+SIZE (mma-pdf-1.3.tar.gz) = 1202669
diff --git a/audio/mma/files/patch-cp-install b/audio/mma/files/patch-cp-install
index 83f1e09f66f9..5346d1279d6a 100644
--- a/audio/mma/files/patch-cp-install
+++ b/audio/mma/files/patch-cp-install
@@ -42,7 +42,7 @@ $FreeBSD$
  ######## Copy the html docs
  
 -print "Copying HTML documentation to", dest
-+if not os.getenv('NOPORTDOCS'):
++if not os.environ.has_key('NOPORTDOCS'):
 +    docsdir = '%%DOCSDIR%%'
 +    print "Copying HTML documentation to", docsdir
 +    shutil.copytree( "docs", docsdir)
diff --git a/audio/mma/pkg-plist b/audio/mma/pkg-plist
index a4850f5aa85a..6e6e728d15b8 100644
--- a/audio/mma/pkg-plist
+++ b/audio/mma/pkg-plist
@@ -149,6 +149,8 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node29.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node30.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref/node31.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref/node32.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node4.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node5.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node6.html
@@ -253,6 +255,8 @@ bin/mma
 %%DATADIR%%/MMA/file.pyc
 %%DATADIR%%/MMA/gbl.py
 %%DATADIR%%/MMA/gbl.pyc
+%%DATADIR%%/MMA/grooves.py
+%%DATADIR%%/MMA/grooves.pyc
 %%DATADIR%%/MMA/harmony.py
 %%DATADIR%%/MMA/harmony.pyc
 %%DATADIR%%/MMA/lyric.py
@@ -297,12 +301,19 @@ bin/mma
 %%DATADIR%%/MMA/patSolo.pyc
 %%DATADIR%%/MMA/patWalk.py
 %%DATADIR%%/MMA/patWalk.pyc
+%%DATADIR%%/MMA/patch.py
+%%DATADIR%%/MMA/patch.pyc
+%%DATADIR%%/MMA/seqrnd.py
+%%DATADIR%%/MMA/seqrnd.pyc
 %%DATADIR%%/MMA/translate.py
 %%DATADIR%%/MMA/translate.pyc
 %%DATADIR%%/MMA/volume.py
 %%DATADIR%%/MMA/volume.pyc
 %%DATADIR%%/includes/README
 %%DATADIR%%/includes/aria/.keepme
+%%DATADIR%%/includes/casio-wk3000.mma
+%%DATADIR%%/includes/casiowk3000.mma
+%%DATADIR%%/includes/init-long.mma
 %%DATADIR%%/includes/init.mma
 %%DATADIR%%/includes/reset.mma
 %%DATADIR%%/includes/stdpats.mma
@@ -313,7 +324,6 @@ bin/mma
 %%DATADIR%%/lib/kara/K50s_rock.mma
 %%DATADIR%%/lib/kara/README
 %%DATADIR%%/lib/kara/twi.mma
-%%DATADIR%%/lib/stdlib/#waltz.mma#
 %%DATADIR%%/lib/stdlib/.mmaDB
 %%DATADIR%%/lib/stdlib/50srock.mma
 %%DATADIR%%/lib/stdlib/60srock.mma
@@ -388,33 +398,33 @@ bin/mma
 %%DATADIR%%/lib/yamaha/quando-g.s280.mma
 %%DATADIR%%/lib/yamaha/w-rock.mma
 %%DATADIR%%/lib/yamaha/western.mma
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/lib/kara
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/lib/stdlib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/lib/yamaha
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/lib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ref/mupex
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ref
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/tut/mup
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/tut
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ref/mupex
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ref
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/lib/yamaha
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/lib/stdlib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/lib/kara
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/lib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/aria
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/harmony
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/lyrics
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/midi-inc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/misc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/riffs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rndset
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/scales
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/simple
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorial
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/simple
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/scales
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rndset
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/riffs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/misc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/midi-inc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/lyrics
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/harmony
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/aria
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%/MMA
-@dirrm %%DATADIR%%/includes/aria
-@dirrm %%DATADIR%%/includes
-@dirrm %%DATADIR%%/lib/kara
-@dirrm %%DATADIR%%/lib/stdlib
 @dirrm %%DATADIR%%/lib/yamaha
+@dirrm %%DATADIR%%/lib/stdlib
+@dirrm %%DATADIR%%/lib/kara
 @dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/includes/aria
+@dirrm %%DATADIR%%/includes
+@dirrm %%DATADIR%%/MMA
 @dirrm %%DATADIR%%