summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comms/obexftp/Makefile6
-rw-r--r--comms/obexftp/distinfo22
-rw-r--r--comms/obexftp/patches/patch-aa12
-rw-r--r--comms/obexftp/patches/patch-ab4
-rw-r--r--comms/obexftp/patches/patch-ac4
-rw-r--r--comms/obexftp/patches/patch-ad4
-rw-r--r--comms/obexftp/patches/patch-ae4
-rw-r--r--comms/obexftp/patches/patch-af4
-rw-r--r--comms/obexftp/patches/patch-ag4
-rw-r--r--comms/obexftp/patches/patch-ai4
-rw-r--r--comms/obexftp/patches/patch-aj4
-rw-r--r--comms/obexftp/patches/patch-ak4
12 files changed, 38 insertions, 38 deletions
diff --git a/comms/obexftp/Makefile b/comms/obexftp/Makefile
index ca33df709b5..7912a0af649 100644
--- a/comms/obexftp/Makefile
+++ b/comms/obexftp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/05/22 07:16:58 plunky Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/20 05:56:02 hasso Exp $
#
DISTNAME= obexftp-0.20
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openobex/}
EXTRACT_SUFX= .tar.bz2
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --disable-swig
.include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h))
+.if ((${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h)) || ${OPSYS} == "DragonFly")
CPPFLAGS+= -DCOMPAT_BLUEZ -DSDP_COMPAT
.endif
diff --git a/comms/obexftp/distinfo b/comms/obexftp/distinfo
index 4ed527b5aa6..7dca8d9e400 100644
--- a/comms/obexftp/distinfo
+++ b/comms/obexftp/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.6 2006/12/07 14:22:18 xtraeme Exp $
+$NetBSD: distinfo,v 1.7 2009/07/20 05:56:02 hasso Exp $
SHA1 (obexftp-0.20.tar.bz2) = 0b3a7d2aeb0dbd24d75761a7e59f42f46ea5ef82
RMD160 (obexftp-0.20.tar.bz2) = ded5cf4d95eac77d5f6ee0a39f3789eb962534ed
Size (obexftp-0.20.tar.bz2) = 351641 bytes
-SHA1 (patch-aa) = e70d2fd0655a95a43f3a9440e5a2e2ab91a2ed54
-SHA1 (patch-ab) = d4693413a992f53f6aca92d9e920185c1b5e4f0e
-SHA1 (patch-ac) = d06b6be98745778e2ce8e97762c102d4dbccecfc
-SHA1 (patch-ad) = 8c3b99cbc2f45fe039aae000aeebb2d5779355f9
-SHA1 (patch-ae) = 276fa421e2f20784cbcb873b0ce6870bef71d033
-SHA1 (patch-af) = 4de53a6ec0d711f948980cdfdd4adea3928b64bd
-SHA1 (patch-ag) = e61fdbba340af591318b1aa3b70272a969e01e70
+SHA1 (patch-aa) = 65925a0df323cd391dab48f45fcf6c99dbcc8fbb
+SHA1 (patch-ab) = 0a0c2cbcfc9449df48e8340dba1593d5593129f5
+SHA1 (patch-ac) = 6b44406a04ea81eb615d6ed9ffebf2db27008e35
+SHA1 (patch-ad) = 00ada8c88756d3201b02e5a0b9467a7ee1ad0f50
+SHA1 (patch-ae) = d08fd3b4aa5e2f61eda5ea6d3f6656f8b036af30
+SHA1 (patch-af) = f1e96b8a15a4fec69b81d19635a674ee307d31c1
+SHA1 (patch-ag) = 7a3f10354e8a86022cac360b8a36198d9e7449ab
SHA1 (patch-ah) = c0fe5bd78e7614a7eb6adb7154676fd9bde7a31c
-SHA1 (patch-ai) = 2e77a0cd8998f3a558a2587b5cbdc7c0e080bc0f
-SHA1 (patch-aj) = c563733a616ec0ad5b94a3ff8de5e3a2e91ccd5b
-SHA1 (patch-ak) = 3131a38f66bec5d0bba563e72ad2a75f21e65b99
+SHA1 (patch-ai) = 8baf3463303156e890316622ddeb011842acaa85
+SHA1 (patch-aj) = 26f6509d26aaa893fe6018bd048135fb077e0b9c
+SHA1 (patch-ak) = bdef026206a0dca2c4781b06bbdfdd90f1c934f6
SHA1 (patch-al) = 1f2dd6ed302711f17e33584cc34f6f674a6973c7
diff --git a/comms/obexftp/patches/patch-aa b/comms/obexftp/patches/patch-aa
index ee36db3cd47..56cc11abef9 100644
--- a/comms/obexftp/patches/patch-aa
+++ b/comms/obexftp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2006/12/07 14:22:18 xtraeme Exp $
+$NetBSD: patch-aa,v 1.5 2009/07/20 05:56:03 hasso Exp $
--- aclocal.m4.orig 2006-05-16 16:50:36.000000000 +0200
+++ aclocal.m4 2006-10-22 10:07:38.000000000 +0200
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.4 2006/12/07 14:22:18 xtraeme Exp $
#ifdef __FreeBSD__
#include <sys/types.h>
#include <bluetooth.h>
-+ #elif defined(__NetBSD__)
++ #elif defined(__NetBSD__) || defined(__DragonFly__)
+ #include <bluetooth.h>
+ #include <netbt/rfcomm.h>
#else /* Linux */
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.4 2006/12/07 14:22:18 xtraeme Exp $
#ifdef __FreeBSD__
bdaddr_t bdaddr;
struct sockaddr_rfcomm addr;
-+ #elif defined(__NetBSD__)
++ #elif defined(__NetBSD__) || defined(__DragonFly__)
+ bdaddr_t bdaddr;
+ struct sockaddr_bt addr;
#else /* Linux */
@@ -34,14 +34,14 @@ $NetBSD: patch-aa,v 1.4 2006/12/07 14:22:18 xtraeme Exp $
AC_MSG_CHECKING(for Bluetooth SDP support)
AC_TRY_COMPILE( [
-+ #ifdef __NetBSD__
++ #if defined(__NetBSD__) || defined(__DragonFly__)
+ #include <bluetooth.h>
+ #include <sdp.h>
+ #else
#include <bluetooth/sdp.h>
+ #endif
],[
-+ #ifdef __NetBSD__
++ #if defined(__NetBSD__) || defined(__DragonFly__)
+ sdp_attr_t attr;
+ #else
sdp_list_t sdplist;
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.4 2006/12/07 14:22:18 xtraeme Exp $
AC_MSG_CHECKING(for USB support)
AC_TRY_COMPILE( [
-+ #ifdef __NetBSD__
++ #if defined(__NetBSD__) || defined(__DragonFly__)
+ #include <bluetooth.h>
+ #else
+ #include <bluetooth/bluetooth.h>
diff --git a/comms/obexftp/patches/patch-ab b/comms/obexftp/patches/patch-ab
index 496247e04a0..2519b9a421a 100644
--- a/comms/obexftp/patches/patch-ab
+++ b/comms/obexftp/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ab,v 1.3 2009/07/20 05:56:03 hasso Exp $
--- multicobex/multi_cobex.c.orig 2005-11-24 15:55:11.000000000 +0100
+++ multicobex/multi_cobex.c 2006-07-09 12:21:14.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
#endif
+#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <bluetooth.h>
+#else
+#include <bluetooth/bluetooth.h>
diff --git a/comms/obexftp/patches/patch-ac b/comms/obexftp/patches/patch-ac
index 014edff2d50..c90278783ea 100644
--- a/comms/obexftp/patches/patch-ac
+++ b/comms/obexftp/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ac,v 1.3 2009/07/20 05:56:03 hasso Exp $
--- obexftp/object.h.orig 2005-09-13 16:53:20.000000000 +0200
+++ obexftp/object.h 2006-07-09 12:45:14.000000000 +0200
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+#include <sys/types.h>
+
+#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <bluetooth.h>
+#else
+#include <bluetooth/bluetooth.h>
diff --git a/comms/obexftp/patches/patch-ad b/comms/obexftp/patches/patch-ad
index c017c183b75..b62c05fc54e 100644
--- a/comms/obexftp/patches/patch-ad
+++ b/comms/obexftp/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ad,v 1.3 2009/07/20 05:56:03 hasso Exp $
--- obexftp/client.h.orig 2006-01-11 16:22:51.000000000 +0100
+++ obexftp/client.h 2006-07-09 12:39:10.000000000 +0200
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
#include <time.h>
+
+#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <bluetooth.h>
+#else
+#include <bluetooth/bluetooth.h>
diff --git a/comms/obexftp/patches/patch-ae b/comms/obexftp/patches/patch-ae
index a39ed4d091d..f78954c7ffe 100644
--- a/comms/obexftp/patches/patch-ae
+++ b/comms/obexftp/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ae,v 1.3 2009/07/20 05:56:03 hasso Exp $
--- obexftp/client.c.orig 2006-07-09 12:37:02.000000000 +0200
+++ obexftp/client.c 2006-07-09 12:38:10.000000000 +0200
@@ -6,7 +6,7 @@ $NetBSD: patch-ae,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
#ifdef __FreeBSD__
#include <sys/types.h>
#include <bluetooth.h>
-+#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__DragonFly__)
+#include <sys/types.h>
+#include <bluetooth.h>
+#include <netbt/rfcomm.h>
diff --git a/comms/obexftp/patches/patch-af b/comms/obexftp/patches/patch-af
index b4aaadb53e2..ed577192e0e 100644
--- a/comms/obexftp/patches/patch-af
+++ b/comms/obexftp/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-af,v 1.3 2009/07/20 05:56:03 hasso Exp $
--- obexftp/obexftp_io.c.orig 2006-07-09 12:40:32.000000000 +0200
+++ obexftp/obexftp_io.c 2006-07-09 12:41:36.000000000 +0200
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+#endif
+
+#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <bluetooth.h>
+#else
+#include <bluetooth/bluetooth.h>
diff --git a/comms/obexftp/patches/patch-ag b/comms/obexftp/patches/patch-ag
index 5275ad7c970..f018bbe0486 100644
--- a/comms/obexftp/patches/patch-ag
+++ b/comms/obexftp/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ag,v 1.3 2009/07/20 05:56:03 hasso Exp $
--- obexftp/cache.c.orig 2006-07-09 12:43:21.000000000 +0200
+++ obexftp/cache.c 2006-07-09 12:43:56.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
#endif
+#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <bluetooth.h>
+#else
+#include <bluetooth/bluetooth.h>
diff --git a/comms/obexftp/patches/patch-ai b/comms/obexftp/patches/patch-ai
index 5270237fbb6..79ac585c893 100644
--- a/comms/obexftp/patches/patch-ai
+++ b/comms/obexftp/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2006/07/24 17:07:15 xtraeme Exp $
+$NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $
--- apps/obexftpd.c.orig 2006-04-13 07:57:55.000000000 +0200
+++ apps/obexftpd.c
@@ -18,7 +18,7 @@ $NetBSD: patch-ai,v 1.2 2006/07/24 17:07:15 xtraeme Exp $
#endif /*_WIN32*/
+#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <bluetooth.h>
+#else
+#include <bluetooth/bluetooth.h>
diff --git a/comms/obexftp/patches/patch-aj b/comms/obexftp/patches/patch-aj
index 0a6d1e41d62..49638f89d82 100644
--- a/comms/obexftp/patches/patch-aj
+++ b/comms/obexftp/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-aj,v 1.2 2009/07/20 05:56:03 hasso Exp $
--- apps/bt_discovery.c.orig 2006-01-11 17:27:35.000000000 +0000
+++ apps/bt_discovery.c
@@ -6,7 +6,7 @@ $NetBSD: patch-aj,v 1.1 2006/07/17 12:29:57 xtraeme Exp $
#include <sys/types.h>
#include <sys/socket.h>
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <bluetooth.h>
+#include <err.h>
+#include <errno.h>
diff --git a/comms/obexftp/patches/patch-ak b/comms/obexftp/patches/patch-ak
index d58158c5b5f..045e3852a32 100644
--- a/comms/obexftp/patches/patch-ak
+++ b/comms/obexftp/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2006/07/24 17:07:15 xtraeme Exp $
+$NetBSD: patch-ak,v 1.3 2009/07/20 05:56:03 hasso Exp $
--- apps/obexftp_sdp.c.orig 2006-03-08 00:34:15.000000000 +0100
+++ apps/obexftp_sdp.c
@@ -15,7 +15,7 @@ $NetBSD: patch-ak,v 1.2 2006/07/24 17:07:15 xtraeme Exp $
#include <sys/types.h>
#include <sys/socket.h>
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <bluetooth.h>
+#include <sdp.h>
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-24 10:56:35 +0000