- Update to 1.2

- Remove WIT(OUT)_EXAMPLES stuff from Makefile

4 files changed, 25 insertions, 30 deletions

diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index dc8df40fde50..919ab56817d7 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mma
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2
+#PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mellowood.ca/${PORTNAME}/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
@@ -27,40 +27,32 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-bin-${PORTVERSION}
 WRKDOC=	${WRKDIR}/${PORTNAME}-pdf-${PORTVERSION}
 
 CP_INSTALL_MMA=	${WRKSRC}/cp-install
-FIND_FILES=	${WRKSRC} -type f -and \( -name "*.py" -or -name 'cp-install' -or -name 'mkall' \)
+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" \)
-FIND_DOCS=	. -type f -name "*.pdf"
 
 .if !defined (NOPORTDOCS)
 DISTFILES+=	${PORTNAME}-pdf-${PORTVERSION}.tar.gz
 .endif
 
+.include <bsd.port.pre.mk>
 
-PLIST_SUB=	PORTEXAMPLES=${PORTEXAMPLES}
+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} -exec ${REINPLACE_CMD} \
-	    -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},' {} ";"
+	@${FIND} ${FIND_FILES} | ${XARGS} ${XARGS_ARGS} ${REINPLACE_CMD}
 	@${FIND} ${FIND_FILES_BAK} -delete
 	@${TOUCH} ${WRKSRC}/includes/aria/.keepme
 
 do-install:
-	@cd ${WRKSRC} && ${ENV} NOPORTDOCS=${NOPORTDOCS} WITHOUT_EXAMPLES=${WITHOUT_EXAMPLES} ${CP_INSTALL_MMA}
+	@cd ${WRKSRC} && ${CP_INSTALL_MMA}
 .if !defined(NOPORTDOCS)
-	@cd ${WRKDOC} && ${MKDIR} ${DOCSDIR}/pdf && ${FIND} ${FIND_DOCS} -exec ${INSTALL_DATA} {} ${DOCSDIR}/pdf/ ";"
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if defined (WITHOUT_EXAMPLES)
-PORTEXAMPLES=	"@comment "
-.else
-PORTEXAMPLES=	""
+	@${MKDIR} ${DOCSDIR}/pdf && ${CP} ${WRKDOC}/*.pdf ${DOCSDIR}/pdf/
 .endif
 
 .if defined (WITH_TIMIDITY)
diff --git a/audio/mma/distinfo b/audio/mma/distinfo
index 24a44722bf39..7032320be49b 100644
--- a/audio/mma/distinfo
+++ b/audio/mma/distinfo
@@ -1,6 +1,6 @@
-MD5 (mma-bin-1.1.tar.gz) = 0d956c3a1022360a58735e0e4ec12eed
-SHA256 (mma-bin-1.1.tar.gz) = 37032914dc6b551bb13414c0e9bdadf9c6ee412f469c2899c4c0f36b374ed1f7
-SIZE (mma-bin-1.1.tar.gz) = 660880
-MD5 (mma-pdf-1.1.tar.gz) = 7e753738a6240da585e86e120edeebe9
-SHA256 (mma-pdf-1.1.tar.gz) = 4ce55591ce4c800529b6e99422d954de62760ccc24d9563e5e68b304d1505b65
-SIZE (mma-pdf-1.1.tar.gz) = 1140038
+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
diff --git a/audio/mma/files/patch-cp-install b/audio/mma/files/patch-cp-install
index 2f3efddb7247..83f1e09f66f9 100644
--- a/audio/mma/files/patch-cp-install
+++ b/audio/mma/files/patch-cp-install
@@ -51,7 +51,7 @@ $FreeBSD$
 +###########################################
 +######## Copy examples
 +
-+if not os.getenv('WITHOUT_EXAMPLES'):
++if not os.getenv('NOPORTEXAMPLES'):
 +    examplesdir = '%%EXAMPLESDIR%%'
 +    print "Copying example files to", examplesdir
 +    shutil.copytree( "egs", examplesdir)
diff --git a/audio/mma/pkg-plist b/audio/mma/pkg-plist
index f96e60b548e6..a4850f5aa85a 100644
--- a/audio/mma/pkg-plist
+++ b/audio/mma/pkg-plist
@@ -67,6 +67,7 @@ bin/mma
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/son.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/swing.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/tango.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/trance.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/vienesewaltz.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/waltz.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/zydeco.html
@@ -301,17 +302,18 @@ bin/mma
 %%DATADIR%%/MMA/volume.py
 %%DATADIR%%/MMA/volume.pyc
 %%DATADIR%%/includes/README
+%%DATADIR%%/includes/aria/.keepme
 %%DATADIR%%/includes/init.mma
 %%DATADIR%%/includes/reset.mma
 %%DATADIR%%/includes/stdpats.mma
 %%DATADIR%%/includes/stdpats34.mma
 %%DATADIR%%/includes/stdpats54.mma
-%%DATADIR%%/includes/aria/.keepme
 %%DATADIR%%/lib/README
 %%DATADIR%%/lib/kara/.mmaDB
 %%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
@@ -376,6 +378,7 @@ bin/mma
 %%DATADIR%%/lib/stdlib/son.mma
 %%DATADIR%%/lib/stdlib/swing.mma
 %%DATADIR%%/lib/stdlib/tango.mma
+%%DATADIR%%/lib/stdlib/trance.mma
 %%DATADIR%%/lib/stdlib/vienesewaltz.mma
 %%DATADIR%%/lib/stdlib/waltz.mma
 %%DATADIR%%/lib/stdlib/zydeco.mma