From owner-svn-ports-all@FreeBSD.ORG Thu Mar 26 13:58:27 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2FCF8761; Thu, 26 Mar 2015 13:58:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B6BFBB4; Thu, 26 Mar 2015 13:58:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2QDwQRB085208; Thu, 26 Mar 2015 13:58:26 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2QDwQ7x085207; Thu, 26 Mar 2015 13:58:26 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201503261358.t2QDwQ7x085207@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Thu, 26 Mar 2015 13:58:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382309 - head/devel/synfig/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2015 13:58:27 -0000 Author: marino Date: Thu Mar 26 13:58:25 2015 New Revision: 382309 URL: https://svnweb.freebsd.org/changeset/ports/382309 QAT: https://qat.redports.org/buildarchive/r382309/ Log: devel/synfig: Add DragonFly support Bring in fix from dports (port is not maintained) Modified: head/devel/synfig/files/patch-src__synfig__main.cpp Modified: head/devel/synfig/files/patch-src__synfig__main.cpp ============================================================================== --- head/devel/synfig/files/patch-src__synfig__main.cpp Thu Mar 26 13:49:15 2015 (r382308) +++ head/devel/synfig/files/patch-src__synfig__main.cpp Thu Mar 26 13:58:25 2015 (r382309) @@ -1,6 +1,6 @@ ---- src/synfig/main.cpp.orig +--- src/synfig/main.cpp.orig 2014-12-22 11:08:27 UTC +++ src/synfig/main.cpp -@@ -193,8 +193,10 @@ +@@ -193,8 +193,10 @@ synfig::Main::Main(const synfig::String& unsigned int i; #ifdef _DEBUG @@ -11,11 +11,11 @@ #if defined(HAVE_SIGNAL_H) && defined(SIGPIPE) signal(SIGPIPE, broken_pipe_signal); -@@ -464,7 +466,11 @@ +@@ -464,7 +466,11 @@ synfig::get_binary_path(const String &fa /* Read from /proc/self/exe (symlink) */ char* path2 = (char*)malloc(buf_size); -+#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined (__DragonFly__) + strncpy(path2, "/proc/curproc/file", buf_size - 1); +#else strncpy(path2, "/proc/self/exe", buf_size - 1); @@ -23,15 +23,15 @@ while (1) { int i; -@@ -501,6 +507,7 @@ +@@ -501,6 +507,7 @@ synfig::get_binary_path(const String &fa free(path2); -+#if !defined(__FreeBSD__) ++#if ! (defined(__FreeBSD__) || defined(__DragonFly__)) if (result == "") { /* readlink() or stat() failed; this can happen when the program is -@@ -542,6 +549,7 @@ +@@ -542,6 +549,7 @@ synfig::get_binary_path(const String &fa free(line); fclose(f); }