- Update to 5.0

PR:		78273
Submitted by:	Daniel O'Connor <doconnor@cain.gsoft.com.au> (maintainer)

4 files changed, 62 insertions, 52 deletions

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