[91673] trunk/dports/textproc/lilypond-devel/Portfile

[snc at macports.org]

Revision: 91673
          https://trac.macports.org/changeset/91673
Author:   snc at macports.org
Date:     2012-04-07 12:19:39 -0700 (Sat, 07 Apr 2012)
Log Message:
-----------
lilypond-devel: update to 2.15.36, casting issues with clang, use any python2.7

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

Modified: trunk/dports/textproc/lilypond-devel/Portfile
===================================================================
--- trunk/dports/textproc/lilypond-devel/Portfile	2012-04-07 15:37:28 UTC (rev 91672)
+++ trunk/dports/textproc/lilypond-devel/Portfile	2012-04-07 19:19:39 UTC (rev 91673)
@@ -5,7 +5,7 @@
 
 name                lilypond-devel
 set my_name         lilypond
-version             2.15.34
+version             2.15.36
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          textproc
 maintainers         snc openmaintainer
@@ -23,8 +23,8 @@
 master_sites        http://download.linuxaudio.org/lilypond/sources/v${branch}/
 distname            ${my_name}-${version}
 dist_subdir         ${name}/${version}_${revision}
-checksums           rmd160  7e66503d782462703cb5385e915c6d7a4995c611 \
-                    sha256  45d4b1405e640744c4a789d4773609f828eca967df255df99549040657993ac3
+checksums           rmd160  a63f7029b60cdc6999790319670b136f9fdf355c \
+                    sha256  cc84b6539b73b45fc24ff353a11f03a45006944934dc950ca0e064e9cecd0183
 
 
 depends_build       port:t1utils \
@@ -41,35 +41,48 @@
                     port:texlive-metapost \
                     port:dblatex \
                     port:urw-fonts
+depends_run-append  bin:python2.7:python27
 
 patchfiles          patch-scripts-build-mf2pt1.pl.diff
 post-patch {
     reinplace s|__vector|lily_vector|g ${worksrcpath}/flower/include/std-vector.hh
-    fs-traverse file ${worksrcpath} {
-        if {[file isfile $file]} {
-            if {[variant_isset python25]} {
-                reinplace {s|env python|env python2.5|} $file
-                reinplace {s|bin/python|bin/python2.5|} $file
-            }
-
-            if {[variant_isset python26]} {
-                reinplace {s|env python|env python2.6|} $file
-                reinplace {s|bin/python|bin/python2.6|} $file
-            }
- 
-            if {[variant_isset python27]} {
-                reinplace {s|env python|env python2.7|} $file
-                reinplace {s|bin/python|bin/python2.7|} $file
-            }
-        }
+    set files {Documentation/cs/usage/setup.itely \
+        Documentation/de/usage/setup.itely \
+        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/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 \
+        python/auxiliar/manuals_definitions.py \
+        scripts/build/pytt.py}
+    
+    foreach file ${files} {
+        reinplace {s|env python|env python2.7|} $file
+        reinplace s|/usr/bin/python|/usr/bin/env\ python2.7| $file
     }
 }
 
+# 17 casting errors similar to:
+# accidental-engraver.cc:501:1: error: cannot cast from type 'void (Accidental_engraver::*)(Grob_info)' to pointer type 'Engraver_void_function_engraver_grob_info' (aka 'void (*)(Engraver *, Grob_info)')
 if {${configure.compiler} == "clang"} {
     configure.compiler llvm-gcc-4.2
 }
+#configure.cflags-append --std=gnu89
 
-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
@@ -84,22 +97,8 @@
     reinplace "s|@@PREFIX@@|${prefix}|g" ${destroot}${prefix}/bin/lilypond
 }
 
-variant python25 conflicts python26 python27 {
-    depends_run-append  port:py25-socket-ssl
-}
+default_variants +docs
 
-variant python26 conflicts python25 python27 {
-    depends_run-append  port:python26
-}
-
-variant python27 conflicts python25 python26 {
-    depends_run-append  port:python27
-}
-
-if {![variant_isset python25] && ![variant_isset python26] && ![variant_isset python27]} {
-    default_variants +python27 +docs
-}
-
 variant docs description {Build documentation files} {
     configure.args-delete   --disable-documentation
     configure.args-append   --enable-documentation
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120407/ad068837/attachment.html>