Add DragonFly support.

XXX When does *stat64 finally die and everyone just uses The Right Way?

4 files changed, 45 insertions, 11 deletions

diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index 4b4960fd96a..36ced543a7c 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.5 2006/06/13 12:36:16 markd Exp $
+$NetBSD: distinfo,v 1.6 2006/06/20 19:08:13 joerg Exp $
 
 SHA1 (k3b-0.12.15.tar.bz2) = 4f2768f6473032fbf6cde2d13b1c2729b7e91e3f
 RMD160 (k3b-0.12.15.tar.bz2) = 9d0ff14b394153d97ef61fcf7b46894ec5d3d511
 Size (k3b-0.12.15.tar.bz2) = 4000389 bytes
-SHA1 (patch-aa) = 700a7081dfb16fe47558b025519415d12aa2031d
+SHA1 (patch-aa) = 5687cff4cfdfddf2258f1e991d67ed262a6a21f2
 SHA1 (patch-ab) = adf633c8ea5b2da95a6c69a2c5abedfd69b79109
 SHA1 (patch-ac) = 3b65ca0ea8e585ce68611c0332a3851a107b68f7
 SHA1 (patch-ad) = 8e111ef2a75595261f95eb533459560f01b6fae7
 SHA1 (patch-ae) = eb0ac8518ae813027aa09961344c0ab1966d4601
 SHA1 (patch-af) = 672150438329827bf89768bfdac9c5a613f02647
-SHA1 (patch-ag) = c89d4310c31ecd991f782cac2fe4927d25a75215
+SHA1 (patch-ag) = 19f37774896e691970527fdf18ce44a2c3228aff
 SHA1 (patch-ah) = 7e8822880873b3f7149a73f0d119fb52098114ff
 SHA1 (patch-ai) = cecb17457caf5bd2039b83eaf6d3e4824f5a2055
 SHA1 (patch-aj) = ebb452a3790b0cf228e3b272490bd9d6cb4c6479
-SHA1 (patch-ak) = 572915dc31f09b6c8c917749524e2042822966c8
+SHA1 (patch-ak) = 471bd5c253aa8aed4c5d9e4f445ad2f4dfa24fd1
 SHA1 (patch-al) = bcc69d3b5b68fad1c46989344b1fb622e7ec6ad4
diff --git a/sysutils/k3b/patches/patch-aa b/sysutils/k3b/patches/patch-aa
index 326da31cb1b..6c52610b25a 100644
--- a/sysutils/k3b/patches/patch-aa
+++ b/sysutils/k3b/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/02/01 00:53:00 markd Exp $
+$NetBSD: patch-aa,v 1.2 2006/06/20 19:08:13 joerg Exp $
 
 --- libk3b/core/k3bglobals.cpp.orig	2005-12-16 02:09:01.000000000 +1300
 +++ libk3b/core/k3bglobals.cpp
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/02/01 00:53:00 markd Exp $
  #include <cmath>
  #include <sys/utsname.h>
  #include <sys/stat.h>
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#define stat64 stat
 +#endif
  
diff --git a/sysutils/k3b/patches/patch-ag b/sysutils/k3b/patches/patch-ag
index ed3194e6f21..84bf1276a11 100644
--- a/sysutils/k3b/patches/patch-ag
+++ b/sysutils/k3b/patches/patch-ag
@@ -1,8 +1,24 @@
-$NetBSD: patch-ag,v 1.1.1.1 2006/02/01 00:53:00 markd Exp $
+$NetBSD: patch-ag,v 1.2 2006/06/20 19:08:13 joerg Exp $
 
---- configure.in.orig	2005-12-16 02:26:31.000000000 +1300
+--- configure.in.orig	2006-03-07 15:04:21.000000000 +0000
 +++ configure.in
-@@ -186,6 +186,10 @@ dnl - check the byte order -
+@@ -170,11 +170,13 @@ AC_TRY_COMPILE([
+ 	[linux_scsi=yes])
+ AC_MSG_RESULT($linux_scsi)
+ 
+-if test "FreeBSD" = `uname -s` ; then
++case "$host_os" in
++freebsd*|dragonfly*)
+ 	# I'll be damned if lousy coding prevents us from running
+ 	# this application.
+ 	linux_scsi=yes
+-fi
++	;;
++esac
+ 
+ if test "x$linux_scsi" = "xno" ; then
+ 	DO_NOT_COMPILE="$DO_NOT_COMPILE k3b"
+@@ -186,6 +188,10 @@ dnl - check the byte order -
  dnl this will define WORDS_BIGENDIAN or do nothing
  AC_C_BIGENDIAN()
  
@@ -13,3 +29,21 @@ $NetBSD: patch-ag,v 1.1.1.1 2006/02/01 00:53:00 markd Exp $
  dnl === Ogg Vorbis Test - Begin ===
  AC_ARG_WITH(
  	oggvorbis, 
+@@ -438,10 +444,14 @@ AM_CONDITIONAL(with_k3bsetup1, [test x$c
+ # Extra SCSI support libs can go in CAM_LIB, and are linked into
+ # libk3bdevice. For Linux, nothing is needed. FreeBSD requires -lcam
+ # (which is in base, so no test is needed).
+-CAM_LIB=""
+-if test "FreeBSD" = `uname -s` ; then
++case "$host_os" in
++freebsd* | dragonfly*)
+ 	CAM_LIB="-lcam"
+-fi
++	;;
++*)
++	CAM_LIB=""
++	;;
++esac
+ AC_SUBST(CAM_LIB)
+ 
+ 
diff --git a/sysutils/k3b/patches/patch-ak b/sysutils/k3b/patches/patch-ak
index ab9a4e101d5..3ff02391565 100644
--- a/sysutils/k3b/patches/patch-ak
+++ b/sysutils/k3b/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2006/02/01 00:53:00 markd Exp $
+$NetBSD: patch-ak,v 1.2 2006/06/20 19:08:13 joerg Exp $
 
 --- libk3b/projects/datacd/k3bfileitem.h.orig	2005-12-16 02:09:02.000000000 +1300
 +++ libk3b/projects/datacd/k3bfileitem.h
@@ -6,7 +6,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/02/01 00:53:00 markd Exp $
  #include <qstring.h>
  
  #include <sys/stat.h>
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#define stat64 stat
 +#define lstat64 lstat
 +#endif