7 files changed, 85 insertions, 66 deletions

diff --git a/print/mup/Makefile b/print/mup/Makefile
index ff12adfa2927..4a6acba84bee 100644
--- a/print/mup/Makefile
+++ b/print/mup/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	mup
-PORTVERSION=	4.6
-PORTREVISION=	0
+PORTVERSION=	5.0
 CATEGORIES=	print audio
 MASTER_SITES=	ftp://ftp.arkkra.com/pub/unix/
-DISTFILES=	mup46src.tar.gz mup46doc.tar.gz
+DISTFILES=	mup50src.tar.gz mup50doc.tar.gz
 
 MAINTAINER=	darius@dons.net.au
 COMMENT=	A shareware program for typesetting music
@@ -35,7 +34,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/mupprnt.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	tar -cf - -C ${WRKSRC}/docs/ overview.txt register.txt README1 mupfeat.txt faq.txt license.txt uguide uguide.ps | tar -C ${DOCSDIR} -xf -
+	${TAR} -cf - -C ${WRKSRC}/docs/ overview.txt register.txt README1 mupfeat.txt faq.txt license.txt uguide uguide.ps | ${TAR} -C ${DOCSDIR} -xf -
 	${INSTALL_DATA} ${WRKSRC}/README0 ${DOCSDIR}
 .endif
 
diff --git a/print/mup/distinfo b/print/mup/distinfo
index 7a0639c1d9d5..6dc8158c7846 100644
--- a/print/mup/distinfo
+++ b/print/mup/distinfo
@@ -1,4 +1,4 @@
-MD5 (mup46src.tar.gz) = a4019542e0de5337240552adf5a56430
-SIZE (mup46src.tar.gz) = 745999
-MD5 (mup46doc.tar.gz) = 4a912caac886bc4a6b1896fc8a1848cc
-SIZE (mup46doc.tar.gz) = 586421
+MD5 (mup50src.tar.gz) = 980d467c9f42f00bd9ba54b34fcf61c9
+SIZE (mup50src.tar.gz) = 779418
+MD5 (mup50doc.tar.gz) = cb5b4ddea95f38c220a12dbe74f570d9
+SIZE (mup50doc.tar.gz) = 641955
diff --git a/print/mup/files/Makefile.mup b/print/mup/files/Makefile.mup
index dc4440a8b21b..71f7ae1b18e4 100644
--- a/print/mup/files/Makefile.mup
+++ b/print/mup/files/Makefile.mup
@@ -3,55 +3,56 @@ LDADD+=	-lm
 NOMAN=
 
 SRCS=	abshorz.c \
-	absvert.c \
-	assign.c \
-	beaming.c \
-	beamstem.c \
-	brac.c \
-	charinfo.c \
-	check.c \
-	debug.c \
-	errors.c \
-	extchtbl.c \
-	font.c \
-	fontdata.c \
-	globals.c \
-	grpsyl.c \
-	lex.c \
-	locvar.c \
-	lyrics.c \
-	macros.c \
-	main.c \
-	mainlist.c \
-	map.c \
-	midi.c \
-	midiutil.c \
-	mkchords.c \
-	muschtbl.c \
-	nxtstrch.c \
-	parstuff.c \
-	phrase.c \
-	plutils.c \
-	print.c \
-	prntdata.c \
-	prntmisc.c \
-	prnttab.c \
-	prolog.c \
-	range.c \
-	rational.c \
-	relvert.c \
-	restsyl.c \
-	roll.c \
-	setgrps.c \
-	setnotes.c \
-	ssv.c \
-	stuff.c \
-	symtbl.c \
-	tie.c \
-	trantab.c \
-	trnspose.c \
-	undrscre.c \
-	utils.c \
-	ytab.c
+        absvert.c \
+        assign.c \
+        beaming.c \
+        beamstem.c \
+        brac.c \
+        charinfo.c \
+        check.c \
+        debug.c \
+        errors.c \
+        extchtbl.c \
+        font.c \
+        fontdata.c \
+        globals.c \
+        grpsyl.c \
+        lex.c \
+        locvar.c \
+        lyrics.c \
+        macros.c \
+        main.c \
+        mainlist.c \
+        map.c \
+        midi.c \
+        midiutil.c \
+        mkchords.c \
+        muschtbl.c \
+        nxtstrch.c \
+        parstssv.c \
+        parstuff.c \
+        phrase.c \
+        plutils.c \
+        print.c \
+        prntdata.c \
+        prntmisc.c \
+        prnttab.c \
+        prolog.c \
+        range.c \
+        rational.c \
+        relvert.c \
+        restsyl.c \
+        roll.c \
+        setgrps.c \
+        setnotes.c \
+        ssv.c \
+        stuff.c \
+        symtbl.c \
+        tie.c \
+        trantab.c \
+        trnspose.c \
+        undrscre.c \
+        utils.c \
+        ytab.c
 
 .include <bsd.prog.mk>
