- Update to 1.4

4 files changed, 64 insertions, 32 deletions

diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index 342eeb2f9f60..06ae83099656 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mma
-DISTVERSION=	1.3a
+DISTVERSION=	1.4
 #PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mellowood.ca/${PORTNAME}/ \
@@ -32,6 +32,9 @@ FIND_FILES_BAK=	${WRKSRC} -type f -and \( -name "*.orig" -or -name "*.bak" \)
 
 .if !defined (NOPORTDOCS)
 DISTFILES+=	${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz
+.if !defined (NO_INSTALL_MANPAGES)
+MAN1=	mma.1 mma-libdoc.1 mma-renum.1
+.endif
 .endif
 
 .include <bsd.port.pre.mk>
@@ -53,6 +56,10 @@ do-install:
 	@cd ${WRKSRC} && ${CP_INSTALL_MMA}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/pdf && ${CP} ${WRKDOC}/*.pdf ${DOCSDIR}/pdf/
+	@cd ${DOCSDIR} && ${RM} -R man
+.if !defined(NO_INSTALL_MANPAGES)
+	@cd ${WRKSRC}/docs/man && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/
+.endif
 .endif
 
 .if defined (WITH_TIMIDITY)
diff --git a/audio/mma/distinfo b/audio/mma/distinfo
index e0440c7125bf..f86eef1b82bc 100644
--- a/audio/mma/distinfo
+++ b/audio/mma/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (mma-bin-1.4.tar.gz) = baddbec7337116907a64925ae28c38f6
+SHA256 (mma-bin-1.4.tar.gz) = ba2ea3a6946193e6bc74ace22f08fb14ee860e7cc8f87f18dd061d1be6630748
+SIZE (mma-bin-1.4.tar.gz) = 759548
+MD5 (mma-pdf-1.4.tar.gz) = 0d118f368d0348771a344884eb4420df
+SHA256 (mma-pdf-1.4.tar.gz) = 6210e43b84277a8e9c862176898d918cecb7e673a06214d9323378e5cd1dbb53
+SIZE (mma-pdf-1.4.tar.gz) = 1238090
diff --git a/audio/mma/files/patch-cp-install b/audio/mma/files/patch-cp-install
index 5346d1279d6a..c365a914ed00 100644
--- a/audio/mma/files/patch-cp-install
+++ b/audio/mma/files/patch-cp-install
@@ -1,6 +1,5 @@
-$FreeBSD$
---- cp-install	Wed Mar  7 22:17:56 2007
-+++ cp-install.port	Sat Mar 10 21:47:41 2007
+--- 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
@@ -58,7 +57,7 @@ $FreeBSD$
  
  ###########################################
  ######## Set permissions/udate database
-@@ -127,14 +136,14 @@
+@@ -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"
@@ -75,5 +74,10 @@ $FreeBSD$
 +#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/pkg-plist b/audio/mma/pkg-plist
index 6e6e728d15b8..c2d6168559b2 100644
--- a/audio/mma/pkg-plist
+++ b/audio/mma/pkg-plist
@@ -10,6 +10,7 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/8beat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/ballad.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/ballad128.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/ballad68.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/beguine.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bigband.html
@@ -51,15 +52,20 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/polka.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/popballad.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/quickstep.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/rb-ballad.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/rb.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/rhumba.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/rock-128.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/rockballad.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/rockwaltz.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/salsa.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/samba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/showtune.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/shuffleboggie.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/ska.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowblues.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowbolero.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowbroadway.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowcountry.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowjazz.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/softrock.html
@@ -73,11 +79,12 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/zydeco.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/mambo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/quando-g.s280.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/salsa2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/w-rock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/yamaha/western.html
 %%PORTDOCS%%%%DOCSDIR%%/html/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/mma.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ref/crossref.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img1.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img10.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img11.png
@@ -98,6 +105,7 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img25.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img26.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img27.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ref/img28.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img3.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img4.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/img5.png
@@ -191,6 +199,7 @@ bin/mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/aria/girl.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/harmony/harmony.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/harmony/harmony.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lyrics/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lyrics/twinkle.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lyrics/twinkle.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lyrics/twinkle1.mid
@@ -214,6 +223,7 @@ bin/mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/macros-all.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/macros.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/macros.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/math.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/repeats.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/volumes.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/volumes.mma
@@ -303,6 +313,8 @@ bin/mma
 %%DATADIR%%/MMA/patWalk.pyc
 %%DATADIR%%/MMA/patch.py
 %%DATADIR%%/MMA/patch.pyc
+%%DATADIR%%/MMA/safe_eval.py
+%%DATADIR%%/MMA/safe_eval.pyc
 %%DATADIR%%/MMA/seqrnd.py
 %%DATADIR%%/MMA/seqrnd.pyc
 %%DATADIR%%/MMA/translate.py
@@ -312,7 +324,6 @@ bin/mma
 %%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
@@ -324,6 +335,7 @@ bin/mma
 %%DATADIR%%/lib/kara/K50s_rock.mma
 %%DATADIR%%/lib/kara/README
 %%DATADIR%%/lib/kara/twi.mma
+%%DATADIR%%/lib/stdlib/#easyswing.mma#
 %%DATADIR%%/lib/stdlib/.mmaDB
 %%DATADIR%%/lib/stdlib/50srock.mma
 %%DATADIR%%/lib/stdlib/60srock.mma
@@ -331,6 +343,7 @@ bin/mma
 %%DATADIR%%/lib/stdlib/README
 %%DATADIR%%/lib/stdlib/ballad.mma
 %%DATADIR%%/lib/stdlib/ballad128.mma
+%%DATADIR%%/lib/stdlib/ballad68.mma
 %%DATADIR%%/lib/stdlib/basicrock.mma
 %%DATADIR%%/lib/stdlib/beguine.mma
 %%DATADIR%%/lib/stdlib/bigband.mma
@@ -372,15 +385,20 @@ bin/mma
 %%DATADIR%%/lib/stdlib/polka.mma
 %%DATADIR%%/lib/stdlib/popballad.mma
 %%DATADIR%%/lib/stdlib/quickstep.mma
+%%DATADIR%%/lib/stdlib/rb-ballad.mma
 %%DATADIR%%/lib/stdlib/rb.mma
 %%DATADIR%%/lib/stdlib/rhumba.mma
 %%DATADIR%%/lib/stdlib/rock-128.mma
 %%DATADIR%%/lib/stdlib/rockballad.mma
+%%DATADIR%%/lib/stdlib/rockwaltz.mma
+%%DATADIR%%/lib/stdlib/salsa.mma
 %%DATADIR%%/lib/stdlib/samba.mma
+%%DATADIR%%/lib/stdlib/showtune.mma
 %%DATADIR%%/lib/stdlib/shuffleboggie.mma
 %%DATADIR%%/lib/stdlib/ska.mma
 %%DATADIR%%/lib/stdlib/slowblues.mma
 %%DATADIR%%/lib/stdlib/slowbolero.mma
+%%DATADIR%%/lib/stdlib/slowbroadway.mma
 %%DATADIR%%/lib/stdlib/slowcountry.mma
 %%DATADIR%%/lib/stdlib/slowjazz.mma
 %%DATADIR%%/lib/stdlib/softrock.mma
@@ -392,23 +410,23 @@ bin/mma
 %%DATADIR%%/lib/stdlib/vienesewaltz.mma
 %%DATADIR%%/lib/stdlib/waltz.mma
 %%DATADIR%%/lib/stdlib/zydeco.mma
+%%DATADIR%%/lib/yamaha/#salsa1.mma#
 %%DATADIR%%/lib/yamaha/.mmaDB
 %%DATADIR%%/lib/yamaha/README
 %%DATADIR%%/lib/yamaha/mambo.mma
 %%DATADIR%%/lib/yamaha/quando-g.s280.mma
+%%DATADIR%%/lib/yamaha/salsa1.mma
+%%DATADIR%%/lib/yamaha/salsa2.mma
 %%DATADIR%%/lib/yamaha/w-rock.mma
 %%DATADIR%%/lib/yamaha/western.mma
-%%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%%
+@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%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tutorial
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/simple
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/scales
@@ -420,11 +438,14 @@ bin/mma
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/harmony
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/aria
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@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%%
+%%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%%