<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/f1ac2599a294cc84093edb1dbb8a19e796e35f39">https://github.com/macports/macports-ports/commit/f1ac2599a294cc84093edb1dbb8a19e796e35f39</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 f1ac259 xfractint: fix to build against MacPorts Xorg, not XQuartz
</span>f1ac259 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f1ac2599a294cc84093edb1dbb8a19e796e35f39
</span>Author: Justin Flude <jflude@users.noreply.github.com>
AuthorDate: Thu Mar 7 09:13:23 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> xfractint: fix to build against MacPorts Xorg, not XQuartz
</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/58176
</span>---
graphics/xfractint/Portfile | 2 ++
.../xfractint/files/patch-prefix-x11-dirs.diff | 22 +++++++++++++++-------
2 files changed, 17 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xfractint/Portfile b/graphics/xfractint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da650b9..3616d2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xfractint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/xfractint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +26,8 @@ post-patch {
</span> reinplace "s|__PREFIX__|${prefix}|" "${worksrcpath}/Makefile"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:Xft2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
build.args-append CC=${configure.cc} \
CXX=${configure.cxx} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xfractint/files/patch-prefix-x11-dirs.diff b/graphics/xfractint/files/patch-prefix-x11-dirs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c41a9f7..94187c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xfractint/files/patch-prefix-x11-dirs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/xfractint/files/patch-prefix-x11-dirs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,20 @@
</span> --- xfractint-20.04p14/Makefile.orig 2014-05-03 08:12:33.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xfractint-20.04p14/Makefile 2019-03-05 16:22:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,26 +20,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xfractint-20.04p14/Makefile 2019-03-07 12:12:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,6 +2,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRIP = strip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL = /usr/bin/install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PREFIX = $(DESTDIR)__PREFIX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # automatic detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCH = `uname -m | tr "_" "-"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,26 +22,19 @@
</span>
# Use Xft/fontconfig libraries
WITHXFT = -DWITH_XFT
-XFTHFD = /usr/include/freetype2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+XFTHFD = /opt/X11/include/freetype2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XFTHFD = $(PREFIX)/include/freetype2
</span> # Or not
# WITHXFT =
# XFTHFD =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,8 +25,7 @@
</span> -ifndef DESTDIR
-DESTDIR = $(PREFIX)
-endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX = $(DESTDIR)__PREFIX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> # SRCDIR should be a path to the directory that will hold fractint.hlp
# SRCDIR should also hold the .par, .frm, etc. files
-SRCDIR = $(DESTDIR)/share/xfractint
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +44,7 @@
</span>
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS += -I/opt/X11/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -I$(PREFIX)/include/X11
</span> +
# Gcc is often the only compiler that works for this
# For HPUX, use CC = cc -Aa -D_HPUX_SOURCE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +62,7 @@
</span> LIBS = -L/usr/X11R6/lib -lX11 -lm
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS = -L/opt/X11/lib -lX11 -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS = -L$(PREFIX)/lib -lX11 -lm
</span> +
ifeq ($(NCURSES),-DNCURSES)
LIBS += -lncurses
</pre><pre style='margin:0'>
</pre>