diff --git a/print/mup/files/patch-ac b/print/mup/files/patch-mupdisp::dispttyp.h
index 3904bf0268ad..3904bf0268ad 100644
--- a/print/mup/files/patch-ac
+++ b/print/mup/files/patch-mupdisp::dispttyp.h
diff --git a/print/mup/files/patch-aa b/print/mup/files/patch-mupdisp::mupdisp.c
index e95febbaefd8..0b51e3b452c1 100644
--- a/print/mup/files/patch-aa
+++ b/print/mup/files/patch-mupdisp::mupdisp.c
@@ -1,5 +1,5 @@
---- mupdisp/mupdisp.c.orig	Wed Nov 27 20:49:30 2002
-+++ mupdisp/mupdisp.c	Wed Nov 27 23:03:09 2002
+--- mupdisp/mupdisp.c.orig	Tue Jun 22 09:18:32 2004
++++ mupdisp/mupdisp.c	Wed Mar  2 16:19:53 2005
 @@ -45,6 +45,10 @@
   *	chmod 4755 mupdisp
   */
@@ -20,3 +20,12 @@
  			signal(n, generalcleanup);
  		}
  	}
+@@ -314,7 +318,7 @@
+ 	int fd;
+ 
+ 
+-#ifdef linux
++#if defined(linux) || defined(__FreeBSD__)
+ 	if ((fd = mkstemp(tmpfname)) < 0) {
+ 		fprintf(stderr, "can't create temp file\n");
+ 		generalcleanup(1);
diff --git a/print/mup/files/patch-ab b/print/mup/files/patch-mupdisp::mupdisp.h
index 9ff9bb04ec29..9ff9bb04ec29 100644
--- a/print/mup/files/patch-ab
+++ b/print/mup/files/patch-mupdisp::mupdisp.h
diff --git a/print/mup/pkg-plist b/print/mup/pkg-plist
index 79b9b551126e..9c737dcaf0e9 100644
--- a/print/mup/pkg-plist
+++ b/print/mup/pkg-plist
@@ -1,20 +1,22 @@
-bin/mup
 bin/mkmupfnt
+bin/mup
 bin/mupdisp
 bin/mupprnt
-%%PORTDOCS%%%%DOCSDIR%%/overview.txt
-%%PORTDOCS%%%%DOCSDIR%%/register.txt
 %%PORTDOCS%%%%DOCSDIR%%/README0
 %%PORTDOCS%%%%DOCSDIR%%/README1
-%%PORTDOCS%%%%DOCSDIR%%/mupfeat.txt
 %%PORTDOCS%%%%DOCSDIR%%/faq.txt
 %%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/mupfeat.txt
+%%PORTDOCS%%%%DOCSDIR%%/overview.txt
+%%PORTDOCS%%%%DOCSDIR%%/register.txt
+%%PORTDOCS%%%%DOCSDIR%%/uguide.ps
 %%PORTDOCS%%%%DOCSDIR%%/uguide/adjust.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/altinp.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/bars.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/basics.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/brackmac.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/cadenza.html
+%%PORTDOCS%%%%DOCSDIR%%/uguide/chant.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/chordinp.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/chrdattr.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/cmdargs.html
@@ -36,6 +38,7 @@ bin/mupprnt
 %%PORTDOCS%%%%DOCSDIR%%/uguide/macros.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/midi.html
+%%PORTDOCS%%%%DOCSDIR%%/uguide/midmeas.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/mixtsig.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/mugex10.gif
 %%PORTDOCS%%%%DOCSDIR%%/uguide/mugex11.gif
@@ -124,9 +127,16 @@ bin/mupprnt
 %%PORTDOCS%%%%DOCSDIR%%/uguide/mugex87.gif
 %%PORTDOCS%%%%DOCSDIR%%/uguide/mugex88.gif
 %%PORTDOCS%%%%DOCSDIR%%/uguide/mugex89.gif
+%%PORTDOCS%%%%DOCSDIR%%/uguide/mugex9.gif
 %%PORTDOCS%%%%DOCSDIR%%/uguide/mugex90.gif
 %%PORTDOCS%%%%DOCSDIR%%/uguide/mugex91.gif
-%%PORTDOCS%%%%DOCSDIR%%/uguide/mugex9.gif
+%%PORTDOCS%%%%DOCSDIR%%/uguide/mugex92.gif
+%%PORTDOCS%%%%DOCSDIR%%/uguide/mugex93.gif
+%%PORTDOCS%%%%DOCSDIR%%/uguide/mugex94.gif
+%%PORTDOCS%%%%DOCSDIR%%/uguide/mugex95.gif
+%%PORTDOCS%%%%DOCSDIR%%/uguide/mugex96.gif
+%%PORTDOCS%%%%DOCSDIR%%/uguide/mugex97.gif
+%%PORTDOCS%%%%DOCSDIR%%/uguide/mugex98.gif
 %%PORTDOCS%%%%DOCSDIR%%/uguide/multirst.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/multsong.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/muschar.gif
@@ -145,6 +155,7 @@ bin/mupprnt
 %%PORTDOCS%%%%DOCSDIR%%/uguide/pstools.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/register.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/roll.html
+%%PORTDOCS%%%%DOCSDIR%%/uguide/shaped.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/slashmrk.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/stuff.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/tabstaff.html
@@ -157,6 +168,5 @@ bin/mupprnt
 %%PORTDOCS%%%%DOCSDIR%%/uguide/uguide.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/utilpgms.html
 %%PORTDOCS%%%%DOCSDIR%%/uguide/verses.html
-%%PORTDOCS%%%%DOCSDIR%%/uguide.ps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/uguide
 %%PORTDOCS%%@dirrm %%DOCSDIR%%