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} +}
