[pkgsrc/trunk]: pkgsrc/comms/openobex Unbreak on platforms where bluetooth wa...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1ab9ae93f24
branches:  trunk
changeset: 515525:a1ab9ae93f24
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Jul 03 19:18:57 2006 +0000

description:
Unbreak on platforms where bluetooth wasn't detected, reported by
dillo@.

diffstat:

 comms/openobex/Makefile         |  15 ++++++++++-----
 comms/openobex/distinfo         |   3 +--
 comms/openobex/patches/patch-af |  13 -------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diffs (70 lines):

diff -r fe7768235ce7 -r a1ab9ae93f24 comms/openobex/Makefile
--- a/comms/openobex/Makefile   Mon Jul 03 19:07:59 2006 +0000
+++ b/comms/openobex/Makefile   Mon Jul 03 19:18:57 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/07/02 18:16:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2006/07/03 19:18:57 xtraeme Exp $
 #
 
 DISTNAME=      openobex-1.0.1
@@ -10,20 +10,25 @@
 HOMEPAGE=      http://openobex.sourceforge.net/
 COMMENT=       Implementation of the Object Exchange (OBEX) protocol
 
-GNU_CONFIGURE= YES
-USE_TOOLS+=    gmake
-USE_LIBTOOL=   YES
+GNU_CONFIGURE= yes
+USE_TOOLS+=    gmake pkg-config
+USE_LIBTOOL=   yes
+
+PKGCONFIG_OVERRIDE=    openobex-config.in
 
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h))
-SUBST_CLASSES+=                bt
+SUBST_CLASSES+=                bt bt2
 SUBST_STAGE.bt=                post-patch
 SUBST_FILES.bt=                configure
 SUBST_SED.bt=          -e "s|bluetooth/bluetooth.h|bluetooth.h|g"
 SUBST_SED.bt+=         -e "s|bluetooth/rfcomm.h|netbt/rfcomm.h|g"
 SUBST_SED.bt+=         -e "s|sockaddr_rc|sockaddr_bt|g"
 SUBST_MESSAGE.bt=      Fixing bluetooth detection.
+SUBST_STAGE.bt2=       post-patch
+SUBST_FILES.bt2=       src/obex.h
+SUBST_SED.bt2=         -e "s|ifndef SOL_RFCOMM|ifdef SOL_RFCOMM|"
 
 # bacpy() and friends
 CPPFLAGS+=             -DCOMPAT_BLUEZ
diff -r fe7768235ce7 -r a1ab9ae93f24 comms/openobex/distinfo
--- a/comms/openobex/distinfo   Mon Jul 03 19:07:59 2006 +0000
+++ b/comms/openobex/distinfo   Mon Jul 03 19:18:57 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2006/07/02 18:16:53 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2006/07/03 19:18:57 xtraeme Exp $
 
 SHA1 (openobex-1.0.1.tar.gz) = aa73b3f9e345088e8f1c070e0e727f586820d20e
 RMD160 (openobex-1.0.1.tar.gz) = 70dc7d2e38b819af0c35ccb26f806b7aa7682b0e
@@ -8,4 +8,3 @@
 SHA1 (patch-ac) = 8b9ca12b6c84ab743590dc16689ba672ffb5b46b
 SHA1 (patch-ad) = 4a9c02f6e899d1740504ec03bda3301915018ae3
 SHA1 (patch-ae) = c25191fcded6e87d2bcca17a2ae77720c79646a4
-SHA1 (patch-af) = 165602889a3fbc9c3bf98390bbf3d5c85e55bebc
diff -r fe7768235ce7 -r a1ab9ae93f24 comms/openobex/patches/patch-af
--- a/comms/openobex/patches/patch-af   Mon Jul 03 19:07:59 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/07/02 18:16:53 xtraeme Exp $
-
---- src/obex.h.orig    2006-07-02 19:31:28.000000000 +0200
-+++ src/obex.h 2006-07-02 19:31:36.000000000 +0200
-@@ -51,7 +51,7 @@
- typedef void* obex_object_t;
- typedef void (*obex_event_t)(obex_t *handle, obex_object_t *obj, int mode, int event, int obex_cmd, int obex_rsp);
- // This is to workaround compilation without Bluetooth support. - Jean II
--#ifndef SOL_RFCOMM
-+#ifdef SOL_RFCOMM
- typedef char* bdaddr_t;
- #endif
-