[115770] trunk/dports/textproc/lilypond-devel
snc at macports.org
snc at macports.org
Fri Jan 10 14:44:15 PST 2014
Revision: 115770
https://trac.macports.org/changeset/115770
Author: snc at macports.org
Date: 2014-01-10 14:44:15 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
lilypond-devel: update to 2.19.0 and always build documentation
Modified Paths:
--------------
trunk/dports/textproc/lilypond-devel/Portfile
Removed Paths:
-------------
trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff
Modified: trunk/dports/textproc/lilypond-devel/Portfile
===================================================================
--- trunk/dports/textproc/lilypond-devel/Portfile 2014-01-10 22:42:23 UTC (rev 115769)
+++ trunk/dports/textproc/lilypond-devel/Portfile 2014-01-10 22:44:15 UTC (rev 115770)
@@ -5,7 +5,7 @@
name lilypond-devel
set my_name lilypond
-version 2.17.96
+version 2.19.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories textproc
maintainers snc openmaintainer
@@ -22,15 +22,20 @@
platforms darwin
master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
distname ${my_name}-${version}
-checksums rmd160 b00cc6be07598d0cb28a0e0fb52b67472b00e3e1 \
- sha256 c0dda829ebbe637ec9fee27c47928a2cc934a2b363e761040b0e04d9e4e97a3c
+checksums rmd160 5d2572641601eb19c6a81a8931f7fc1a55d5b381 \
+ sha256 358da6b1b3bd1fc7649d4c2d883b7b2e185497f6c710cafe2985f33b77a3891b
-
depends_build port:t1utils \
port:texi2html \
+ port:netpbm \
port:pkgconfig
-depends_lib port:fontforge \
+depends_lib port:fontconfig \
+ port:fontforge \
+ port:freetype \
+ port:gettext \
+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:ghostscript \
+ port:gmp \
port:mftrace \
port:guile \
port:texinfo \
@@ -47,42 +52,12 @@
configure.python ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
patchfiles patch-scripts-build-mf2pt1.pl.diff
-patchfiles-append patch-freetype-2.5.1.diff
post-patch {
reinplace s|__vector|lily_vector|g ${worksrcpath}/flower/include/std-vector.hh
- set files {Documentation/contributor/build-notes.itexi \
- Documentation/cs/usage/setup.itely \
- Documentation/de/usage/setup.itely \
- python/auxiliar/manuals_definitions.py \
- scripts/auxiliar/check_texi_refs.py \
- scripts/auxiliar/check_translation.py \
- scripts/auxiliar/coverage.py \
- scripts/auxiliar/find-superfluous-includes.py \
- scripts/auxiliar/fixcc.py \
- scripts/auxiliar/makelsr.py \
- scripts/auxiliar/musicxml_generate_intervals.py \
- scripts/auxiliar/musicxml_generate_keys.py \
- scripts/auxiliar/musicxml_generate_timesignatures.py \
- scripts/auxiliar/node-menuify.py \
- scripts/auxiliar/prepare-web-media.py \
- scripts/auxiliar/readlink.py \
- scripts/auxiliar/skyline_viewer.py \
- scripts/auxiliar/strip-whitespace.py \
- scripts/auxiliar/tely-gettext.py \
- scripts/auxiliar/texi-langutils.py \
- scripts/auxiliar/texi-skeleton-update.py \
- scripts/auxiliar/translations-status.py \
- scripts/auxiliar/update-snippets.py \
- scripts/build/pytt.py }
-
- foreach file ${files} {
- reinplace s|/usr/bin/env\\\ python|${configure.python}| ${worksrcpath}/$file
- reinplace s|/usr/bin/python|${configure.python}| ${worksrcpath}/$file
- }
}
configure.args-append --with-ncsb-dir=${prefix}/share/fonts/urw-fonts \
- --disable-documentation
+ --enable-documentation
configure.env LTDL_LIBRARY_PATH=${prefix}/lib \
PYTHON_CONFIG=${configure.python}-config
@@ -96,14 +71,6 @@
reinplace "s|@@PREFIX@@|${prefix}|g" ${destroot}${prefix}/bin/lilypond
}
-default_variants +docs
-
-variant docs description {Build documentation files} {
- configure.args-delete --disable-documentation
- configure.args-append --enable-documentation
- depends_lib-append port:netpbm
-}
-
livecheck.type regex
livecheck.url ${homepage}/development.html
livecheck.regex ${my_name}-(\\d+(\\.\\d+)+)
Deleted: trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff 2014-01-10 22:42:23 UTC (rev 115769)
+++ trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff 2014-01-10 22:44:15 UTC (rev 115770)
@@ -1,60 +0,0 @@
-Fix build with freetype 2.5.1.
-https://code.google.com/p/lilypond/issues/detail?id=3694
-http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff;h=fc455c4192d5c688a5728947c79a68e99b4de553
---- lily/freetype-error.cc.orig
-+++ lily/freetype-error.cc
-@@ -31,7 +31,7 @@ const struct Freetype_error_message
- const char *err_msg;
- } ft_errors[] =
-
--#include <freetype/fterrors.h>
-+#include FT_ERRORS_H
-
- ;
-
---- lily/freetype.cc.orig
-+++ lily/freetype.cc
-@@ -20,8 +20,8 @@
- #include "freetype.hh"
- #include "warn.hh"
-
--#include <freetype/ftoutln.h>
--#include <freetype/ftbbox.h>
-+#include FT_OUTLINE_H
-+#include FT_BBOX_H
-
- FT_Library freetype2_library;
-
---- lily/open-type-font.cc.orig
-+++ lily/open-type-font.cc
-@@ -23,7 +23,7 @@
-
- using namespace std;
-
--#include <freetype/tttables.h>
-+#include FT_TRUETYPE_TABLES_H
-
- #include "dimensions.hh"
- #include "freetype.hh"
---- lily/pango-font.cc.orig
-+++ lily/pango-font.cc
-@@ -22,7 +22,7 @@
- #define PANGO_ENABLE_BACKEND
-
- #include <pango/pangoft2.h>
--#include <freetype/ftxf86.h>
-+#include FT_XFREE86_H
-
- #include <map>
- #include <cstdio>
---- lily/ttf.cc.orig
-+++ lily/ttf.cc
-@@ -20,7 +20,7 @@
- #include <cstdio>
- #include "freetype.hh"
-
--#include <freetype/tttables.h>
-+#include FT_TRUETYPE_TABLES_H
-
- #include "international.hh"
- #include "memory-stream.hh"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140110/45f1d0de/attachment.html>
More information about the macports-changes
mailing list