<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1dc1c4cb6d95e8995168646fbcd94da0aad25fac">https://github.com/macports/macports-ports/commit/1dc1c4cb6d95e8995168646fbcd94da0aad25fac</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 1dc1c4c xqf: update to version 1.0.6.2
</span>1dc1c4c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1dc1c4cb6d95e8995168646fbcd94da0aad25fac
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Jan 21 19:23:43 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> xqf: update to version 1.0.6.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * use github repo
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * no longer supports gtk1
</span><span style='display:block; white-space:pre;color:#404040;'> * register .desktop file in post-activate
</span>---
games/xqf/Portfile | 52 ++++++++++--------------
games/xqf/files/patch-Makefile.am.diff | 12 +++---
games/xqf/files/patch-Makefile.in.diff | 11 ------
games/xqf/files/patch-src-game_c.diff | 61 -----------------------------
games/xqf/files/patch-src-launch_c.diff | 11 ------
games/xqf/files/patch-src-loadpixmap_c.diff | 11 ------
6 files changed, 27 insertions(+), 131 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xqf/Portfile b/games/xqf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index abb926a..6a4bb9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xqf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xqf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup perl5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name xqf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup XQF xqf 1.0.6.2 xqf-
</span> categories games
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,30 +17,31 @@ long_description XQF is a game server browser and launcher for \
</span> Quake series, Unreal Tournament series, Half-Life \
etc.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bdeeebe3439038cc1c3afda2aed65efff3dabeb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 25a47bae28ae22acce9839bacd39cf0b2e1b00feb1a9be9eab65740f2ad8ecfb
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.am.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-loadpixmap_c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-game_c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-launch_c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:intltool
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 159b9cd02a15fe3b1afd78952152adf5aaafc0c2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ee0ab9a40516c55d9f00e65ab06b1c6669f0de858bc8a7416e6993a76c0d9b67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gdk-pixbuf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-xml-parser \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgeoip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2
</span>
depends_run port:qstat
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./autogen.sh && ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --mandir=${prefix}/share/man \
--with-qstat=${prefix}/bin/qstat \
--enable-bzip2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-externalrcon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-geoip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-externalrcon
</span>
# Undefined symbols: "_get_debug_level"
configure.cflags-append -std=gnu89
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,13 +55,6 @@ post-destroot {
</span> ${destroot}${prefix}/share/doc/${name}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gtk2 description {Use GTK2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:gdk-pixbuf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gdk-pixbuf2 x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +gtk2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xqf/files/patch-Makefile.am.diff b/games/xqf/files/patch-Makefile.am.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e8aebc5..36cd22d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xqf/files/patch-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xqf/files/patch-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.am.orig 2006-10-28 15:12:09.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.am 2007-05-20 22:59:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am.orig 2014-11-01 17:43:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am 2017-01-21 16:12:10.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@
</span> $(GDK_PIXBUF_LIBS) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lz -ldl
</span>
-xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map
+xqf_LDFLAGS =
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # we need to specify all deps manually due to dummy libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xqf_DEPENDENCIES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xqf_CFLAGS = -DQSTAT_SAVAGE_SCRIPT=\"$(qstatsavagedir)/$(qstatsavage_DATA)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xqf/files/patch-Makefile.in.diff b/games/xqf/files/patch-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c6671c3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xqf/files/patch-Makefile.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,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2006-11-04 13:44:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2007-05-20 22:59:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -313,7 +313,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GDK_PIXBUF_LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+xqf_LDFLAGS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we need to specify all deps manually due to dummy libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xqf_DEPENDENCIES = $(top_builddir)/src/zip/libunzip.a \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xqf/files/patch-src-game_c.diff b/games/xqf/files/patch-src-game_c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4d65d6a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xqf/files/patch-src-game_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,61 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/game.c.orig 2010-11-15 12:54:01.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/game.c 2010-11-15 12:54:10.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,6 +189,45 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { NULL, UNKNOWN_SERVER }
</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;'>-+/* space name in executable fix */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+gchar ** space_fix_strsplit( const gchar *string,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const gchar *delimiter,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gint max_tokens )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i,k,len,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hit = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar * localstring = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar ** retvalue = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* make a local copy of string to manipulate it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ we'll free the region just before leaving the main if */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len = strlen(string);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ localstring = (char *) malloc(len+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( localstring ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcpy(localstring, string);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while ( i<len-2-hit) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( (localstring[i] == '\\') && (localstring[i+1] == ' ') ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ localstring[i] = '\254';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ( k=i+1; k<=len-1; k++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ localstring[k]=localstring[k+1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hit += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ retvalue = g_strsplit( localstring, delimiter, max_tokens);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (retvalue)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (retvalue[0]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len = strlen(retvalue[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ( i=0; i<len-1; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( retvalue[0][i] == '\254' )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ retvalue[0][i] = ' ';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(localstring);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return retvalue;
</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;'>- void init_games()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned i, j;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2331,10 +2370,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_console = str2bool(game_get_attribute(g->type,"enable_console"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass_memory_options = str2bool(game_get_attribute(g->type,"pass_memory_options"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cmdtokens = g_strsplit(g->cmd," ",0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cmdtokens = space_fix_strsplit(g->cmd," ",0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(cmdtokens && *cmdtokens[cmdi])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cmd=cmdtokens[cmdi++];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cmd=cmdtokens[cmdi++];
</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;'>- Figure out what protocal the server is running so we can try to connect
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xqf/files/patch-src-launch_c.diff b/games/xqf/files/patch-src-launch_c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 10efa4c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xqf/files/patch-src-launch_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,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/launch.c.orig 2010-11-15 12:54:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/launch.c 2010-11-15 12:54:10.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -285,7 +285,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- execvp (argv[0], argv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_snprintf (msg, CLIENT_ERROR_BUFFER, "%sexec(%s) failed: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_snprintf (msg, CLIENT_ERROR_BUFFER, "%sexec(\"%s\") failed: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLIENT_ERROR_MSG_HEAD, argv[0], g_strerror (errno));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error_out:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xqf/files/patch-src-loadpixmap_c.diff b/games/xqf/files/patch-src-loadpixmap_c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d9ed7e0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xqf/files/patch-src-loadpixmap_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,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/loadpixmap.c.orig 2010-11-15 13:03:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/loadpixmap.c 2010-11-15 13:04:20.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -184,7 +184,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *p++ = '_';
</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;'>-- xpm = dlsym(NULL, found_filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xpm = dlsym(RTLD_DEFAULT, found_filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(xpm)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- colormap = gtk_widget_get_colormap (widget);
</span></pre><pre style='margin:0'>
</pre>