ports/75572: [maintainer-update] comm/obexapp: fix conflict with mpeg4ip

[Guido Falsi]

>Number:         75572
>Category:       ports
>Synopsis:       [maintainer-update] comm/obexapp: fix conflict with mpeg4ip
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 28 14:40:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
none
>Environment:
System: FreeBSD wedge.madpilot.net 5.3-STABLE FreeBSD 5.3-STABLE #26: Fri Dec 17 22:56:58 CET 2004 root at wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386

>Description:

hack to fix build when mpeg4ip is installed, due to common "sdp.h" include in system and the port.

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

>Fix:

diff -ruN obexapp.old/files/patch-Makefile obexapp/files/patch-Makefile
--- obexapp.old/files/patch-Makefile	Tue Dec 28 14:57:29 2004
+++ obexapp/files/patch-Makefile	Tue Dec 28 15:23:16 2004
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Dec 24 12:51:54 2004
-+++ Makefile	Fri Dec 24 12:53:13 2004
+--- Makefile.orig	Fri Dec 24 00:09:48 2004
++++ Makefile	Tue Dec 28 15:23:07 2004
 @@ -1,11 +1,14 @@
  # $Id: Makefile,v 1.9 2004/12/23 23:09:48 max Exp $
  # $FreeBSD$
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	Tue Dec 28 15:24:11 2004
@@ -0,0 +1,11 @@
+--- main.c.orig	Tue Dec 28 15:23:30 2004
++++ main.c	Tue Dec 28 15:23:48 2004
+@@ -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	Tue Dec 28 15:25:03 2004
@@ -0,0 +1,11 @@
+--- sdp.c.orig	Tue Dec 28 15:24:24 2004
++++ sdp.c	Tue Dec 28 15:24:42 2004
+@@ -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	Tue Dec 28 15:26:30 2004
@@ -0,0 +1,11 @@
+--- server.c.orig	Tue Dec 28 15:25:33 2004
++++ server.c	Tue Dec 28 15:25:45 2004
+@@ -40,7 +40,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	Tue Dec 28 15:27:22 2004
@@ -0,0 +1,11 @@
+--- transport.c.orig	Tue Dec 28 15:26:50 2004
++++ transport.c	Tue Dec 28 15:27:03 2004
+@@ -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: