Date: Mon, 26 Jul 2004 16:09:19 +0200 (CEST) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69619: [maintainer-update] comms/obexapp: really fix "conflict" with mpeg4ip Message-ID: <200407261409.i6QE9JLE005117@wedge.madpilot.net> Resent-Message-ID: <200407261410.i6QEAQjx058055@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69619
>Category: ports
>Synopsis: [maintainer-update] comms/obexapp: really 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: Mon Jul 26 14:10:25 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 #2: Thu Jul 22 17:02:40 CEST 2004 root@wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386
>Description:
Really fix problem with includes shadowing when mpeg4ip is installed. previous fix did not work. My error, sorry
again reported by Panagiotis Astithas, thanks :)
>How-To-Repeat:
>Fix:
diff -ruN obexapp.old/files/patch-Makefile obexapp/files/patch-Makefile
--- obexapp.old/files/patch-Makefile Mon Jul 26 15:52:11 2004
+++ obexapp/files/patch-Makefile Mon Jul 26 15:56:49 2004
@@ -1,5 +1,5 @@
--- Makefile.orig Fri Apr 9 23:09:09 2004
-+++ Makefile Fri Jul 23 19:17:16 2004
++++ Makefile Mon Jul 26 15:54:36 2004
@@ -1,8 +1,10 @@
# $Id: Makefile,v 1.7 2004/04/09 21:09:09 max Exp $
# $FreeBSD$
@@ -13,14 +13,13 @@
PROG= obexapp
MAN1= obexapp.1
-@@ -13,8 +15,8 @@
+@@ -13,8 +15,7 @@
DEBUG_FLAGS= -g
-CFLAGS= -I/usr/local/include \
- -I/usr/local/include/openobex
-+CFLAGS= -I/usr/local/include/openobex \
-+ -I/usr/local/include
++CFLAGS= -I/usr/local/include/openobex
DPADD= ${LIBBLUETOOTH} ${LIBSDP} ${LIBBSDXML}
LDADD= -L/usr/lib -L/usr/local/lib \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407261409.i6QE9JLE005117>