<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/a55a097cad6edd1c7c4b17e918999729b559b21b">https://github.com/macports/macports-ports/commit/a55a097cad6edd1c7c4b17e918999729b559b21b</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 a55a097 freetype: Update to 2.9.1
</span>a55a097 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a55a097cad6edd1c7c4b17e918999729b559b21b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 30 03:13:59 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> freetype: Update to 2.9.1
</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/57054
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add pkgconfig build dependency since the configure script prefers to use
</span><span style='display:block; white-space:pre;color:#404040;'> pkg-config to find libraries.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The freetype-config script is now deprecated in favor of pkg-config, but
</span><span style='display:block; white-space:pre;color:#404040;'> we still have ports that rely on it so continue to install it. Add a
</span><span style='display:block; white-space:pre;color:#404040;'> no_freetype_config variant to allow maintainers to test their ports for
</span><span style='display:block; white-space:pre;color:#404040;'> compatibility with a future version of the freetype port that removes
</span><span style='display:block; white-space:pre;color:#404040;'> this script.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The freetype-config script uses pkg-config if available, but seems to
</span><span style='display:block; white-space:pre;color:#404040;'> give reasonable answers even if it's not available. Since we don't
</span><span style='display:block; white-space:pre;color:#404040;'> declare a runtime dependency on the pkgconfig port and there doesn't
</span><span style='display:block; white-space:pre;color:#404040;'> appear to be a compelling reason to do so, patch freetype-config so it
</span><span style='display:block; white-space:pre;color:#404040;'> never uses pkg-config, so that it always gives the same answers.
</span>---
print/freetype/Portfile | 22 +++++++++++++++-------
.../files/freetype-config-no-pkg-config.patch | 13 +++++++++++++
print/freetype/files/patch-modules.cfg.diff | 6 +++---
print/freetype/files/patch-src_base_ftrfork.c.diff | 6 +++---
4 files changed, 34 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/freetype/Portfile b/print/freetype/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0219f9e..b848d75 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/freetype/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/freetype/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name freetype
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.9.1
</span> categories print graphics
maintainers {ryandesign @ryandesign}
license {FreeType GPL-2}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,18 +34,21 @@ distfiles ${distname}${extract.suffix}:source \
</span> ${docdistname}${extract.suffix}:docs
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4b31c73b38d1f03c431b12408f800569e0724cc4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1886443 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c01d82acf7062b07146f61f43a8d17d5805b9471 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1926385 \
</span> ${docdistname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5ef58133218fa1ba8106cdaada4a3e6f56c793ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e6251ab44adcb075c7ca4205163c43b6539cbe5265b8a24ec0afa07f8b9213f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2128376
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 44d57b5e54ad1792565b36f9324944035beabb8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aa2f835ef8f50072630ddc48b9eb65f1f456014ffa3b5adddcb6bf390a3c5828 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2130292
</span>
patchfiles \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ freetype-config-no-pkg-config.patch \
</span> patch-src_base_ftrfork.c.diff \
patch-modules.cfg.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:bzip2 \
port:libpng \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +62,11 @@ configure.args --with-bzip2 \
</span> --without-harfbuzz \
ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant no_freetype_config description {Don't install the freetype-config script} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset no_freetype_config]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-freetype-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.universal_args-delete --disable-dependency-tracking
platform macosx {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/freetype/files/freetype-config-no-pkg-config.patch b/print/freetype/files/freetype-config-no-pkg-config.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9ca3d73
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/freetype/files/freetype-config-no-pkg-config.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Let's not have freetype-config giving different answers depending on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+whether or not pkg-config is installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- builds/unix/unix-def.in.orig 2018-04-22 04:41:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ builds/unix/unix-def.in 2018-08-31 03:33:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $@ $@.tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -e 's|%PKG_CONFIG%|$(PKG_CONFIG)|' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -e 's|%PKG_CONFIG%|false|' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -e 's|%exec_prefix%|$(exec_prefix)|' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -e 's|%ft_version%|$(ft_version)|' \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/freetype/files/patch-modules.cfg.diff b/print/freetype/files/patch-modules.cfg.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a30ec13..0a9deb6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/freetype/files/patch-modules.cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/freetype/files/patch-modules.cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules.cfg.orig 2016-08-28 11:47:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules.cfg 2016-09-13 19:58:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules.cfg.orig 2018-04-22 04:41:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules.cfg 2018-08-30 03:05:50.000000000 -0500
</span> @@ -143,7 +143,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # OpenType table validation. Needs ftotval.c below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenType table validation. Needs `ftotval.c' below.
</span> #
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/freetype/files/patch-src_base_ftrfork.c.diff b/print/freetype/files/patch-src_base_ftrfork.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a862da9..87339d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/freetype/files/patch-src_base_ftrfork.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/freetype/files/patch-src_base_ftrfork.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/base/ftrfork.c.orig 2013-06-05 16:56:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/base/ftrfork.c 2013-06-20 18:01:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -533,29 +533,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/base/ftrfork.c.orig 2018-04-22 04:41:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/base/ftrfork.c 2018-08-30 03:05:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -596,29 +596,7 @@
</span> /*
Only meaningful on systems with hfs+ drivers (or Macs).
*/
</pre><pre style='margin:0'>
</pre>