<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ee2ba071a9749d6c79eb3c8a1bd42bdf1e757860">https://github.com/macports/macports-ports/commit/ee2ba071a9749d6c79eb3c8a1bd42bdf1e757860</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 ee2ba07 dia: add dependency and fix help
</span>ee2ba07 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ee2ba071a9749d6c79eb3c8a1bd42bdf1e757860
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Thu Jul 13 22:48:37 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> dia: add dependency and fix help
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add docbook-xsl dependency - force use of local docbook.xsl
</span><span style='display:block; white-space:pre;color:#404040;'> Force creation of html help - use open instead of xdg-open
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some patches come from Debian and master branch of dia
</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/37939
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/42401
</span>---
gnome/dia/Portfile | 9 +++++++--
gnome/dia/files/patch-commands.c.diff | 29 +++++++++++++++++++++++++++++
gnome/dia/files/patch-configure.in.diff | 33 +++++++++++++++++++++++++++------
3 files changed, 63 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/dia/Portfile b/gnome/dia/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0214fa0..73b6ba0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/dia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/dia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup active_variants 1.1
</span>
name dia
version 0.97.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> set branch [join [lrange [split ${version} .] 0 1] .]
maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,8 @@ depends_build port:intltool \
</span> port:pkgconfig \
port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xsl
</span>
depends_lib port:desktop-file-utils \
path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,11 +57,14 @@ depends_run port:librsvg \
</span>
patchfiles patch-autogen.sh.diff \
patch-configure.in.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-commands.c.diff \
</span> patch-lib-color.c.diff
post-patch {
reinplace s/isspecial/char_isspecial/ \
${worksrcpath}/objects/GRAFCET/boolequation.c
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/app/commands.c
</span> }
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +74,7 @@ use_parallel_build no
</span> configure.cmd ./autogen.sh
configure.args --with-cairo \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-hardbooks \
</span> --disable-libemf \
--with-xslt-prefix=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/dia/files/patch-commands.c.diff b/gnome/dia/files/patch-commands.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ebfa29e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/dia/files/patch-commands.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/commands.c 2014-08-24 11:46:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/commands.c 2017-07-13 22:28:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -648,7 +648,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *dentry;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GError *error = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- helpdir = dia_get_data_directory("help");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ helpdir = g_strdup("__PREFIX__/share/doc/dia/html");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!helpdir) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message_warning(_("Could not find help directory"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -697,7 +697,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command = getenv("BROWSER");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command = g_strdup_printf("%s 'file://%s' &", command ? command : "xdg-open", helpindex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ command = g_strdup_printf("%s 'file://%s' &", command ? command : "open", helpindex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system(command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -715,7 +715,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ShellExecuteA (0, "open", link, NULL, NULL, SW_SHOWNORMAL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *command = getenv("BROWSER");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command = g_strdup_printf("%s '%s' &", command ? command : "xdg-open", link);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ command = g_strdup_printf("%s '%s' &", command ? command : "open", link);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system(command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/dia/files/patch-configure.in.diff b/gnome/dia/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 64580e9..86af1e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/dia/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/dia/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.in.orig 2015-04-26 03:20:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.in 2015-04-26 03:21:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -307,7 +307,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in 2014-09-05 11:05:27.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in 2017-07-13 21:54:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -307,9 +307,6 @@
</span> dnl idempotent
AC_SUBST(INTLOBJS)
-localedir='${prefix}/${DATADIRNAME}/locale'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+localedir='${prefix}/share/locale'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(localedir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_SUBST(localedir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Locate the gnome-xml library
</span> dnl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -481,7 +478,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xsltproc=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL(HAVE_XSLTPROC, $xsltproc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_SUBST(DB2MAN, "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_SUBST(DB2MAN, "file://__PREFIX__/share/xsl/docbook-xsl/manpages/docbook.xsl")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Handling for Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_WITH(python,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -540,8 +537,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AM_CONDITIONAL(WITH_PDFDOC, test "x$dblatex" != "xno")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AM_CONDITIONAL(WITH_PSDOC, test "x$dblatex" != "xno")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$dblatex" != "xno" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hardbook_ok=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span></pre><pre style='margin:0'>
</pre>