From owner-svn-ports-head@FreeBSD.ORG  Sat Jan  3 16:12:01 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 624C1702;
 Sat,  3 Jan 2015 16:12:01 +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 4E8853F2D;
 Sat,  3 Jan 2015 16:12:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t03GC1Nu027209;
 Sat, 3 Jan 2015 16:12:01 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t03GC1vV027207;
 Sat, 3 Jan 2015 16:12:01 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201501031612.t03GC1vV027207@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sat, 3 Jan 2015 16:12:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r376124 - head/deskutils/cairo-dock/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.18-1
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: Sat, 03 Jan 2015 16:12:01 -0000

Author: marino
Date: Sat Jan  3 16:12:00 2015
New Revision: 376124
URL: https://svnweb.freebsd.org/changeset/ports/376124
QAT: https://qat.redports.org/buildarchive/r376124/

Log:
  deskutils/cairo-dock: Unbreak DragonFly
  
  Extend the current patch - DragonFly needs the same handling as FreeBSD.
  Since the entire patch changed and didn't use the UTC timestamp, the
  patch was renamed to confirm with "make makepatch" standards.

Added:
  head/deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c   (contents, props changed)
Deleted:
  head/deskutils/cairo-dock/files/patch-cairo-dock-file-manager.c

Added: head/deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c	Sat Jan  3 16:12:00 2015	(r376124)
@@ -0,0 +1,23 @@
+--- src/gldit/cairo-dock-file-manager.c.orig	2014-10-15 14:16:34 UTC
++++ src/gldit/cairo-dock-file-manager.c
+@@ -21,7 +21,11 @@
+ #include <string.h>      // memset
+ #include <sys/stat.h>    // stat
+ #include <fcntl.h>  // open
++#if defined (__FreeBSD__) || defined (__DragonFly__)
++#include <sys/socket.h>
++#else
+ #include <sys/sendfile.h>  // sendfile
++#endif
+ #include <errno.h>  // errno
+ 
+ #include "gldi-config.h"
+@@ -500,7 +504,7 @@ gboolean cairo_dock_copy_file (const gch
+ 	{
+ 		// perform in-kernel transfer (zero copy to user space)
+ 		int size;
+-		#ifdef __FreeBSD__
++		#if defined (__FreeBSD__) || defined (__DragonFly__)
+ 		size = sendfile (src_fd, dest_fd, 0, stat.st_size, NULL, NULL, 0);
+ 		#else  // Linux >= 2.6.33 for being able to have a regular file as the output socket
+ 		size = sendfile (dest_fd, src_fd, NULL, stat.st_size);  // note the inversion between both calls ^_^;