ports/69340: [maintainer-update] fix bluetooth stack detection

[Guido Falsi]

>Number:         69340
>Category:       ports
>Synopsis:       [maintainer-update] fix bluetooth stack detection
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 20 12:00:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
none
>Environment:
System: FreeBSD wedge.madpilot.net 5.2-CURRENT FreeBSD 5.2-CURRENT #3: Tue Jul 13 16:27:54 CEST 2004 root at wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386

>Description:

Fix the detection of the bluetooth stack in this port.

I'm not bumping portrevision since there's no functionality change,
but the installed binaries DO differ.

This is still untested on any architecture other than i386, so any
testing is encouraged!

>How-To-Repeat:
>Fix:

diff -ruN openobex.old/Makefile openobex/Makefile
--- openobex.old/Makefile	Sat Jul 17 19:52:16 2004
+++ openobex/Makefile	Sat Jul 17 19:52:47 2004
@@ -14,8 +14,8 @@
 MAINTAINER=	mad at madpilot.net
 COMMENT=	Open source implementation of the OBEX protocol
 
-WANT_AUTOCONF_VER=	253
-WANT_AUTOMAKE_VER=	14
+USE_AUTOCONF_VER=	253
+USE_AUTOMAKE_VER=	14
 WANT_LIBTOOL_VER=	15
 USE_GMAKE=		yes
 INSTALLS_SHLIB=		yes
diff -ruN openobex.old/files/patch-aclocal.m4 openobex/files/patch-aclocal.m4
--- openobex.old/files/patch-aclocal.m4	Sat Jul 17 19:52:16 2004
+++ openobex/files/patch-aclocal.m4	Sat Jul 17 19:52:47 2004
@@ -1,6 +1,6 @@
---- aclocal.m4.orig	Mon Mar 22 16:19:39 2004
-+++ aclocal.m4	Mon Mar 22 16:22:51 2004
-@@ -67,6 +67,35 @@
+--- aclocal.m4.orig	Wed Jun 16 19:59:04 2004
++++ aclocal.m4	Wed Jun 16 20:26:17 2004
+@@ -67,6 +67,36 @@
  	BLUETOOTH_HOOK([],failure)
  ])
  
@@ -9,7 +9,8 @@
 +AC_DEFUN([FREEBSD_BLUETOOTH_HOOK],[
 +	AC_MSG_CHECKING([for the FreeBSD/netgraph bluetooth support])
 +	echo
-+	AC_CACHE_CHECK(for the struct sockaddr_rfcomm in <netgraph/.../ng_btsocket.h>, ac_cv_have_sockaddr_rfcomm,
++	AC_CHECK_LIB(bluetooth, bt_aton,
++	[AC_CACHE_CHECK(for the struct sockaddr_rfcomm in <netgraph/.../ng_btsocket.h>, ac_cv_have_sockaddr_rfcomm,
 +	[AC_TRY_COMPILE([#include <sys/types.h>
 +			#include <sys/socket.h>
 +			#include <bitstring.h>
@@ -24,10 +25,10 @@
 +		AC_DEFINE(HAVE_BLUETOOTH)
 +		AC_DEFINE(HAVE_BLUETOOTH_NETGRAPH,1,[Compile on FreeBSD])
 +		USE_BLUETOOTH="yes"
-+		AC_CHECK_LIB(bluetooth, bt_aton,
-+		    [LIBS="$LIBS -lbluetooth" AC_DEFINE(HAVE_BT_ATON,1,[Define to 1 if you have the \`bt_aton' function.])])
++		LIBS="$LIBS -lbluetooth"
++		AC_DEFINE(HAVE_BT_ATON,1,[Define to 1 if you have the \`bt_aton' function.])
 +	fi
-+])
++])])
 +
 +AC_DEFUN([FREEBSD_BLUETOOTH_CHECK], [
 +	FREEBSD_BLUETOOTH_HOOK([],failure)
>Release-Note:
>Audit-Trail:
>Unformatted: