<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cf22564d2e5314d3b45f16c89c01b8d24c904c75">https://github.com/macports/macports-ports/commit/cf22564d2e5314d3b45f16c89c01b8d24c904c75</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 cf22564 fontforge: update to 20170731
</span>cf22564 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cf22564d2e5314d3b45f16c89c01b8d24c904c75
</span>Author: Helmut K. C. Tessarek <tessarek@evermeet.cx>
AuthorDate: Sun Apr 29 22:19:39 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> fontforge: update to 20170731
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://trac.macports.org/ticket/43844
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove python26 variant
</span><span style='display:block; white-space:pre;color:#404040;'> - make python27 variant the default
</span><span style='display:block; white-space:pre;color:#404040;'> - add gui variant
</span><span style='display:block; white-space:pre;color:#404040;'> - add notes
</span>---
graphics/fontforge/Portfile | 160 +++++++--------------
graphics/fontforge/files/include.patch | 10 ++
.../fontforge/files/patch-Makefile.dynamic.in.diff | 31 ----
graphics/fontforge/files/patch-configure.in.diff | 16 ---
...ontforge__libffstamp.h-integer-versiondate.diff | 7 -
.../fontforge/files/patch-fontforge_start.c.diff | 10 --
.../fontforge/files/patch-gutils_dynamic.c.diff | 38 -----
graphics/fontforge/files/patch-xcode-43.diff | 37 -----
graphics/fontforge/files/require_noerr.patch | 11 +-
9 files changed, 65 insertions(+), 255 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 01ce767..99676e9 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;'>@@ -1,12 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
name fontforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20120731
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set docversion ${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ftversion 2.4.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup fontforge fontforge 20170731
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-dist-${version}
</span> categories graphics fonts
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,67 +20,22 @@ long_description FontForge allows you to edit outline and bitmap fonts. You
</span> some Type0), TrueType, OpenType (Type2), CID, SVG. Previously known as \
pfaedit.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://fontforge.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/fontforge/fontforge-source \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceforge:project/fontforge/fontforge-docs:docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${homepage}:cidmaps \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://download.savannah.gnu.org/releases/freetype/:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceforge:project/freetype/freetype2/${ftversion}:freetype
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}_full-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set docdistfile ${name}_htdocs-${docversion}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append cidmaps.tgz:cidmaps \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${docdistfile}:docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 351af6022d1c1c80e61788b699ff882bcde1b55f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e5cb9e9e64a99d1dfc549950741eb9b44c3162a4c62f71053905c1f2d024295f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cidmaps.tgz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d194355e61813d31fe4813bdf10a62d66a9f6d04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${docdistfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8afd7d4eb9d590c989f16047e3ff4c926d1eab31 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a938c08e66c1ff1e853e0833fbde6cb5d92d900f66b1958b6769f5b7d32ad1e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- freetype-${ftversion}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9da7fcde9c42f81c399201d055d85109b2ae7814 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only ${distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/cidmap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/htdocs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "tar xzf '${distpath}/cidmaps.tgz' -C '${worksrcpath}/cidmap'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "tar xjf '${distpath}/${docdistfile}' -C '${worksrcpath}/htdocs'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://fontforge.github.io/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 af473f403999937dd95715bdfd98f582d05c94cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 840adefbedd1717e6b70b33ad1e7f2b116678fa6a3d52d45316793b9fd808822 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13985256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}-2.0.${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.dynamic.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fontforge__libffstamp.h-integer-versiondate.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fontforge_start.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gutils_dynamic.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-xcode-43.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles include.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} > 9} {
patchfiles-append \
require_noerr.patch
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 11 && ${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q -W ${worksrcpath}/fontforge "s|AnchorPoint|FFAnchorPoint|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob -tails -directory ${worksrcpath}/fontforge *.c] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- splinefont.h baseviews.h views.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/gutils/dynamic.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/^applicationsdir/s|/Applications|${applications_dir}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.dynamic.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span>
depends_lib port:freetype \
port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,66 +46,54 @@ depends_lib port:freetype \
</span> port:libuninameslist \
port:libxml2 \
port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libxkbui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libspiro \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pango \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:potrace
</span>
configure.args --mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-type3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-devicetables \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-gb12345 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-freetype-bytecode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-pango \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-libraries=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-python-scripting \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-python-extension \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-libzmq \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-x
</span>
configure.ldflags-append \
-lintl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/29840
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist llvm-gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args docdir=${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html README-unix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix permissions problem on this file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${destroot}${applications_dir}/FontForge.app/Contents/Resources FontForge.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/FontForge.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description {Enable Python support (Python 2.7)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-python-scripting \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-python-extension
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant freetype_bytecode description {Enable support for bytecode interpreter} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append freetype-${ftversion}${extract.suffix}:freetype
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.only-append freetype-${ftversion}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-freetype-bytecode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-freetype-src=${workpath}/freetype-${ftversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gui description {Enable GUI support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:xorg-libXi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-x --with-x
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python26 conflicts python27 description {Enable Python support (Python 2.6)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-pyextension \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-python=${prefix}/bin/python2.6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-python-headers=${frameworks_dir}/Python.framework/Versions/2.6/include/python2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append PYTHON=${prefix}/bin/python2.6 PYTHONPREFIX=${frameworks_dir}/Python.framework/Versions/2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/share/fontforge/osx/FontForge.app
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python26 description {Enable Python support (Python 2.7)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-pyextension \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-python=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-python-headers=${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append PYTHON=${prefix}/bin/python2.7 PYTHONPREFIX=${frameworks_dir}/Python.framework/Versions/2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+******* macOS app bundles are available here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+******* https://dl.bintray.com/fontforge/fontforge/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset gui]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+******* To make the GUI work, you have to open a font when launching
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+******* fontforge for the first time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+******* e.g.: ${prefix}/bin/fontforge some-font-file.otf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}_full-(\\d+)\.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +python27
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/files/include.patch b/graphics/fontforge/files/include.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cfbf206
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/fontforge/files/include.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fontforgeexe/startnoui.c.orig 2018-04-20 21:11:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fontforgeexe/startnoui.c 2018-04-20 21:12:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "fontforgevw.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "encoding.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "scripting.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "start.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/files/patch-Makefile.dynamic.in.diff b/graphics/fontforge/files/patch-Makefile.dynamic.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 51b69f7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/files/patch-Makefile.dynamic.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.dynamic.in 2013-05-30 18:46:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.dynamic.in 2013-05-30 18:44:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,6 +12,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- docdir = $(prefix)/share/doc/fontforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localedir = $(prefix)/share/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pythondir = $(sharedir)/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+applicationsdir = /Applications
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- srcdir = @srcdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- top_builddir = .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -129,17 +130,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # You may need to be root to do the install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #explicit use of sh to make sure we don't invoke csh with different "if" syntax
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sh < systemspecific
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sh -c "if test -d fontforge/FontForge.app >/dev/null ; then mkdir -p $(DESTDIR)$(applicationsdir) ; mv fontforge/FontForge.app $(DESTDIR)$(applicationsdir) ; ln -sf $(bindir)/fontforge $(DESTDIR)$(applicationsdir)/FontForge.app/Contents/MacOS/FontForge ; fi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #we don't always create a setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -(cd pyhook ; if test -r setup.py ; then python setup.py install --prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then rm -rf $$dir ; fi; done ; fi )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -(cd pyhook ; if test -r setup.py ; then $(PYTHON) setup.py --no-user-cfg install --prefix=$(PYTHONPREFIX) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then rm -rf $$dir ; fi; done ; fi )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_py: $(DESTDIR)$(sharedir) all install_libs install_incs install_po install_prog install_pycontrib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # You may need to be root to do the install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #explicit use of sh to make sure we don't invoke csh with different "if" syntax
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; for dir in * ; do if test -d $$dir ; then rm -rf $$dir ; fi; done ; fi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sh < systemspecific
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sh -c "if test -d fontforge/FontForge.app >/dev/null ; then mkdir -p $(DESTDIR)$(applicationsdir) ; mv fontforge/FontForge.app $(DESTDIR)$(applicationsdir) ; ln -s $(bindir)/fontforge $(DESTDIR)$(applicationsdir)/FontForge.app/Contents/MacOS/FontForge ; fi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -(cd pyhook ; python setup.py bdist --formats=gztar ; cp dist/fontforge-*.tar.gz $(DESTDIR)/tmp; for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then rm -rf $$dir ; fi; done )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_gtk: fontforgegtk
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/files/patch-configure.in.diff b/graphics/fontforge/files/patch-configure.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 035b9c1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.in.orig 2009-12-26 17:18:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.in 2010-05-23 14:06:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -375,9 +375,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ],AC_DEFINE(_NO_FREETYPE))])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_CHECK_FILE(/usr/include/libxml2/libxml,[CFLAGS="$CFLAGS -I/usr/include/libxml2/"],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_FILE(/usr/local/include/libxml2/libxml,[CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_DEFINE(_NO_LIBXML))])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_FILE(${prefix}/include/libxml2/libxml,[CFLAGS="$CFLAGS -I${prefix}/include/libxml2"],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_FILE(/usr/include/libxml2/libxml,[CFLAGS="$CFLAGS -I/usr/include/libxml2/"],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_FILE(/usr/local/include/libxml2/libxml,[CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE(_NO_LIBXML))])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Some old versions of lib(un)gif don't work for us, they've got the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Function argument in the wrong place. So check the header files.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/files/patch-fontforge__libffstamp.h-integer-versiondate.diff b/graphics/fontforge/files/patch-fontforge__libffstamp.h-integer-versiondate.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b3b5239..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/files/patch-fontforge__libffstamp.h-integer-versiondate.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fontforge/libffstamp.h.orig 2013-02-23 19:41:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fontforge/libffstamp.h 2013-02-23 19:41:36.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LibFF_ModTime 1343746639L /* Seconds since 1970 (standard unix time) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LibFF_ModTime_Str "14:57 GMT 31-Jul-2012"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define LibFF_VersionDate "20120731"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define LibFF_VersionDate 20120731
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/files/patch-fontforge_start.c.diff b/graphics/fontforge/files/patch-fontforge_start.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index edec617..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/files/patch-fontforge_start.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fontforge/start.c.orig 2008-01-01 06:48:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fontforge/start.c 2008-01-12 18:06:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,7 +125,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* install image libs. For some reason fink installs in a place */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* the dynamic loader doesn't find */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* (And fink's attempts to set the PATH variables generally don't work */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- setenv("DYLD_LIBRARY_PATH","/sw/lib",0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;color:#808080;'>diff --git a/graphics/fontforge/files/patch-gutils_dynamic.c.diff b/graphics/fontforge/files/patch-gutils_dynamic.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 46e6a21..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/files/patch-gutils_dynamic.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gutils/dynamic.c.orig 2010-02-04 15:33:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gutils/dynamic.c 2010-05-23 14:06:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,14 +137,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *gwwv_dlopen(char *name,int flags) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef dlopen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void *lib = dlopen(name,flags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void *lib;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *temp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (( lib!=NULL && lib!=(void *) -1) || name==NULL || *name=='/' )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--return( lib );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- temp = galloc( strlen("/sw/lib/") + strlen(name) +1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strcpy(temp,"/sw/lib/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ temp = galloc( strlen("@PREFIX@/lib/") + strlen(name) +1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcpy(temp,"@PREFIX@/lib/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(temp,name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib = dlopen(temp,flags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(temp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -165,14 +162,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const void *gwwv_NSAddImage(char *name,uint32_t options) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const void *lib = NSAddImage(name,options);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const void *lib;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *temp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (( lib!=NULL && lib!=(void *) -1) || name==NULL || *name=='/' )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--return( lib );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- temp = galloc( strlen("/sw/lib/") + strlen(name) +1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strcpy(temp,"/sw/lib/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ temp = galloc( strlen("@PREFIX@/lib/") + strlen(name) +1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcpy(temp,"@PREFIX@/lib/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(temp,name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib = NSAddImage(temp,options);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(temp);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/files/patch-xcode-43.diff b/graphics/fontforge/files/patch-xcode-43.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 96cf84c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/files/patch-xcode-43.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fontforge/macbinary.c.orig 2012-03-14 15:43:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fontforge/macbinary.c 2012-03-14 15:51:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "psfont.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if __Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include </Developer/Headers/FlatCarbon/Files.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <utype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef __Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fontforge/startui.c.orig 2012-03-14 15:49:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fontforge/startui.c 2012-03-14 15:51:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,10 +47,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include </Developer/Headers/FlatCarbon/Files.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define FontInfo MacFontInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define KernPair MacKernPair
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include </Developer/Headers/FlatCarbon/CarbonEvents.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* For reasons obscure to me RunApplicationEventLoop is not defined in */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* the mac header files if we are in 64 bit mode. Strangely it seems to */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* be in the libraries and functional */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gutils/giomime.c.orig 2012-03-14 15:49:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gutils/giomime.c 2012-03-14 15:52:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,7 +65,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unichar_t fontsnf[] = { 'a','p','p','l','i','c','a','t','i','o','n','/','x','-','f','o','n','t','-','s','n','f', '\0' };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include </Developer/Headers/FlatCarbon/Files.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CHR(ch1,ch2,ch3,ch4) (((ch1)<<24)|((ch2)<<16)|((ch3)<<8)|(ch4))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unichar_t *_GioMacMime(const char *path) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/files/require_noerr.patch b/graphics/fontforge/files/require_noerr.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b7ca208..9ddcf3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/files/require_noerr.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/fontforge/files/require_noerr.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with macOS High Sierra and later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Applying this patch conditionally on Snow Leopard and later, because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-it would break Leopard and earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/fontforge/fontforge/issues/3164
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/fontforge/fontforge/pull/3166/commits/015f8300a4e19f6710e577a6b916930bdba5e20b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fontforge/startui.c.orig 2012-07-26 11:29:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fontforge/startui.c 2017-10-03 19:21:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -768,23 +768,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fontforgeexe/startui.c.orig 2018-04-20 18:40:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fontforgeexe/startui.c 2018-04-20 18:41:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -516,23 +516,23 @@
</span>
err = AEInstallEventHandler(kCoreEventClass, kAEOpenApplication,
NewAEEventHandlerUPP(OpenApplicationAE), 0, false);
</pre><pre style='margin:0'>
</pre>