From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 26 14:10:35 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3263816A4E2 for ; Mon, 26 Jul 2004 14:10:34 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C1E843D54 for ; Mon, 26 Jul 2004 14:10:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6QEAQBQ058061 for ; Mon, 26 Jul 2004 14:10:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6QEAQjx058055; Mon, 26 Jul 2004 14:10:26 GMT (envelope-from gnats) Resent-Date: Mon, 26 Jul 2004 14:10:26 GMT Resent-Message-Id: <200407261410.i6QEAQjx058055@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Guido Falsi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 156EF16A4CE for ; Mon, 26 Jul 2004 14:09:24 +0000 (GMT) Received: from mail.dada.it (mail2.dada.it [195.110.100.2]) by mx1.FreeBSD.org (Postfix) with SMTP id BD2F443D53 for ; Mon, 26 Jul 2004 14:09:22 +0000 (GMT) (envelope-from mad@madpilot.net) Received: (qmail 17842 invoked from network); 26 Jul 2004 14:09:19 -0000 Received: from unknown (HELO madpilot.net) (195.110.114.197) by mail.dada.it with SMTP; 26 Jul 2004 14:09:19 -0000 Received: (qmail 39330 invoked from network); 26 Jul 2004 14:09:20 -0000 Received: from wedge.madpilot.net (192.168.13.11) by 0 with SMTP; 26 Jul 2004 14:09:20 -0000 Received: from wedge.madpilot.net (localhost.madpilot.net [127.0.0.1]) by wedge.madpilot.net (8.12.11/8.12.11) with ESMTP id i6QE9JQU005118 for ; Mon, 26 Jul 2004 16:09:19 +0200 (CEST) (envelope-from mad@wedge.madpilot.net) Received: (from mad@localhost) by wedge.madpilot.net (8.12.11/8.12.11/Submit) id i6QE9JLE005117; Mon, 26 Jul 2004 16:09:19 +0200 (CEST) (envelope-from mad) Message-Id: <200407261409.i6QE9JLE005117@wedge.madpilot.net> Date: Mon, 26 Jul 2004 16:09:19 +0200 (CEST) From: Guido Falsi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/69619: [maintainer-update] comms/obexapp: really fix "conflict" with mpeg4ip X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Guido Falsi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jul 2004 14:10:36 -0000 >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: