Version bump for bug 121794, thanks to Wilbert Berendsen for reporting.

(Portage version: 2.1.3)

4 files changed, 424 insertions, 1 deletions

diff --git a/media-sound/mup/ChangeLog b/media-sound/mup/ChangeLog
index 15924c94606d..85b82db35d18 100644
--- a/media-sound/mup/ChangeLog
+++ b/media-sound/mup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mup
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.25 2007/07/22 08:26:52 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.26 2007/07/29 16:48:47 drac Exp $
+
+*mup-5.4 (29 Jul 2007)
+
+  29 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/mup-5.4-Makefile.patch, +mup-5.4.ebuild:
+  Version bump for bug 121794, thanks to Wilbert Berendsen for reporting.
 
   22 Jul 2007; Samuli Suominen <drac@gentoo.org> mup-5.1.ebuild:
   Remove virtual/x11 references and fix quoting.
diff --git a/media-sound/mup/files/digest-mup-5.4 b/media-sound/mup/files/digest-mup-5.4
new file mode 100644
index 000000000000..ce158612eed9
--- /dev/null
+++ b/media-sound/mup/files/digest-mup-5.4
@@ -0,0 +1,3 @@
+MD5 6238b4390f6824d86be0b2786b59d664 mup54src.tar.gz 1705171
+RMD160 27687208fe59bf41c208cc8a54ff9ed149a4a748 mup54src.tar.gz 1705171
+SHA256 a29b6b4a1294b8b52e3f265d980c6a16e5a90cc233e8b4254131159e78216ec0 mup54src.tar.gz 1705171
diff --git a/media-sound/mup/files/mup-5.4-Makefile.patch b/media-sound/mup/files/mup-5.4-Makefile.patch
new file mode 100644
index 000000000000..99dc34f6ee61
--- /dev/null
+++ b/media-sound/mup/files/mup-5.4-Makefile.patch
@@ -0,0 +1,374 @@
+diff -urN mup-5.4.orig/makefile mup-5.4/makefile
+--- mup-5.4.orig/makefile	2007-07-03 07:32:12.000000000 +0300
++++ mup-5.4/makefile	1970-01-01 02:00:00.000000000 +0200
+@@ -1,222 +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.)
+-# 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.
+-
+-
+-# Lines you might conceivably want to change have comments by them,
+-# explaining how you might want to change them.
+-# Any line without any comment by it is very unlikely to ever need changing.
+-
+-#-----------------------------------------------------------------------
+-
+-# These define where to put the Mup products.
+-# You could change this to /usr/local or your own space if you like.
+-PREFIX = /usr
+-BINDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/man/man1
+-DOCDIR = $(PREFIX)/share/doc/packages/mup
+-
+-# This is the name of your C compiler.
+-# cc would be another common choice.
+-CCOMPILER = gcc
+-
+-# This is the name of your C++ compiler.
+-# CC would be another common choice.
+-CPPCOMPILER = g++
+-
+-# -O option turns on optimization for most C compilers.
+-# You can add other options, if you like, as appropriate for your C compiler.
+-# Another common addition would be -g to get debugging information.
+-CFLAGS = -O
+-
+-# You can change this if your X libraries and headers are somewhere else
+-# (like /usr/X11R6).
+-X_LOCATION = /usr/X11
+-
+-# The FLTK header files are under $(FLTK_INCLUDE)/FL
+-FLTK_INCLUDE = $(X_LOCATION)/include
+-
+-# You can use fltk_jpeg or jpeg library, whichever you have
+-JPEGLIB = fltk_jpeg
+-
+-# You can use fltk_png or png library, whichever you have
+-PNGLIB = fltk_png
+-
+-# You can use fltk_z or z library, whichever you have
+-ZLIB = fltk_z
+-
+-#-----------------------------------------------------------------------
+-
+-MUP_SRC =  \
+-	mup/abshorz.c \
+-	mup/absvert.c \
+-	mup/assign.c \
+-	mup/beaming.c \
+-	mup/beamstem.c \
+-	mup/brac.c \
+-	mup/charinfo.c \
+-	mup/check.c \
+-	mup/debug.c \
+-	mup/errors.c \
+-	mup/extchtbl.c \
+-	mup/font.c \
+-	mup/fontdata.c \
+-	mup/globals.c \
+-	mup/grpsyl.c \
+-	mup/ifgram.c \
+-	mup/lex.c \
+-	mup/locvar.c \
+-	mup/lyrics.c \
+-	mup/macros.c \
+-	mup/main.c \
+-	mup/mainlist.c \
+-	mup/map.c \
+-	mup/midi.c \
+-	mup/midiutil.c \
+-	mup/mkchords.c \
+-	mup/muschtbl.c \
+-	mup/nxtstrch.c \
+-	mup/parstssv.c \
+-	mup/parstuff.c \
+-	mup/phrase.c \
+-	mup/plutils.c \
+-	mup/print.c \
+-	mup/prntdata.c \
+-	mup/prntmisc.c \
+-	mup/prnttab.c \
+-	mup/prolog.c \
+-	mup/range.c \
+-	mup/rational.c \
+-	mup/relvert.c \
+-	mup/restsyl.c \
+-	mup/roll.c \
+-	mup/setgrps.c \
+-	mup/setnotes.c \
+-	mup/ssv.c \
+-	mup/stuff.c \
+-	mup/symtbl.c \
+-	mup/tie.c \
+-	mup/trantab.c \
+-	mup/trnspose.c \
+-	mup/undrscre.c \
+-	mup/utils.c \
+-	mup/ytab.c
+-
+-MUP_HDRS = \
+-	mup/defines.h \
+-	mup/extchar.h \
+-	mup/globals.h \
+-	mup/muschar.h \
+-	mup/rational.h \
+-	mup/ssvused.h \
+-	mup/structs.h \
+-	mup/ytab.h
+-
+-MUPDISP_SRC = \
+-	mupdisp/at386.c \
+-	mupdisp/do_cmd.c \
+-	mupdisp/dos.c \
+-	mupdisp/genfile.c \
+-	mupdisp/init.c \
+-	mupdisp/linvga.c \
+-	mupdisp/mupdisp.c \
+-	mupdisp/xterm.c
+-
+-MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h
+-
+-MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm
+-
+-MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c
+-
+-MUPMATE_SRC = \
+-	mupmate/Config.C \
+-	mupmate/Edit.C \
+-	mupmate/File.C \
+-	mupmate/Help.C \
+-	mupmate/Main.C \
+-	mupmate/Preferences.C \
+-	mupmate/Run.C \
+-	mupmate/utils.C \
+-	mupmate/license.C \
+-	mupmate/regform.C \
+-	mupmate/template.C
+-
+-MUPMATE_HDRS = \
+-	mupmate/Config.H \
+-	mupmate/Edit.H \
+-	mupmate/File.H \
+-	mupmate/Help.H \
+-	mupmate/Main.H \
+-	mupmate/Preferences.H \
+-	mupmate/Run.H \
+-	mupmate/utils.H \
+-	mupmate/globals.H \
+-	mupmate/resource.h
+-
+-MUPMATE_OTHER_FILES = \
+-	mupmate/mup32.xpm
+-#---------------------------------------------------------------
+-
+-all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
+-
+-mup/mup: $(MUP_HDRS) $(MUP_SRC)
+-	$(CCOMPILER) $(CFLAGS) -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
+-	# 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)
+-
+-mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
+-	$(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
+-	-I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
+-	-lfltk -lfltk_images -lXext -lX11 -lXpm \
+-	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
+-
+-install:	all
+-	mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide
+-	cp mup/mup $(BINDIR)/mup
+-	cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
+-	cp mupdisp/mupdisp $(BINDIR)/mupdisp
+-	# For Linux console mode support, uncomment the following line
+-	# chown root $(BINDIR)/mupdisp ; chmod 4755 $(BINDIR)/mupdisp
+-	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
+-
+-clean:
+-	rm -f mup/*.o mupdisp/*.o mkmupfnt/*.o mupmate/*.o
+-
+-clobber:	clean
+-	rm -f mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
+diff -urN mup-5.4.orig/Makefile mup-5.4/Makefile
+--- mup-5.4.orig/Makefile	1970-01-01 02:00:00.000000000 +0200
++++ mup-5.4/Makefile	2007-07-29 19:42:40.000000000 +0300
+@@ -0,0 +1,144 @@
++PREFIX = /usr
++BINDIR = $(PREFIX)/bin
++MANDIR = $(PREFIX)/share/man/man1
++CC = gcc
++CXX = g++
++CFLAGS = -O2 -pipe
++CXXFLAGS = -O2 -pipe
++X_LOCATION = /usr
++JPEGLIB = jpeg
++PNGLIB = png
++ZLIB = z
++
++MUP_SRC =  \
++	mup/abshorz.c \
++	mup/absvert.c \
++	mup/assign.c \
++	mup/beaming.c \
++	mup/beamstem.c \
++	mup/brac.c \
++	mup/charinfo.c \
++	mup/check.c \
++	mup/debug.c \
++	mup/errors.c \
++	mup/extchtbl.c \
++	mup/font.c \
++	mup/fontdata.c \
++	mup/globals.c \
++	mup/grpsyl.c \
++	mup/ifgram.c \
++	mup/lex.c \
++	mup/locvar.c \
++	mup/lyrics.c \
++	mup/macros.c \
++	mup/main.c \
++	mup/mainlist.c \
++	mup/map.c \
++	mup/midi.c \
++	mup/midiutil.c \
++	mup/mkchords.c \
++	mup/muschtbl.c \
++	mup/nxtstrch.c \
++	mup/parstssv.c \
++	mup/parstuff.c \
++	mup/phrase.c \
++	mup/plutils.c \
++	mup/print.c \
++	mup/prntdata.c \
++	mup/prntmisc.c \
++	mup/prnttab.c \
++	mup/prolog.c \
++	mup/range.c \
++	mup/rational.c \
++	mup/relvert.c \
++	mup/restsyl.c \
++	mup/roll.c \
++	mup/setgrps.c \
++	mup/setnotes.c \
++	mup/ssv.c \
++	mup/stuff.c \
++	mup/symtbl.c \
++	mup/tie.c \
++	mup/trantab.c \
++	mup/trnspose.c \
++	mup/undrscre.c \
++	mup/utils.c \
++	mup/ytab.c
++
++MUP_HDRS = \
++	mup/defines.h \
++	mup/extchar.h \
++	mup/globals.h \
++	mup/muschar.h \
++	mup/rational.h \
++	mup/ssvused.h \
++	mup/structs.h \
++	mup/ytab.h
++
++MUPDISP_SRC = \
++	mupdisp/at386.c \
++	mupdisp/do_cmd.c \
++	mupdisp/dos.c \
++	mupdisp/genfile.c \
++	mupdisp/init.c \
++	mupdisp/linvga.c \
++	mupdisp/mupdisp.c \
++	mupdisp/xterm.c
++
++MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h
++MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm
++MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c
++
++MUPMATE_SRC = \
++	mupmate/Config.C \
++	mupmate/Edit.C \
++	mupmate/File.C \
++	mupmate/Help.C \
++	mupmate/Main.C \
++	mupmate/Preferences.C \
++	mupmate/Run.C \
++	mupmate/utils.C \
++	mupmate/license.C \
++	mupmate/regform.C \
++	mupmate/template.C
++
++MUPMATE_HDRS = \
++	mupmate/Config.H \
++	mupmate/Edit.H \
++	mupmate/File.H \
++	mupmate/Help.H \
++	mupmate/Main.H \
++	mupmate/Preferences.H \
++	mupmate/Run.H \
++	mupmate/utils.H \
++	mupmate/globals.H \
++	mupmate/resource.h
++
++MUPMATE_OTHER_FILES = \
++	mupmate/mup32.xpm
++
++all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
++
++mup/mup: $(MUP_HDRS) $(MUP_SRC)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
++
++mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
++	$(CC) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
++
++mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
++
++mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
++	-I/usr/include/fltk-1.1 -Imup -L$(X_LOCATION)/lib \
++	-L/usr/lib/fltk-1.1 -lfltk -lfltk_images -lXext -lX11 -lXpm \
++	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
++
++install: all
++	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)
++	cp mup/mup $(DESTDIR)$(BINDIR)/mup
++	cp mkmupfnt/mkmupfnt $(DESTDIR)$(BINDIR)/mkmupfnt
++	cp mupdisp/mupdisp $(DESTDIR)$(BINDIR)/mupdisp
++	cp mupmate/mupmate $(DESTDIR)$(BINDIR)/mupmate
++	cp mupprnt $(DESTDIR)$(BINDIR)/mupprnt
++	cp docs/*.1 $(DESTDIR)$(MANDIR)
diff --git a/media-sound/mup/mup-5.4.ebuild b/media-sound/mup/mup-5.4.ebuild
new file mode 100644
index 000000000000..04d7492aed82
--- /dev/null
+++ b/media-sound/mup/mup-5.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.4.ebuild,v 1.1 2007/07/29 16:48:47 drac Exp $
+
+inherit eutils 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
+	x11-libs/fltk
+	media-libs/jpeg
+	media-libs/libpng"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
+		CFLAGS="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc docs/{*.txt,README0}
+	dohtml docs/{*.html,uguide/*}
+	docinto sample
+	dodoc docs/{*.mup,*.ps}
+}