From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 27 14:00:34 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 00C9016A41A for ; Sat, 27 Jan 2007 14:00:33 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 0E5EE13C4BC for ; Sat, 27 Jan 2007 14:00:33 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l0RE0Wew039299 for ; Sat, 27 Jan 2007 14:00:32 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0RE0WWK039298; Sat, 27 Jan 2007 14:00:32 GMT (envelope-from gnats) Resent-Date: Sat, 27 Jan 2007 14:00:32 GMT Resent-Message-Id: <200701271400.l0RE0WWK039298@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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6BF9E16A402 for ; Sat, 27 Jan 2007 13:59:38 +0000 (UTC) (envelope-from mad@madpilot.net) Received: from smtpi2.ngi.it (smtpi2.ngi.it [88.149.128.21]) by mx1.freebsd.org (Postfix) with ESMTP id 060DD13C483 for ; Sat, 27 Jan 2007 13:59:37 +0000 (UTC) (envelope-from mad@madpilot.net) Received: from madpilot.net (81-174-34-189.f5.ngi.it [81.174.34.189]) by smtpi2.ngi.it (8.13.8/8.13.8) with SMTP id l0RD1NfX029043 for ; Sat, 27 Jan 2007 14:01:23 +0100 Received: (qmail 78110 invoked from network); 27 Jan 2007 13:01:22 -0000 Received: from wedge.madpilot.net (192.168.13.11) by madpilot.net with SMTP; 27 Jan 2007 13:01:22 -0000 Received: from wedge.madpilot.net (localhost.madpilot.net [127.0.0.1]) by wedge.madpilot.net (8.13.8/8.13.8) with ESMTP id l0RD0q62019668; Sat, 27 Jan 2007 14:00:52 +0100 (CET) (envelope-from mad@wedge.madpilot.net) Received: (from mad@localhost) by wedge.madpilot.net (8.13.8/8.13.8/Submit) id l0RD0qKX019667; Sat, 27 Jan 2007 14:00:52 +0100 (CET) (envelope-from mad) Message-Id: <200701271300.l0RD0qKX019667@wedge.madpilot.net> Date: Sat, 27 Jan 2007 14:00:52 +0100 (CET) From: Guido Falsi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Bruce M Simpson , Maksim Yevmenkin Subject: ports/108428: [maintainer update] comms/obexapp: fix conflict with mpeg4ip X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 27 Jan 2007 14:00:34 -0000 >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@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 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 + #include + #include +-#include ++#include + #include + #include + #include 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 + #include +-#include ++#include + #include + + #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 + #include + #include +-#include ++#include + #include + #include + #include 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 + #include + #include +-#include ++#include + #include + #include + #include >Release-Note: >Audit-Trail: >Unformatted: