svn commit: r376124 - head/deskutils/cairo-dock/files

[John Marino]

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 ^_^;