From owner-svn-ports-all@FreeBSD.ORG  Mon Oct  7 09:04:10 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BB0FA800;
 Mon,  7 Oct 2013 09:04:10 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8FBC52010;
 Mon,  7 Oct 2013 09:04:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9794AeU081936;
 Mon, 7 Oct 2013 09:04:10 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9794ADt081935;
 Mon, 7 Oct 2013 09:04:10 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201310070904.r9794ADt081935@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Mon, 7 Oct 2013 09:04:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329666 - head/graphics/ipe/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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Oct 2013 09:04:10 -0000

Author: marino
Date: Mon Oct  7 09:04:10 2013
New Revision: 329666
URL: http://svnweb.freebsd.org/changeset/ports/329666

Log:
  graphics/ipe: Update patch to support DragonFly
  
  DragonFly 3.4 uses char* prototype for iconv while the upcoming
  DragonFly 3.6 uses const char* iconv prototype like FreeBSD does.
  Modify the iconv patch to allow graphics/ipe to build on both
  DragonFly releases.

Modified:
  head/graphics/ipe/files/patch-ipelib__ipedoc.cpp

Modified: head/graphics/ipe/files/patch-ipelib__ipedoc.cpp
==============================================================================
--- head/graphics/ipe/files/patch-ipelib__ipedoc.cpp	Mon Oct  7 08:54:36 2013	(r329665)
+++ head/graphics/ipe/files/patch-ipelib__ipedoc.cpp	Mon Oct  7 09:04:10 2013	(r329666)
@@ -1,11 +1,23 @@
---- ipelib/ipedoc.cpp.orig
+--- ipelib/ipedoc.cpp.orig	2013-03-15 13:37:02.000000000 +0000
 +++ ipelib/ipedoc.cpp
-@@ -850,7 +850,7 @@
+@@ -41,6 +41,7 @@
+ #include "ipelatex.h"
+ 
+ #include <errno.h>
++#include <sys/param.h>
+ 
+ #ifdef IPE_USE_ICONV
+ #include <iconv.h>
+@@ -850,7 +851,12 @@ int Document::runLatex(String &texLog)
      if (!file)
        return ErrWritingSource;
  
--    char *inbuf = (char *) utf8.data();
++#if defined(__FreeBSD__) || \
++   (defined(__DragonFly__) && __DragonFly_version > 300502)
 +    const char *inbuf = utf8.data();
++#else
+     char *inbuf = (char *) utf8.data();
++#endif
      size_t inbytesleft = utf8.size();
  
      FileStream fstream(file);