From owner-svn-ports-head@FreeBSD.ORG  Mon Oct  7 09:24:13 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 529CBC63;
 Mon,  7 Oct 2013 09:24:13 +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 3FF2E2135;
 Mon,  7 Oct 2013 09:24:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r979ODAR092888;
 Mon, 7 Oct 2013 09:24:13 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r979ODKp092887;
 Mon, 7 Oct 2013 09:24:13 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201310070924.r979ODKp092887@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Mon, 7 Oct 2013 09:24:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329668 - head/textproc/sablotron/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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Oct 2013 09:24:13 -0000

Author: marino
Date: Mon Oct  7 09:24:12 2013
New Revision: 329668
URL: http://svnweb.freebsd.org/changeset/ports/329668

Log:
  textproc/sablotron: Modify iconv patch to support DragonFly
  
  DragonFly 3.4 and DragonFly 3.6 have different iconv prototypes.
  This modifies the FreeBSD support patch to handle the two different
  DragonFly cases as well.

Modified:
  head/textproc/sablotron/files/patch-src__engine__encoding.cpp

Modified: head/textproc/sablotron/files/patch-src__engine__encoding.cpp
==============================================================================
--- head/textproc/sablotron/files/patch-src__engine__encoding.cpp	Mon Oct  7 09:21:13 2013	(r329667)
+++ head/textproc/sablotron/files/patch-src__engine__encoding.cpp	Mon Oct  7 09:24:12 2013	(r329668)
@@ -1,11 +1,23 @@
---- ./src/engine/encoding.cpp.orig	2013-07-30 16:44:46.000000000 +0200
-+++ ./src/engine/encoding.cpp	2013-07-30 16:46:02.000000000 +0200
-@@ -278,7 +278,7 @@
+--- src/engine/encoding.cpp.orig	2003-11-21 08:45:11.000000000 +0000
++++ src/engine/encoding.cpp
+@@ -30,6 +30,7 @@
+  * GPL.
+  */
+ #include <errno.h>
++#include <sys/param.h>
+ 
+ #include "encoding.h"
+ #include "proc.h"
+@@ -278,7 +279,12 @@ eFlag Recoder::conv(Sit S, CDesc cd, con
              errno = 0;
              iconv((iconv_t)(cd -> physCD), 
  #               ifdef SABLOT_ICONV_CAST_OK
--                    (char**)(&inbuf),
++#if defined(__FreeBSD__) || \
++   (defined(__DragonFly__) && __DragonFly_version > 300502)
 +                    (const char**)(&inbuf),
++#else
+                     (char**)(&inbuf),
++#endif
  #               else
                      &inbuf,
  #               endif