Needs intltool. Add DragonFly support. The latter from walt on

DragonFly's submit list.

6 files changed, 82 insertions, 9 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 2ad417b4175..ff120a6fabc 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/05/10 16:40:03 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2006/06/30 02:54:11 joerg Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.14.1
@@ -51,5 +51,6 @@ BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.13.4
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index ad96358eed9..687ecda1333 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.17 2006/04/12 20:11:25 drochner Exp $
+$NetBSD: distinfo,v 1.18 2006/06/30 02:54:11 joerg Exp $
 
 SHA1 (nautilus-cd-burner-2.14.1.tar.bz2) = 585a95c4f053cdbaec7d09e399d62dbb7cd6cf11
 RMD160 (nautilus-cd-burner-2.14.1.tar.bz2) = 5bae865ee721dffecdcd26b51b0903975136c42a
 Size (nautilus-cd-burner-2.14.1.tar.bz2) = 672957 bytes
-SHA1 (patch-ab) = 03b8ca6d56aad88c503e077ee102c8bb8c0abcad
-SHA1 (patch-ac) = e7fe0e31dddd5612717d423e88cecea0eb449bc6
+SHA1 (patch-aa) = ac48a5273436eb7bbe6b9ba24a413da6dfadb53e
+SHA1 (patch-ab) = 06428fbc8c5ce065399da0447875d4e2e71093f4
+SHA1 (patch-ac) = 57fc2a4bb747556831f85120a7c65367a58b30dd
 SHA1 (patch-ae) = fcb78f12175441dba3fcdb729309a16e2d05d866
 SHA1 (patch-af) = 60b32582bcb95ee063d6c9e0f48f595af0a3b599
+SHA1 (patch-ag) = 3b822955378ed562226e0876f4f876f5b1bb7047
diff --git a/sysutils/nautilus-cd-burner/patches/patch-aa b/sysutils/nautilus-cd-burner/patches/patch-aa
new file mode 100644
index 00000000000..79c85399ff5
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.6 2006/06/30 02:54:11 joerg Exp $
+
+--- make-iso.c.orig	2006-06-18 01:06:45.000000000 -0700
++++ make-iso.c
+@@ -26,7 +26,7 @@
+ 
+ #include "config.h"
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #else
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ab b/sysutils/nautilus-cd-burner/patches/patch-ab
index 31a95f38c74..14255d12c3b 100644
--- a/sysutils/nautilus-cd-burner/patches/patch-ab
+++ b/sysutils/nautilus-cd-burner/patches/patch-ab
@@ -1,8 +1,26 @@
-$NetBSD: patch-ab,v 1.4 2005/10/16 12:12:33 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2006/06/30 02:54:11 joerg Exp $
 
---- nautilus-burn-drive.c.orig	2005-10-03 15:55:58.000000000 +0200
+--- nautilus-burn-drive.c.orig	2006-03-22 09:08:38.000000000 -0800
 +++ nautilus-burn-drive.c
-@@ -481,7 +481,6 @@ get_disc_type (const char *dev_path)
+@@ -44,7 +44,7 @@
+ #include <scsi/sg.h>
+ #endif /* __linux__ */
+ 
+-#ifdef __FreeBSD__
++#if defined (__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/cdio.h>
+ #include <sys/cdrio.h>
+ #include <camlib.h>
+@@ -163,7 +163,7 @@ fill_write_speeds (NautilusBurnDrive *dr
+ 	}
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #define get_ioctl_handle_fd(x) (((struct cam_device *)x)->fd)
+ 
+@@ -687,7 +687,6 @@ get_disc_type (const char *dev_path)
  	struct cd_toc_entry              entry;
  	int                              i;
  #endif
@@ -10,3 +28,21 @@ $NetBSD: patch-ab,v 1.4 2005/10/16 12:12:33 jmmv Exp $
  #ifndef CDROM_DATA_TRACK
  #define CDROM_DATA_TRACK 4
  #endif
+@@ -2673,7 +2672,7 @@ linux_scan (gboolean recorder_only)
+ 	return drives_list;
+ }
+ 
+-#elif defined (__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ static GList *
+ freebsd_scan (gboolean recorder_only)
+@@ -2918,7 +2917,7 @@ nautilus_burn_drive_get_list (gboolean r
+ 	if (drives == NULL) {
+ #if defined (__linux__)
+ 		drives = linux_scan (recorder_only);
+-#elif defined (__FreeBSD__)
++#elif defined (__FreeBSD__) || defined(__DragonFly__)
+ 		drives = freebsd_scan (recorder_only);
+ #else
+ 		drives = cdrecord_scan (recorder_only);
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ac b/sysutils/nautilus-cd-burner/patches/patch-ac
index cc17f07ebd8..60126badd0b 100644
--- a/sysutils/nautilus-cd-burner/patches/patch-ac
+++ b/sysutils/nautilus-cd-burner/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2005/03/23 14:02:52 adam Exp $
+$NetBSD: patch-ac,v 1.3 2006/06/30 02:54:11 joerg Exp $
 
---- transport.hxx.orig	2005-02-22 19:43:11.000000000 +0000
+--- transport.hxx.orig	2005-02-22 16:42:41.000000000 -0800
 +++ transport.hxx
 @@ -441,7 +441,11 @@ public:
      // mounted, so that it could as well just return 0;
@@ -14,6 +14,15 @@ $NetBSD: patch-ac,v 1.2 2005/03/23 14:02:52 adam Exp $
        int            ret=0,mntsize,i;
  
  	if (f==-1) f=fd;
+@@ -470,7 +474,7 @@ public:
+     {	return 1;   }
+ };
+ 
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #include <sys/ioctl.h>
+ #include <camlib.h>
 @@ -637,7 +641,11 @@ public:
      }
      int umount(int f=-1)
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ag b/sysutils/nautilus-cd-burner/patches/patch-ag
new file mode 100644
index 00000000000..424825e0db2
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2006/06/30 02:54:11 joerg Exp $
+
+--- mapping-protocol.c.orig	2006-06-27 18:17:40.000000000 +0000
++++ mapping-protocol.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <sys/time.h>
+ 
+ #include "mapping-protocol.h"
+