<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e836fe4dad7dbf3520d507f14f215581607515b2">https://github.com/macports/macports-ports/commit/e836fe4dad7dbf3520d507f14f215581607515b2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e836fe4 birdfont: update to version 2.25.0
</span>e836fe4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e836fe4dad7dbf3520d507f14f215581607515b2
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Feb 17 21:23:15 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> birdfont: update to version 2.25.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * now uses gtk3 and webkit2-gtk
</span><span style='display:block; white-space:pre;color:#404040;'> * update maintainers email and GitHub handle
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/52407
</span>---
graphics/birdfont/Portfile | 75 +++----
graphics/birdfont/files/fix-install-name.patch | 15 ++
...and_ldflags_install_icons_and_translations.diff | 228 ---------------------
3 files changed, 54 insertions(+), 264 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/birdfont/Portfile b/graphics/birdfont/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0cbc93d..398181f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/birdfont/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/birdfont/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,61 +3,64 @@
</span> PortSystem 1.0
name birdfont
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers openmaintainer {gmail.com:johan.mattsson johanmattssonm}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.25.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers openmaintainer {gmail.com:johan.mattsson.m @johanmattssonm}
</span> categories graphics
description Font editor
long_description ${description}
homepage http://birdfont.org
license GPL-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 358f540c4fb6d8862ab416e8529e2dde6009c6d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f1432dba6c19ee9f8d26b6680af7f6601254430d175ce4046176c90a15a29194
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch_use_cc_and_ldflags_install_icons_and_translations.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vala
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsoup \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libnotify \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vala \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xmlbird
</span>
master_sites http://birdfont.org/releases/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0559c52a7faab864ab9beb75a6cf7b2956b48554 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4274934ba6ac1532372113473c0d19f7dfbbd301017d4cd14abaab98ea34283a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2605312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles fix-install-name.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/python3|${prefix}/bin/python3.7|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # I'm not convinced it wouldn't be possible to build this +universal, just
# haven't had the time to find out how to pass all necessary flags
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: Fix the actual bug. This just masks the problem to force a successful build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -Wno-return-type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./scripts/macport_configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMAC
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ./scripts/macport_build.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args --prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --cc=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --cc=${configure.cc} \
</span> --cflags="${configure.cflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --ldflags="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ldflags="${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --dest="${destroot}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.cmd ./scripts/macport_install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args --prefix=${prefix} --dest=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ./build.py
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${worksrcpath}/build/BirdFont.app/Contents/MacOS/birdfont.sh -permissions 0755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/build/BirdFont.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd ./install.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args --dest="${destroot}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --manpages-directory=/share/man/man1
</span>
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/birdfont/files/fix-install-name.patch b/graphics/birdfont/files/fix-install-name.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a5589aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/birdfont/files/fix-install-name.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dodo.py.orig 2018-12-17 05:09:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dodo.py 2019-02-17 18:55:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,8 +55,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SO_VERSION=version.SO_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def soname(target_binary):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if "darwin" in sys.platform or "msys" in sys.platform:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if "msys" in sys.platform:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if "darwin" in sys.platform:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return '-Wl,-install_name,' + config.PREFIX + '/lib/' + target_binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return '-Wl,-soname,' + target_binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/birdfont/files/patch_use_cc_and_ldflags_install_icons_and_translations.diff b/graphics/birdfont/files/patch_use_cc_and_ldflags_install_icons_and_translations.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00adccd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/birdfont/files/patch_use_cc_and_ldflags_install_icons_and_translations.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,228 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/macport_build.py.orig 2013-02-26 07:56:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/macport_build.py 2013-02-27 20:39:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import subprocess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from optparse import OptionParser
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from translations import compile_translations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import configfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,68 +16,179 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print("Error: " + cmd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--def build (prefix):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def build(prefix, cc, cflags, ldflags):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ compile_translations ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #libbirdfont
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mkdir -p build/libbirdfont")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mkdir -p build/bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("valac -C --basedir build/libbirdfont/ --enable-experimental-non-null --enable-experimental --define=MAC --library libbirdfont -H build/libbirdfont/birdfont.h libbirdfont/* --pkg libxml-2.0 --pkg gio-2.0 --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run("""valac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -C \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --basedir build/libbirdfont/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --enable-experimental-non-null \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --enable-experimental \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --define=MAC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --library libbirdfont \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -H build/libbirdfont/birdfont.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libbirdfont/* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg libxml-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg gio-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg libsoup-2.4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg gdk-pixbuf-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg webkit-1.0""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("cp libbirdfont/*.c build/libbirdfont/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("""gcc -c build/libbirdfont/*.c -shared -fno-common -fPIC -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) -I ./build/mac/birdfont""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run(cc + " " + cflags + """ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -c build/libbirdfont/*.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -fno-common \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -fPIC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -D 'GETTEXT_PACKAGE="birdfont"' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags libxml-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags gio-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags cairo) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags glib-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags gdk-pixbuf-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags webkit-1.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -I ./build/mac/birdfont""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mv ./*.o build/libbirdfont/ ")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("gcc -dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup,-compatibility_version,1.0,-current_version,1.0,-install_name,/usr/local/lib/libbirdfont.dylib -shared build/libbirdfont/*.o $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) -shared -o libbirdfont.dylib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run(cc + " " + ldflags + """ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup,-compatibility_version,1.0,-current_version,1.0,-install_name,""" + prefix + """/lib/libbirdfont.dylib -shared build/libbirdfont/*.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs libxml-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs gio-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs cairo) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs glib-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs gdk-pixbuf-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs webkit-1.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -shared -o libbirdfont.dylib""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mv libbirdfont.dylib build/bin/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run ("install_name_tool -id " + prefix + "/lib/libbirdfont.dylib build/bin/libbirdfont.dylib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # birdfont
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mkdir -p build/birdfont")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("valac -C --enable-experimental-non-null --enable-experimental --define=MAC birdfont/* --vapidir=./ --pkg libxml-2.0 --pkg gio-2.0 --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 --pkg libbirdfont")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run("""valac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -C \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --enable-experimental-non-null \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --enable-experimental \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --define=MAC birdfont/* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --vapidir=./ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg libxml-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg gio-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg libsoup-2.4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg gdk-pixbuf-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg webkit-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg gtk+-2.0\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg libbirdfont""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mv birdfont/*.c build/birdfont/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("""gcc -c ./build/libbirdfont/birdfont.h build/birdfont/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags libxml-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --cflags cairo) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk-pixbuf-2.0) $(pkg-config --cflags webkit-1.0) -I ./build/libbirdfont/""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run(cc + " " + cflags + """\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -c ./build/libbirdfont/birdfont.h build/birdfont/*.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -D 'GETTEXT_PACKAGE="birdfont"' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags libxml-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags gio-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags cairo) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags glib-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags gdk-pixbuf-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags webkit-1.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -I ./build/libbirdfont/""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mv ./*.o build/birdfont/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("gcc build/birdfont/*.o ./build/bin/libbirdfont.dylib $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) $(pkg-config --cflags --libs gtk+-2.0) -o ./build/bin/birdfont")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run(cc + " " + ldflags + """ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ build/birdfont/*.o ./build/bin/libbirdfont.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs libxml-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs gio-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs cairo) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs glib-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs gdk-pixbuf-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs webkit-1.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs gtk+-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -o ./build/bin/birdfont""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # birdfont-export
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mkdir -p build/birdfont-export")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("valac -C --enable-experimental-non-null --enable-experimental --define=MAC birdfont-export/* --vapidir=./ --pkg libxml-2.0 --pkg gio-2.0 --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 --pkg libbirdfont")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run("""valac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -C \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --enable-experimental-non-null \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --enable-experimental \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --define=MAC birdfont-export/* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --vapidir=./ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg libxml-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg gio-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg libsoup-2.4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg gdk-pixbuf-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg webkit-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg gtk+-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --pkg libbirdfont""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mv birdfont-export/*.c build/birdfont-export/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("""gcc -c ./build/libbirdfont/birdfont.h build/birdfont-export/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags libxml-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --cflags cairo) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk-pixbuf-2.0) $(pkg-config --cflags webkit-1.0) -I ./build/libbirdfont/""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run(cc + " " + cflags + """ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -c ./build/libbirdfont/birdfont.h build/birdfont-export/*.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -D 'GETTEXT_PACKAGE="birdfont"' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags libxml-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags gio-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags cairo) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags glib-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags gdk-pixbuf-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --cflags webkit-1.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -I ./build/libbirdfont/""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mv ./*.o build/birdfont-export/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("gcc build/birdfont-export/*.o ./build/bin/libbirdfont.dylib $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) $(pkg-config --cflags --libs gtk+-2.0) -o ./build/bin/birdfont-export")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run(cc + " " + ldflags + " \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ build/birdfont-export/*.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ./build/bin/libbirdfont.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs libxml-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs gio-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs cairo) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs glib-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs gdk-pixbuf-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs webkit-1.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(pkg-config --libs gtk+-2.0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -o ./build/bin/birdfont-export")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("touch build/installed")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("touch build/configured")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--def build_app ():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def build_app (prefix):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # application launcher
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mkdir -p build/BirdFont.app")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mkdir -p build/BirdFont.app/Contents")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("mkdir -p build/BirdFont.app/Contents/MacOs")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ run("mkdir -p build/BirdFont.app/Contents/MacOS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("mkdir -p build/BirdFont.app/Contents/Resources")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- run("cp resources/mac/birdfont.sh build/BirdFont.app/Contents/MacOs")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ startup = open ('build/BirdFont.app/Contents/MacOS/birdfont.sh', 'w+')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ startup.write ("#!/bin/bash\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ startup.write ("cd \"${0%/*}\"\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ startup.write (prefix + "/bin/birdfont\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("cp resources/mac/Info.plist build/BirdFont.app/Contents/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run("cp resources/mac/birdfont.icns build/BirdFont.app/Contents/Resources")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parser = OptionParser()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--parser.add_option ("-p", "--prefix", dest="prefix", help="install prefix", metavar="PREFIX")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--parser.add_option ("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+parser.add_option("-p", "--prefix", dest="prefix", help="install prefix", metavar="PREFIX")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+parser.add_option("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+parser.add_option("-c", "--cc", dest="cc", help="select the C compiler", metavar="CC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+parser.add_option("-f", "--cflags", dest="cflags", help="set compiler flags", metavar="CFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+parser.add_option("-l", "--ldflags", dest="ldflags", help="set linker flags", metavar="LDFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (options, args) = parser.parse_args()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not options.prefix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options.prefix = "/opt/local"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if not options.cc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ options.cc = "gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if not options.cflags:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ options.cflags = ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if not options.ldflags:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ options.ldflags = ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--build (options.prefix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--build_app ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+build_app (options.prefix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+build (options.prefix, options.cc, options.cflags, options.ldflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/macport_install.py.orig 2013-02-26 07:56:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/macport_install.py 2013-02-27 20:39:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install ('build/bin/birdfont-export', '/bin')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install ('build/bin/libbirdfont.dylib', '/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for file in os.listdir('./layout'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install ('layout/' + file, '/share/birdfont/layout')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for file in os.listdir('./icons'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install ('icons/' + file, '/share/birdfont/icons')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for lang_dir in glob.glob('build/locale/*'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lc = lang_dir.replace ('build/locale/', "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install ('build/locale/' + lc + '/LC_MESSAGES/birdfont.mo', '/share/locale/' + lc + '/LC_MESSAGES' );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install application launcher
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if options.app:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subprocess.check_call ('mkdir -p ' + dest + '/Applications/', shell=True)
</span></pre><pre style='margin:0'>
</pre>