<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fd660c4d9366010a1bef13a0f2108efa0c71c228">https://github.com/macports/macports-ports/commit/fd660c4d9366010a1bef13a0f2108efa0c71c228</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fd660c4d9366010a1bef13a0f2108efa0c71c228
</span>Author: Mark Mentovai <mark@chromium.org>
AuthorDate: Fri May 8 11:11:33 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> fontforge: update to 20200314
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The previous port, 20190801_2, was broken when built with Python:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> % fontforge
</span><span style='display:block; white-space:pre;color:#404040;'> dyld: Symbol not found: _PyBool_Type
</span><span style='display:block; white-space:pre;color:#404040;'> Referenced from: /opt/local/lib/libfontforge.3.dylib
</span><span style='display:block; white-space:pre;color:#404040;'> Expected in: flat namespace
</span><span style='display:block; white-space:pre;color:#404040;'> in /opt/local/lib/libfontforge.3.dylib
</span><span style='display:block; white-space:pre;color:#404040;'> zsh: abort fontforge
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since 20190801, FontForge abandoned its autotools-based build in favor
</span><span style='display:block; white-space:pre;color:#404040;'> of CMake. The new CMake-based build does not share this problem.
</span>---
graphics/fontforge/Portfile | 76 ++++++++++++++++++++++-----------------------
1 file changed, 38 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/Portfile b/graphics/fontforge/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70b7810..8efebe3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/fontforge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,12 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup fontforge fontforge 20190801
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup fontforge fontforge 20200314
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
categories graphics fonts
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +23,9 @@ long_description FontForge allows you to edit outline and bitmap fonts. You
</span>
homepage http://fontforge.github.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1b8e8ba52dc35034e250c0b2cd9c4acef01794f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d92075ca783c97dc68433b1ed629b9054a4b4c74ac64c54ced7f691540f70852 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20766334
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c7368a53f6a5b6649f7bc18a957368006870b67b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cd190b237353dc3f48ddca7b0b3439da8ec4fcf27911d14cc1ccc76c1a47c861 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13850076
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +46,7 @@ depends_lib path:lib/pkgconfig/cairo.pc:cairo \
</span> port:woff2 \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Needs C11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist {clang < 500} *gcc-4.2 gcc-4.0 gcc-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -std=gnu11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span>
# fix 32bit builds by masking an old Carbon call to GetTime
patchfiles-append patch-fontforge-carbon-gettime-namecollision.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,50 +63,52 @@ platform darwin 8 {
</span> configure.env-append PATH=${prefix}/libexec/gnubin/:$env(PATH)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python-scripting \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python-extension \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-woff2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DENABLE_GUI=False \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LIBGIF=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LIBJPEG=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LIBPNG=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LIBREADLINE=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LIBSPIRO=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LIBTIFF=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_UNINAMELIST=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PYTHON_SCRIPTING=False \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PYTHON_EXTENSION=False \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_WOFF2=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_WRITE_PFM=False \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_X11=False
</span>
variant python37 conflicts python38 description {Enable Python support (Python 3.7)} {
depends_lib-append port:python37
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-python-scripting \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python-extension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append am_cv_python_pythondir=${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7/site-packages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_cv_python_pyexecdir=${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_PYTHON_EXTENSION=False \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PYTHON_EXTENSION=True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_PYTHON_SCRIPTING=False \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PYTHON_SCRIPTING=True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPython3_EXECUTABLE="${prefix}/bin/python3.7" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYHOOK_INSTALL_DIR="${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7/site-packages"
</span> configure.pkg_config_path \
"${frameworks_dir}/Python.framework/Versions/3.7/lib/pkgconfig"
}
variant python38 conflicts python37 description {Enable Python support (Python 3.8)} {
depends_lib-append port:python38
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-python-scripting \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python-extension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append am_cv_python_pythondir=${frameworks_dir}/Python.framework/Versions/3.8/lib/python3.8/site-packages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_cv_python_pyexecdir=${frameworks_dir}/Python.framework/Versions/3.8/lib/python3.8/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_PYTHON_EXTENSION=False \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PYTHON_EXTENSION=True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_PYTHON_SCRIPTING=False \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PYTHON_SCRIPTING=True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPython3_EXECUTABLE="${prefix}/bin/python3.8" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYHOOK_INSTALL_DIR="${frameworks_dir}/Python.framework/Versions/3.8/lib/python3.8/site-packages"
</span> configure.pkg_config_path \
"${frameworks_dir}/Python.framework/Versions/3.8/lib/pkgconfig"
}
variant gui description {Enable GUI support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:xorg-libXi port:gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-x --with-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-gdk=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup app 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_GUI=False -DENABLE_GUI=True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.name FontForge
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.icon ${worksrcpath}/osx/FontForge.app/Contents/Resources/FontForge.icns
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/fontforge/osx/FontForge.app
</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;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-macOS app bundles are available here:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://dl.bintray.com/fontforge/fontforge/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span> default_variants +gui
if {![variant_isset python37] && ![variant_isset python38]} {
default_variants-append +python38
</pre><pre style='margin:0'>
</pre>