[97056] trunk/dports/textproc/lilypond
snc at macports.org
snc at macports.org
Sat Aug 25 12:11:28 PDT 2012
Revision: 97056
https://trac.macports.org/changeset/97056
Author: snc at macports.org
Date: 2012-08-25 12:11:27 -0700 (Sat, 25 Aug 2012)
Log Message:
-----------
lilypond: merge from lilypond-devel, update to 2.16.0
Modified Paths:
--------------
trunk/dports/textproc/lilypond/Portfile
trunk/dports/textproc/lilypond/files/patch-scripts-build-mf2pt1.pl.diff
Removed Paths:
-------------
trunk/dports/textproc/lilypond/files/configure-remove-gcc-version-check.diff
trunk/dports/textproc/lilypond/files/patch-non-gcc.diff
Property Changed:
----------------
trunk/dports/textproc/lilypond/
Property changes on: trunk/dports/textproc/lilypond
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/textproc/lilypond:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/textproc/lilypond-devel:89282-97054
Modified: trunk/dports/textproc/lilypond/Portfile
===================================================================
--- trunk/dports/textproc/lilypond/Portfile 2012-08-25 18:58:46 UTC (rev 97055)
+++ trunk/dports/textproc/lilypond/Portfile 2012-08-25 19:11:27 UTC (rev 97056)
@@ -4,8 +4,7 @@
PortSystem 1.0
name lilypond
-version 2.14.2
-revision 1
+version 2.16.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories textproc
maintainers snc openmaintainer
@@ -18,13 +17,15 @@
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
+conflicts lilypond
platforms darwin
master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
-dist_subdir ${name}/${version}_${revision}
-checksums rmd160 74123b2db40519feaf8144fd19becf3ad81738e7 \
- sha256 243a6b3845722a37083d73ed681e69ffde0b3b9c6158af20db3c0926dd982696
+#dist_subdir ${name}/${version}_${revision}
+checksums rmd160 78f52fa379369476c245d3440cc2fdfa9b59a8d0 \
+ sha256 ecd5b7a2da668c94de7757e366f34bdd5d49b89e9b40ce859174dd2a7edb163d
+
depends_build port:t1utils \
port:texi2html \
port:pkgconfig
@@ -39,35 +40,54 @@
port:texlive-metapost \
port:dblatex \
port:urw-fonts
+depends_run-append bin:python2.7:python27
+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"
+ }
+
+ if {${os.major} > 10} {
+ # 10.7 is not supported (likely due to compiler)
+ ui_error "${name} requires Leopard or Snow Leopard"
+ return -code error "unsupported OS X version"
+ }
+}
+
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/contributor/build-notes.itexi \
+ 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/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|env python|env python2.7|} ${worksrcpath}/$file
+ reinplace s|/usr/bin/python|/usr/bin/env\ python2.7| ${worksrcpath}/$file
}
}
-# https://trac.macports.org/ticket/32647
-if {${configure.compiler} == "clang"} {
- patchfiles-append configure-remove-gcc-version-check.diff
-}
-
configure.args --with-ncsb-dir=${prefix}/share/fonts/urw-fonts \
--disable-documentation
@@ -83,22 +103,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
-}
-
variant docs description {Build documentation files} {
configure.args-delete --disable-documentation
configure.args-append --enable-documentation
Deleted: trunk/dports/textproc/lilypond/files/configure-remove-gcc-version-check.diff
===================================================================
--- trunk/dports/textproc/lilypond/files/configure-remove-gcc-version-check.diff 2012-08-25 18:58:46 UTC (rev 97055)
+++ trunk/dports/textproc/lilypond/files/configure-remove-gcc-version-check.diff 2012-08-25 19:11:27 UTC (rev 97056)
@@ -1,36 +0,0 @@
---- configure.orig 2011-07-26 08:42:18.000000000 +1000
-+++ configure 2012-07-08 01:55:16.000000000 +1000
-@@ -4417,7 +4417,7 @@
-
-
-
-- if test "$GCC" = "yes"; then
-+ if false; then
-
- r="`eval echo '$'"CC"`"
- { $as_echo "$as_me:$LINENO: checking $r version" >&5
-@@ -4497,7 +4497,6 @@
- else
- warn="$CC (Please install *GNU* cc)"
-
-- eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$warn\"`\"
-
- fi
-
-@@ -4910,7 +4909,7 @@
-
-
-
-- if test "$GXX" = "yes"; then
-+ if false; then
-
- r="`eval echo '$'"CXX"`"
- { $as_echo "$as_me:$LINENO: checking $r version" >&5
-@@ -4990,7 +4989,6 @@
- else
- warn="$CXX (Please install *GNU* c++)"
-
-- eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$warn\"`\"
-
- fi
-
Deleted: trunk/dports/textproc/lilypond/files/patch-non-gcc.diff
===================================================================
--- trunk/dports/textproc/lilypond/files/patch-non-gcc.diff 2012-08-25 18:58:46 UTC (rev 97055)
+++ trunk/dports/textproc/lilypond/files/patch-non-gcc.diff 2012-08-25 19:11:27 UTC (rev 97056)
@@ -1,80 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -91,10 +91,14 @@ AC_MSG_RESULT($NCSB_SOURCE_FILES)
- AC_LANG([C++])
-
- STEPMAKE_PYTHON(REQUIRED, 2.4)
--STEPMAKE_GCC(REQUIRED, 3.4)
-+# this checks if we have GNU C by compiling a program with
-+# __GNUC__, but that macro now unofficially means "the compiler
-+# supports the GNU C extensions" -- the intel C compiler and clang
-+# both support __GNUC__!
-+STEPMAKE_GCC_OR_CLANG(REQUIRED, 3.4)
-
- STEPMAKE_CXX(REQUIRED)
--STEPMAKE_GXX(REQUIRED, 3.4)
-+STEPMAKE_GXX_OR_CLANG(REQUIRED, 3.4)
- STEPMAKE_CXXTEMPLATE
- STEPMAKE_STL_DATA_METHOD
- STEPMAKE_LIB(REQUIRED)
---- stepmake/aclocal.m4
-+++ stepmake/aclocal.m4
-@@ -494,13 +494,17 @@ EOF
- AC_MSG_RESULT($FLEXLEXER_FILE)
- ])
-
--AC_DEFUN(STEPMAKE_GCC, [
-- if test "$GCC" = "yes"; then
-- STEPMAKE_CHECK_VERSION(CC, $1, $2)
-- else
-- warn="$CC (Please install *GNU* cc)"
-- STEPMAKE_ADD_ENTRY($1, $warn)
-+AC_DEFUN(STEPMAKE_GCC_OR_CLANG, [
-+ STEPMAKE_HAS_CLANG()
-+ if test "$HAS_CLANG" = "no"; then
-+ if test "$GCC" = "yes"; then
-+ STEPMAKE_CHECK_VERSION(CC, $1, $2)
-+ else
-+ warn="$CC (Please install *GNU* cc)"
-+ STEPMAKE_ADD_ENTRY($1, $warn)
-+ fi
- fi
-+ # no else, we're fine with any clang
- ])
-
- AC_DEFUN(STEPMAKE_GETTEXT, [
-@@ -616,13 +620,25 @@ AC_DEFUN(STEPMAKE_DLOPEN, [
- AC_CHECK_FUNCS(dlopen)
- ])
-
--AC_DEFUN(STEPMAKE_GXX, [
-- if test "$GXX" = "yes"; then
-- STEPMAKE_CHECK_VERSION(CXX, $1, $2)
-- else
-- warn="$CXX (Please install *GNU* c++)"
-- STEPMAKE_ADD_ENTRY($1, $warn)
-+AC_DEFUN(STEPMAKE_HAS_CLANG, [
-+ AC_EGREP_CPP(yes,
-+ [#ifdef __clang__
-+ yes
-+ #endif
-+ ], HAS_CLANG=yes, HAS_CLANG=no)
-+])
-+
-+AC_DEFUN(STEPMAKE_GXX_OR_CLANG, [
-+ STEPMAKE_HAS_CLANG()
-+ if test "$HAS_CLANG" = "no"; then
-+ if test "$GXX" = "yes"; then
-+ STEPMAKE_CHECK_VERSION(CXX, $1, $2)
-+ else
-+ warn="$CXX (Please install *GNU* c++)"
-+ STEPMAKE_ADD_ENTRY($1, $warn)
-+ fi
- fi
-+ # no else, we're fine with any clang
- ])
-
-
---
-1.7.2.5
-
Modified: trunk/dports/textproc/lilypond/files/patch-scripts-build-mf2pt1.pl.diff
===================================================================
--- trunk/dports/textproc/lilypond/files/patch-scripts-build-mf2pt1.pl.diff 2012-08-25 18:58:46 UTC (rev 97055)
+++ trunk/dports/textproc/lilypond/files/patch-scripts-build-mf2pt1.pl.diff 2012-08-25 19:11:27 UTC (rev 97056)
@@ -1,11 +1,11 @@
---- scripts/build/mf2pt1.pl.orig 2011-09-01 14:54:37.000000000 -0400
-+++ scripts/build/mf2pt1.pl 2011-09-01 14:55:04.000000000 -0400
+--- scripts/build/mf2pt1.pl.orig 2012-03-27 19:42:13.000000000 -0400
++++ scripts/build/mf2pt1.pl 2012-03-30 15:16:48.000000000 -0400
@@ -426,7 +426,7 @@
# parameters, too.
sub get_bboxes ($)
{
- execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost",
+ execute_command 1, ("mpost", "-mem=../../mf2pt1", "-progname=mpost",
- "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile");
+ "\\mode:=localfont; mag:=$mag; bpppix $bpppix; nonstopmode; input $mffile");
opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n";
@charfiles = sort
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120825/52c346ac/attachment.html>
More information about the macports-changes
mailing list