ports/108428: [maintainer update] comms/obexapp: fix conflict with mpeg4ip

[Guido Falsi]

>Number:         108428
>Category:       ports
>Synopsis:       [maintainer update] comms/obexapp: fix conflict with mpeg4ip
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 27 14:00:32 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
none
>Environment:
System: FreeBSD wedge.madpilot.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #31: Fri Dec 22 21:36:47 CET 2006 root at wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386

>Description:

There is an include conflict between this port and mpeg4ip. A fix
was committed some time ago and remove with the last commit to this
port. Here is that fix back.

Reported by: Bruce M Simpson <bms at incunabulum.net>

Added files:

files/patch-main.c
files/patch-sdp.c
files/patch-server.c
files/patch-transport.c

>How-To-Repeat:

cd /usr/ports/multimedia/mpeg4ip && make install
cd /usr/ports/comms/obexapp && make install

>Fix:

diff -ruN obexapp.old/files/patch-main.c obexapp/files/patch-main.c
--- obexapp.old/files/patch-main.c	Thu Jan  1 01:00:00 1970
+++ obexapp/files/patch-main.c	Sat Jan 27 13:49:42 2007
@@ -0,0 +1,11 @@
+--- main.c.orig	Sat Jan 27 13:47:12 2007
++++ main.c	Sat Jan 27 13:48:24 2007
+@@ -36,7 +36,7 @@
+ #include <libgen.h>
+ #include <limits.h>
+ #include <obex.h>
+-#include <sdp.h>
++#include </usr/include/sdp.h>
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <stdio.h>
diff -ruN obexapp.old/files/patch-sdp.c obexapp/files/patch-sdp.c
--- obexapp.old/files/patch-sdp.c	Thu Jan  1 01:00:00 1970
+++ obexapp/files/patch-sdp.c	Sat Jan 27 13:49:55 2007
@@ -0,0 +1,11 @@
+--- sdp.c.orig	Sat Jan 27 13:47:19 2007
++++ sdp.c	Sat Jan 27 13:48:39 2007
+@@ -31,7 +31,7 @@
+ 
+ #include <bluetooth.h>
+ #include <errno.h>
+-#include <sdp.h>
++#include </usr/include/sdp.h>
+ #include <stdio.h>
+ 
+ #undef	PROTOCOL_DESCRIPTOR_LIST_BUFFER_SIZE
diff -ruN obexapp.old/files/patch-server.c obexapp/files/patch-server.c
--- obexapp.old/files/patch-server.c	Thu Jan  1 01:00:00 1970
+++ obexapp/files/patch-server.c	Sat Jan 27 13:50:14 2007
@@ -0,0 +1,11 @@
+--- server.c.orig	Sat Jan 27 13:47:27 2007
++++ server.c	Sat Jan 27 13:48:51 2007
+@@ -41,7 +41,7 @@
+ #include <limits.h>
+ #include <obex.h>
+ #include <pwd.h>
+-#include <sdp.h>
++#include </usr/include/sdp.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff -ruN obexapp.old/files/patch-transport.c obexapp/files/patch-transport.c
--- obexapp.old/files/patch-transport.c	Thu Jan  1 01:00:00 1970
+++ obexapp/files/patch-transport.c	Sat Jan 27 13:50:51 2007
@@ -0,0 +1,11 @@
+--- transport.c.orig	Sat Jan 27 13:47:37 2007
++++ transport.c	Sat Jan 27 13:49:09 2007
+@@ -35,7 +35,7 @@
+ #include <errno.h>
+ #include <obex.h>
+ #include <fcntl.h>
+-#include <sdp.h>
++#include </usr/include/sdp.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <syslog.h>
>Release-Note:
>Audit-Trail:
>Unformatted: