[115730] trunk/dports/textproc/lilypond

[snc at macports.org]

Revision: 115730
          https://trac.macports.org/changeset/115730
Author:   snc at macports.org
Date:     2014-01-09 15:08:44 -0800 (Thu, 09 Jan 2014)
Log Message:
-----------
lilypond: update to 2.18.0

Modified Paths:
--------------
    trunk/dports/textproc/lilypond/Portfile

Removed Paths:
-------------
    trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff

Modified: trunk/dports/textproc/lilypond/Portfile
===================================================================
--- trunk/dports/textproc/lilypond/Portfile	2014-01-09 23:06:11 UTC (rev 115729)
+++ trunk/dports/textproc/lilypond/Portfile	2014-01-09 23:08:44 UTC (rev 115730)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                lilypond
-version             2.16.2
-revision            2
+version             2.18.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          textproc
 maintainers         snc openmaintainer
@@ -18,18 +17,21 @@
                     similar to LaTeX. Lilypond can export sheet music to PDF, \
                     EPS, SVG, and PNG formats, and can also create MIDI files.
 
-homepage            http://lilypond.org
+homepage            http://lilypond.org/
 platforms           darwin
 master_sites        http://download.linuxaudio.org/lilypond/sources/v${branch}/
 #dist_subdir         ${name}/${version}_${revision}
-checksums           rmd160  bbb68ef05e81d8d9f5cf7ac26cffb5ab3935c61a \
-                    sha256  1f4326cf8f9363076a83ce3cbe35f747188084f7492000ed3a7ccc3ce60aa1cb
+checksums           rmd160  2f33ce20c6c1a82f9291482786c22d403d8949f4 \
+                    sha256  89059139a560a4900305b52d9327969cfcdedb061ed7bae310fdf5d4ba2aa230
 
 
 depends_build       port:t1utils \
                     port:texi2html \
                     port:pkgconfig
 depends_lib         port:fontforge \
+                    port:gettext \
+                    port:gmp \
+                    port:glib2 \
                     port:ghostscript \
                     port:mftrace \
                     port:guile \
@@ -43,20 +45,9 @@
                     port:libtool \
                     port:python27
 
-# accidental-engraver.cc:508:1: error: cannot cast from type 'void (Accidental_engraver::*)()' to pointer type 'Translator_void_method_ptr' (aka 'void (*)(Translator *)')
-compiler.blacklist  *clang*
-pre-fetch {
-    if {${os.major} < 9} {
-        # 10.4 is not supported
-        ui_error "${name} requires Leopard or Snow Leopard"
-        return -code error "unsupported OS X version"
-    }
-}
-
 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 \
@@ -75,13 +66,14 @@
         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}
+        scripts/build/pytt.py }
     
     foreach file ${files} {
         reinplace s|/usr/bin/env\\\ python|${configure.python}| ${worksrcpath}/$file
@@ -89,7 +81,7 @@
     }
 }
 
-configure.args  --with-ncsb-dir=${prefix}/share/fonts/urw-fonts \
+configure.args-append  --with-ncsb-dir=${prefix}/share/fonts/urw-fonts \
     --disable-documentation
 
 configure.env       LTDL_LIBRARY_PATH=${prefix}/lib \

Deleted: trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff	2014-01-09 23:06:11 UTC (rev 115729)
+++ trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff	2014-01-09 23:08:44 UTC (rev 115730)
@@ -1,47 +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/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/20140109/fd17858a/attachment.html>