* [gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/
@ 2018-04-09 2:18 Tim Harder
0 siblings, 0 replies; 4+ messages in thread
From: Tim Harder @ 2018-04-09 2:18 UTC (permalink / raw
To: gentoo-commits
commit: ff287d8f455379966bf70ae40999d6840c94fc13
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 9 02:14:52 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 02:17:44 2018 +0000
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 19085f15ce2654f23349e304599f920ca601735b2430e7b4b54927a861c598cd9227a273b4444a1582d491c1e3dbaaf7f12001e4fade57191e10c0f7815ac629
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..00000000000
--- 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(&start, &end, &isRect,
-- &rectStart, &rectEnd)) {
-+ if (editor_p->buffer()->highlight_position(&start, &end)) {
- 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..00000000000
--- 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 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.
--# For Mac OS X, you should probably add
--# -Dunix
--# and if you want universal binaries, add
--# -arch i386 -arch ppc
--# and if you want backward compatibility to older versions, add something like
--# -mmacosx-version-min=10.1
--# Or in other words:
--# CFLAGS = -O -Dunix -arch i386 -arch ppc -mmacosx-version-min=10.1
--CFLAGS = -O
--
--# You can change this if your X libraries and headers are somewhere else
--# (like /usr/X11R6).
--X_LOCATION = /usr/X11
--
--# 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 =
--
--# The X libraries to link with Mupmate.
--X_LIBS = -lXext -lX11 -lXpm
--# On Mac OS X replace that with
--# X_LIBS = -framework Carbon
--
--# 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/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/musfont.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 = \
-- mup/defines.h \
-- 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 \
-- $(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
-- -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
---- mup-5.7.orig/Makefile
-+++ mup-5.7/Makefile
-@@ -0,0 +1,147 @@
-+PREFIX = /usr
-+BINDIR = $(PREFIX)/bin
-+MANDIR = $(PREFIX)/share/man/man1
-+CC = gcc
-+CXX = g++
-+CFLAGS = -O2 -pipe
-+CXXFLAGS = -O2 -pipe
-+X_LOCATION = /usr
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1
-+X_LIBS = -lXext -lX11 -lXpm
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1
-+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/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/musfont.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 = \
-+ mup/defines.h \
-+ 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$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
-+ $(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
-+ -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.7.ebuild b/media-sound/mup/mup-5.7.ebuild
deleted file mode 100644
index 0624047a5fe..00000000000
--- a/media-sound/mup/mup-5.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib 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:1
- x11-libs/libXpm
- virtual/jpeg
- media-libs/libpng"
-DEPEND="${RDEPEND}
- x11-proto/xproto"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-Makefile.patch
- epatch "${FILESDIR}"/${PN}-5.6-fltk-fixes.patch
- sed -i -e "s:/lib:/$(get_libdir):g" Makefile || die "sed failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
- CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc docs/{*.txt,README0}
- dohtml docs/{*.html,uguide/*}
- docinto sample
- dodoc docs/{*.mup,*.ps}
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/
@ 2018-04-09 2:18 Tim Harder
0 siblings, 0 replies; 4+ messages in thread
From: Tim Harder @ 2018-04-09 2:18 UTC (permalink / raw
To: gentoo-commits
commit: 8f0d4fa5ddf0c8eac1a66b873f3731e4ecdc2079
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 9 02:13:35 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 02:17:43 2018 +0000
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 19085f15ce2654f23349e304599f920ca601735b2430e7b4b54927a861c598cd9227a273b4444a1582d491c1e3dbaaf7f12001e4fade57191e10c0f7815ac629
+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 00000000000..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 00000000000..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
+ >=x11-libs/fltk-1.3:1
+ x11-libs/libXpm
+ virtual/jpeg:0
+ media-libs/libpng:0="
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_prepare() {
+ default
+ sed -i -e "s:/lib:/$(get_libdir):g" makefile || die
+}
+
+src_compile() {
+ emake CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc docs/{*.txt,README0}
+ docinto html
+ dodoc docs/{*.html,uguide/*}
+ docinto sample
+ dodoc docs/{*.mup,*.ps}
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/
@ 2022-07-14 9:26 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-07-14 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 721cd0ed815fe82083f1278692a9f5c3ce3ee8b4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 09:25:12 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 09:25:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721cd0ed
media-sound/mup: add 6.9
Signed-off-by: Sam James <sam <AT> 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 000000000000..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], [support@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], [`$FLTK_CONFIG --use-images --ldflags`])
+ fi
+- test "$build_mac" == "yes" && AC_SUBST([EXTRA_CFLAGS], [-Dunix])
++ test "$build_mac" = "yes" && AC_SUBST([EXTRA_CFLAGS], [-Dunix])
+ # Check that libraries that Mupmate needs exist
+ AC_CHECK_LIB([fltk], [fl_alphasort], [ ])
+ AC_CHECK_LIB([fltk_images], [main], [ ])
+@@ -100,13 +100,13 @@ AS_IF([test "x$enable_mupmate" != xno],
+ AC_CHECK_LIB([z], [gzgets], [ ])
+
+ # Programs for Windows icons for Mupmate
+- test "$build_windows" == "yes" && test "$PAMTOWINICON" == "none" && test "$PPMWINICON" == "none" && AC_MSG_ERROR([Need either pamtowinicon or ppmtowinicon])
++ test "$build_windows" = "yes" && test "$PAMTOWINICON" = "none" && test "$PPMWINICON" = "none" && AC_MSG_ERROR([Need either pamtowinicon or ppmtowinicon])
+ AC_PATH_PROG(XPMTOPPM, xpmtoppm, none, $PATH)
+- test "$build_windows" == "yes" && test "$XPMTOPPM" == "none" && AC_MSG_ERROR([Need xpmtoppm])
++ test "$build_windows" = "yes" && test "$XPMTOPPM" = "none" && AC_MSG_ERROR([Need xpmtoppm])
+ AC_PATH_PROG(PPMTOPGM, ppmtopgm, none, $PATH)
+- test "$build_windows" == "yes" && test "$PPMTOPGM" == "none" && test "$PAMTOWINICON" == "none" && AC_MSG_ERROR([Need ppmtopgm])
++ test "$build_windows" = "yes" && test "$PPMTOPGM" = "none" && test "$PAMTOWINICON" = "none" && AC_MSG_ERROR([Need ppmtopgm])
+ AC_PATH_PROG(WINDRES, i386-mingw32msvc-windres, none, $PATH)
+- test "$build_windows" == "yes" && test "$WINDRES" == "none" && AC_MSG_ERROR([Need i386-mingw32msvc-windres])
++ test "$build_windows" = "yes" && test "$WINDRES" = "none" && AC_MSG_ERROR([Need i386-mingw32msvc-windres])
+ ]
+ )
+
+@@ -122,7 +122,7 @@ AC_FUNC_MALLOC
+ AC_FUNC_MMAP
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([access alarm atan cos getcwd isascii isspace memcmp memmove memset munmap pow putenv select setenv sin sqrt strcasecmp strchr strcmp strcpy strcspn strdup strerror strncasecmp strncpy strpbrk strrchr strspn strstr strtol tan unlink])
+-test "$build_linux" == "yes" && AC_CHECK_FUNCS([kill sleep waitpid])
++test "$build_linux" = "yes" && AC_CHECK_FUNCS([kill sleep waitpid])
+
+ AS_IF([test "x$enable_mupdisp" != xno],
+ [
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -208,10 +208,9 @@ uguide_files = \
+
+ ps_files = quickref.ps uguide.ps
+ EXTRA_DIST = uguide.t quickref.t charlist $(uguide_files) $(ps_files)
+-mup_doc_dir = $(datadir)/doc/packages/$(PACKAGE)
+-mup_doc__DATA = $(ps_files)
+-mup_uguide_dir = $(mup_doc_dir)/uguide
+-mup_uguide__DATA = $(uguide_files)
++dist_doc_DATA = $(ps_files)
++mup_uguidedir = $(docdir)/uguide
++mup_uguide_DATA = $(uguide_files)
+
+ muschar.ps: ../src/include/muschar.h ../tools/doc/mkmuscharps.sh
+ ../tools/doc/mkmuscharps.sh < ../src/include/muschar.h
+--- a/doc/htmldocs/Makefile.am
++++ b/doc/htmldocs/Makefile.am
+@@ -1,4 +1,4 @@
+ mup_html_docs = blind.html faq.html Macinst.html mupfeat.html overview.html usercomm.html whatsnew.html winrun.html
+-mup_htmldoc_dir = $(datadir)/doc/packages/$(PACKAGE)
++mup_htmldoc_dir = $(htmldir)
+ mup_htmldoc__DATA = $(mup_html_docs)
+ EXTRA_DIST = $(mup_html_docs)
diff --git a/media-sound/mup/mup-6.9.ebuild b/media-sound/mup/mup-6.9.ebuild
new file mode 100644
index 000000000000..9284b6f85709
--- /dev/null
+++ b/media-sound/mup/mup-6.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Program for printing music scores"
+HOMEPAGE="http://www.arkkra.com/"
+SRC_URI="http://www.arkkra.com/ftp/pub/unix/mup${PV//.}src.tar.gz
+ ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
+
+LICENSE="Arkkra"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/fltk-1.3:1
+ x11-libs/libXpm
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ app-text/ghostscript-gpl
+ media-libs/netpbm
+ sys-apps/groff
+ sys-devel/bison
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.9-build-system.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_compile() {
+ emake -j1 CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+
+ dodoc README
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/
@ 2022-07-29 21:39 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-07-29 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 52f194b0b53bf237efe12579906b4c7b9b57770a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 21:38:21 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 21:38:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f194b0
media-sound/mup: drop 6.6
Signed-off-by: David Seifert <soap <AT> 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..000000000000
--- 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..000000000000
--- 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=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/fltk-1.3:1
- x11-libs/libXpm
- virtual/jpeg:0
- media-libs/libpng:0="
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
- default
- sed -i -e "s:/lib:/$(get_libdir):g" makefile || die
-}
-
-src_compile() {
- emake CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc docs/{*.txt,README0}
- docinto html
- dodoc docs/{*.html,uguide/*}
- docinto sample
- dodoc docs/{*.mup,*.ps}
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-29 21:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-09 2:18 [gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2018-04-09 2:18 Tim Harder
2022-07-14 9:26 Sam James
2022-07-29 21:39 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox