[gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/

2022-07-29 Thread David Seifert
commit: 52f194b0b53bf237efe12579906b4c7b9b57770a
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jul 29 21:38:21 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jul 29 21:38:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f194b0

media-sound/mup: drop 6.6

Signed-off-by: David Seifert  gentoo.org>

 media-sound/mup/Manifest |  1 -
 media-sound/mup/files/mup-6.6-makefile.patch | 69 
 media-sound/mup/mup-6.6.ebuild   | 44 --
 3 files changed, 114 deletions(-)

diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 64c44c62e49c..509c4061cb32 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,2 +1 @@
-DIST mup66src.tar.gz 2514430 BLAKE2B 
d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb
 SHA512 
3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
 DIST mup69src.tar.gz 3062560 BLAKE2B 
cb7456fe52f85a122106675372a5ffabe9466086e730cbb15dbb590ea2485ecfc34e52d8b8c7c3a583d98e4e8e352be07a203e41da38cd145adf11cdf59bad92
 SHA512 
b3b49177e12b6a8dbd711e88a327826b60e4141a0720c1be4900af2124ac29592572d866d98f2a5b8318fb008fb035371ad83f152601bf22d98a3e7568ecfe95

diff --git a/media-sound/mup/files/mup-6.6-makefile.patch 
b/media-sound/mup/files/mup-6.6-makefile.patch
deleted file mode 100644
index 0350a6e80447..
--- a/media-sound/mup/files/mup-6.6-makefile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Fix header/library locations for fltk, respect LDFLAGS, and allow the ebuild to
-handle docs install.
-
 mup-6.6/makefile
-+++ mup-6.6/makefile
-@@ -80,12 +80,12 @@
- 
- # You can change this if your X libraries and headers are somewhere else
- # (like /usr/X11R6).
--X_LOCATION = /usr/X11
-+X_LOCATION = /usr
- 
- # If you installed fltk somewhere other than $(X_LOCATION)/lib
- # set this to find them, as in
- # FLTK_LIB_LOCATION = -L/usr/local/lib
--FLTK_LIB_LOCATION =
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk
- 
- # The X libraries to link with Mupmate.
- # Depending on how fltk was compiled, you may be able to omit
-@@ -99,7 +99,7 @@
- #FLTK_VERSION=FLTK_1_1
- 
- # The FLTK header files are under $(FLTK_INCLUDE)/FL
--FLTK_INCLUDE = $(X_LOCATION)/include
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk
- 
- # You can use fltk_jpeg or jpeg library, whichever you have
- # or depending on how fltk was compiled, you may not need it at all
-@@ -251,25 +251,25 @@
-   flex -t extras/lex.l > mup/lex.c
- 
- mup/mup: $(MUP_HDRS) $(MUP_SRC)
--  $(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
-+  $(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
- 
- mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
--  $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB 
$(MUPDISP_SRC) -lX11
-+  $(CCOMPILER) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ 
-DNO_VGA_LIB $(MUPDISP_SRC) -lX11
-   # For Linux console mode support, comment out the previous line
-   # and uncomment the following line
-   # $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga 
-lX11 -lm
- 
- mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
--  $(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
-+  $(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
- 
- mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
--  $(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
-+  $(CPPCOMPILER) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
-   $(FLTK_VERSION) -I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
-   $(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
-   $(JPEGLIB) $(PNGLIB) $(ZLIB) -lm
- 
- install:  all
--  mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide $(ICONDIR) $(LIBDIR)
-+  mkdir -p $(BINDIR) $(MANDIR) $(ICONDIR) $(LIBDIR)
-   cp mup/mup $(BINDIR)/mup
-   cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
-   cp mupdisp/mupdisp $(BINDIR)/mupdisp
-@@ -278,8 +278,6 @@
-   cp mupmate/mupmate $(BINDIR)/mupmate
-   cp mupprnt $(BINDIR)/mupprnt
-   cp docs/*.1 $(MANDIR)
--  cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
--  cp docs/uguide/* $(DOCDIR)/uguide
-   cp $(MUPMATE_OTHER_FILES) $(ICONDIR)
-   cp $(MUP_LIB_FILES) $(LIBDIR)
- 

diff --git a/media-sound/mup/mup-6.6.ebuild b/media-sound/mup/mup-6.6.ebuild
deleted file mode 100644
index 2647e954d2c2..
--- a/media-sound/mup/mup-6.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program for printing music scores"
-HOMEPAGE="http://www.arkkra.com/;
-SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz;
-
-LICENSE="Arkkra"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/

2022-07-14 Thread Sam James
commit: 721cd0ed815fe82083f1278692a9f5c3ce3ee8b4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 14 09:25:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 14 09:25:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721cd0ed

media-sound/mup: add 6.9

Signed-off-by: Sam James  gentoo.org>

 media-sound/mup/Manifest |   1 +
 media-sound/mup/files/mup-6.9-build-system.patch | 125 +++
 media-sound/mup/mup-6.9.ebuild   |  54 ++
 3 files changed, 180 insertions(+)

diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 056b323faec5..64c44c62e49c 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1 +1,2 @@
 DIST mup66src.tar.gz 2514430 BLAKE2B 
d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb
 SHA512 
3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
+DIST mup69src.tar.gz 3062560 BLAKE2B 
cb7456fe52f85a122106675372a5ffabe9466086e730cbb15dbb590ea2485ecfc34e52d8b8c7c3a583d98e4e8e352be07a203e41da38cd145adf11cdf59bad92
 SHA512 
b3b49177e12b6a8dbd711e88a327826b60e4141a0720c1be4900af2124ac29592572d866d98f2a5b8318fb008fb035371ad83f152601bf22d98a3e7568ecfe95

diff --git a/media-sound/mup/files/mup-6.9-build-system.patch 
b/media-sound/mup/files/mup-6.9-build-system.patch
new file mode 100644
index ..07a7dba237bf
--- /dev/null
+++ b/media-sound/mup/files/mup-6.9-build-system.patch
@@ -0,0 +1,125 @@
+--- a/Makefile.am
 b/Makefile.am
+@@ -1,4 +1,2 @@
+ SUBDIRS = lib tools src doc mup-input packaging
+-EXTRA_DIST = LICENSE simple.makefile
+-mup_doc_dir = $(datadir)/doc/packages/$(PACKAGE)
+-mup_doc__DATA = LICENSE
++EXTRA_DIST = simple.makefile
+--- a/configure.ac
 b/configure.ac
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.69])
+ AC_INIT([mup], [6.9], [supp...@arkkra.com])
+-AM_INIT_AUTOMAKE([-Wall -Werror])
++AM_INIT_AUTOMAKE([-Wall])
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+@@ -16,21 +16,21 @@ AC_PROG_SED
+ AC_PROG_MKDIR_P
+ 
+ AC_PATH_PROGS(GS, [gs gs386], [none])
+-test "$GS" == "none" && AC_MSG_ERROR([required ghostscript program 'gs' is 
missing])
++test "$GS" = "none" && AC_MSG_ERROR([required ghostscript program 'gs' is 
missing])
+ AC_PATH_PROG(GROFF, [groff], [none])
+-test "$GROFF" == "none" && AC_MSG_ERROR([required program 'groff' is missing])
++test "$GROFF" = "none" && AC_MSG_ERROR([required program 'groff' is missing])
+ AC_PATH_PROG(BISON, [bison], [none])
+-test "$BISON" == "none" && AC_MSG_ERROR([required program 'bison' is missing])
++test "$BISON" = "none" && AC_MSG_ERROR([required program 'bison' is missing])
+ AC_PATH_PROG(PPMTOGIF, [ppmtogif], [none])
+-test "$PPMTOGIF" == "none" && AC_MSG_ERROR([required program 'ppmtogif' is 
missing])
++test "$PPMTOGIF" = "none" && AC_MSG_ERROR([required program 'ppmtogif' is 
missing])
+ AC_PATH_PROG(EXPR, [expr], [none])
+-test "$EXPR" == "none" && AC_MSG_ERROR([required program 'expr' is missing])
++test "$EXPR" = "none" && AC_MSG_ERROR([required program 'expr' is missing])
+ AC_PATH_PROG(SORT, [sort], [none])
+-test "$SORT" == "none" && AC_MSG_ERROR([required program 'sort' is missing])
++test "$SORT" = "none" && AC_MSG_ERROR([required program 'sort' is missing])
+ AC_PATH_PROG(CAT, [cat], [none])
+-test "$CAT" == "none" && AC_MSG_ERROR([required program 'cat' is missing])
++test "$CAT" = "none" && AC_MSG_ERROR([required program 'cat' is missing])
+ AC_PATH_PROG(EGREP, [egrep], [none])
+-test "$EGREP" == "none" && AC_MSG_ERROR([required program 'egrep' is missing])
++test "$EGREP" = "none" && AC_MSG_ERROR([required program 'egrep' is missing])
+ 
+ # Need to know if on Windows to install mupprnt.bat rather than shell script
+ AC_CANONICAL_HOST
+@@ -70,7 +70,7 @@ AS_IF([test "x$enable_mupmate" != xno],
+   # Find fltk-config program
+   PATH="$fltk_prefix/bin:$PATH"
+   AC_PATH_PROG(FLTK_CONFIG, fltk-config, none, $PATH)
+-  test "$FLTK_CONFIG" == "none" && AC_MSG_ERROR([required program 
'fltk-config' is missing])
++  test "$FLTK_CONFIG" = "none" && AC_MSG_ERROR([required program 
'fltk-config' is missing])
+   # Make sure it is the 1.x API, not 2.x
+   fltk_api_version="`$FLTK_CONFIG --api-version`"
+   fltk_api_major=`echo $fltk_api_version | sed -e 's/\..*//'`
+@@ -79,13 +79,13 @@ AS_IF([test "x$enable_mupmate" != xno],
+   AC_SUBST([FLTK_CXXFLAGS], [`$FLTK_CONFIG --cxxflags`])
+   # Red Hat/CentOS 7 version of fltk-config doesn't include -lfltk when 
using --use_image --ldflags, so fix that
+   fltk_ldflags="`$FLTK_CONFIG --use-images --ldflags`"
+-  if test "$fltk_ldflags" == "-lfltk_images"
++  if test "$fltk_ldflags" = "-lfltk_images"
+   then
+   AC_SUBST([FLTK_LDFLAGS], ["-lfltk -lfltk_images"])
+   else
+   AC_SUBST([FLTK_LDFLAGS], 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/

2018-04-08 Thread Tim Harder
commit: 8f0d4fa5ddf0c8eac1a66b873f3731e4ecdc2079
Author: Tim Harder  gentoo  org>
AuthorDate: Mon Apr  9 02:13:35 2018 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Apr  9 02:17:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0d4fa5

media-sound/mup: version bump to 6.6

 media-sound/mup/Manifest |  1 +
 media-sound/mup/files/mup-6.6-makefile.patch | 69 
 media-sound/mup/mup-6.6.ebuild   | 44 ++
 3 files changed, 114 insertions(+)

diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index cb7b49a084d..21dd1ede9fd 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1 +1,2 @@
 DIST mup57src.tar.gz 2178380 BLAKE2B 
03f4da751e841d77f1a481da98c801501b481b0cda1ac2a19c7b45ff362cc6f14b882d4a5954f4fc0a4b05a5b249ee79ff0ba23378c0b3bff3e29ea445f21673
 SHA512 
19085f15ce2654f23349e304599f920ca601735b2430e7b4b54927a861c598cd9227a273ba1582d491c1e3dbaaf7f12001e4fade57191e10c0f7815ac629
+DIST mup66src.tar.gz 2514430 BLAKE2B 
d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb
 SHA512 
3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35

diff --git a/media-sound/mup/files/mup-6.6-makefile.patch 
b/media-sound/mup/files/mup-6.6-makefile.patch
new file mode 100644
index 000..0350a6e8044
--- /dev/null
+++ b/media-sound/mup/files/mup-6.6-makefile.patch
@@ -0,0 +1,69 @@
+Fix header/library locations for fltk, respect LDFLAGS, and allow the ebuild to
+handle docs install.
+
+--- mup-6.6/makefile
 mup-6.6/makefile
+@@ -80,12 +80,12 @@
+ 
+ # You can change this if your X libraries and headers are somewhere else
+ # (like /usr/X11R6).
+-X_LOCATION = /usr/X11
++X_LOCATION = /usr
+ 
+ # If you installed fltk somewhere other than $(X_LOCATION)/lib
+ # set this to find them, as in
+ # FLTK_LIB_LOCATION = -L/usr/local/lib
+-FLTK_LIB_LOCATION =
++FLTK_LIB_LOCATION = -L/usr/lib/fltk
+ 
+ # The X libraries to link with Mupmate.
+ # Depending on how fltk was compiled, you may be able to omit
+@@ -99,7 +99,7 @@
+ #FLTK_VERSION=FLTK_1_1
+ 
+ # The FLTK header files are under $(FLTK_INCLUDE)/FL
+-FLTK_INCLUDE = $(X_LOCATION)/include
++FLTK_INCLUDE = $(X_LOCATION)/include/fltk
+ 
+ # You can use fltk_jpeg or jpeg library, whichever you have
+ # or depending on how fltk was compiled, you may not need it at all
+@@ -251,25 +251,25 @@
+   flex -t extras/lex.l > mup/lex.c
+ 
+ mup/mup: $(MUP_HDRS) $(MUP_SRC)
+-  $(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
++  $(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
+ 
+ mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
+-  $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB 
$(MUPDISP_SRC) -lX11
++  $(CCOMPILER) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ 
-DNO_VGA_LIB $(MUPDISP_SRC) -lX11
+   # For Linux console mode support, comment out the previous line
+   # and uncomment the following line
+   # $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga 
-lX11 -lm
+ 
+ mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
+-  $(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
++  $(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
+ 
+ mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
+-  $(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
++  $(CPPCOMPILER) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
+   $(FLTK_VERSION) -I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
+   $(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
+   $(JPEGLIB) $(PNGLIB) $(ZLIB) -lm
+ 
+ install:  all
+-  mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide $(ICONDIR) $(LIBDIR)
++  mkdir -p $(BINDIR) $(MANDIR) $(ICONDIR) $(LIBDIR)
+   cp mup/mup $(BINDIR)/mup
+   cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
+   cp mupdisp/mupdisp $(BINDIR)/mupdisp
+@@ -278,8 +278,6 @@
+   cp mupmate/mupmate $(BINDIR)/mupmate
+   cp mupprnt $(BINDIR)/mupprnt
+   cp docs/*.1 $(MANDIR)
+-  cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
+-  cp docs/uguide/* $(DOCDIR)/uguide
+   cp $(MUPMATE_OTHER_FILES) $(ICONDIR)
+   cp $(MUP_LIB_FILES) $(LIBDIR)
+ 

diff --git a/media-sound/mup/mup-6.6.ebuild b/media-sound/mup/mup-6.6.ebuild
new file mode 100644
index 000..19665203aa8
--- /dev/null
+++ b/media-sound/mup/mup-6.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Program for printing music scores"
+HOMEPAGE="http://www.arkkra.com/;
+SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz;
+
+LICENSE="Arkkra"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+   x11-libs/libXext
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/

2018-04-08 Thread Tim Harder
commit: ff287d8f455379966bf70ae40999d6840c94fc13
Author: Tim Harder  gentoo  org>
AuthorDate: Mon Apr  9 02:14:52 2018 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Apr  9 02:17:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff287d8f

media-sound/mup: remove old

 media-sound/mup/Manifest   |   1 -
 media-sound/mup/files/mup-5.6-fltk-fixes.patch |  23 --
 media-sound/mup/files/mup-5.7-Makefile.patch   | 405 -
 media-sound/mup/mup-5.7.ebuild |  42 ---
 4 files changed, 471 deletions(-)

diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 21dd1ede9fd..056b323faec 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,2 +1 @@
-DIST mup57src.tar.gz 2178380 BLAKE2B 
03f4da751e841d77f1a481da98c801501b481b0cda1ac2a19c7b45ff362cc6f14b882d4a5954f4fc0a4b05a5b249ee79ff0ba23378c0b3bff3e29ea445f21673
 SHA512 
19085f15ce2654f23349e304599f920ca601735b2430e7b4b54927a861c598cd9227a273ba1582d491c1e3dbaaf7f12001e4fade57191e10c0f7815ac629
 DIST mup66src.tar.gz 2514430 BLAKE2B 
d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb
 SHA512 
3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35

diff --git a/media-sound/mup/files/mup-5.6-fltk-fixes.patch 
b/media-sound/mup/files/mup-5.6-fltk-fixes.patch
deleted file mode 100644
index e4429c3679b..000
--- a/media-sound/mup/files/mup-5.6-fltk-fixes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
 mup-5.6.orig/mupmate/Config.C
-+++ mup-5.6/mupmate/Config.C
-@@ -264,7 +264,7 @@
- //-
- 
- // List of standard FLTK fonts, and info to map name to menu entry.
--static struct Font {
-+static struct FlFont {
-   const char * name;
-   Fl_Font value;
-   int menu_offset;
 mup-5.6.orig/mupmate/Edit.C
-+++ mup-5.6/mupmate/Edit.C
-@@ -201,8 +201,7 @@
-   // a previous Replace/Find Next
-   int start, end, isRect, rectStart, rectEnd;
-   bool at_pattern = false;
--  if (editor_p->buffer()->highlight_position(, , ,
--  , )) {
-+  if (editor_p->buffer()->highlight_position(, )) {
-   int place = editor_p->insert_position();
-   if (place == end && (end - start == pattern_p->size())) {
-   if (casematch_p->value()) {

diff --git a/media-sound/mup/files/mup-5.7-Makefile.patch 
b/media-sound/mup/files/mup-5.7-Makefile.patch
deleted file mode 100644
index a36a0042ca2..000
--- a/media-sound/mup/files/mup-5.7-Makefile.patch
+++ /dev/null
@@ -1,405 +0,0 @@
 mup-5.7.orig/makefile
-+++ mup-5.7/makefile
-@@ -1,252 +0,0 @@
--
--# Makefile for Mup (and auxiliary programs mupdisp, mkmupfnt, and mupmate).
--# This is not an optimal makefile; instead it tries to be very simple,
--# and easy to understand, so it can be easily modified, if needed.
--
--# On most Linux/Unix type systems, just doing
--# make install
--# as root will probably work.
--# (You really only need to be root to copy the products into
--# the system directories. If you change PREFIX
--# to point to some other writeable area, you wouldn't need to be root.)
--# For Apple Mac OX X, see the notes for what to change (CFLAGS and X_LIBS)
--# If you only want the Mup program itself, you can do
--# make mup/mup
--# The other programs are optional:
--# - mupdisp runs Mup and then runs GhostScript on the result.
--#   You can run Mup directly, and use gv, GSview, ghostview or any other
--#   PostScript viewer on the Mup output, as an alternative to mupdisp.
--# - mkmupfnt is only needed if you want to use fonts beyond the basic
--#   standard PostScript fonts.
--# - mupmate is a graphical user interface front end for Mup.
--#   It is not needed if you intend to only use Mup via command line interface.
--
--# The mupdisp and mupmate programs require X libraries and headers 
(www.x.org).
--# The mupmate program requires FLTK libraries and headers (www.fltk.org).
--
--# If you want mupdisp to support Linux console mode, make sure you have
--# the svgalib package installed, then find the two commented-out lines below
--# related to Linux console support, and uncomment them.
--
--# If you are building on a system that does not support make,
--# you can look at what this makefile does for how to build.
--# Mup itself is generally easy to build.
--# You just go to the mup directory and run your C compiler on
--# all the .c files in directory, and link with the math library,
--# Typically this is done using a command something like:
--# cc *.c -lm
--# For more information on building Mup, see:
--# http://www.arkkra.com/doc/dosbld.html
--# http://www.arkkra.com/doc/otherbld.html
--# http://www.arkkra.com/doc/unixbld.html
--
--# Lines you