From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 28 14:40:27 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 B12F416A4CE for ; Tue, 28 Dec 2004 14:40:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7186943D45 for ; Tue, 28 Dec 2004 14:40:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBSEeRhw060970 for ; Tue, 28 Dec 2004 14:40:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBSEeRo8060969; Tue, 28 Dec 2004 14:40:27 GMT (envelope-from gnats) Resent-Date: Tue, 28 Dec 2004 14:40:27 GMT Resent-Message-Id: <200412281440.iBSEeRo8060969@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 DF5AC16A4CE for ; Tue, 28 Dec 2004 14:35:00 +0000 (GMT) Received: from mx.dada.it (mail2.dada.it [195.110.100.2]) by mx1.FreeBSD.org (Postfix) with SMTP id 721C543D48 for ; Tue, 28 Dec 2004 14:34:59 +0000 (GMT) (envelope-from mad@madpilot.net) Received: (qmail 1295 invoked from network); 28 Dec 2004 14:34:55 -0000 Received: from unknown (HELO madpilot.net) (195.110.114.197) by mail.dada.it with SMTP; 28 Dec 2004 14:34:55 -0000 Received: (qmail 19219 invoked from network); 28 Dec 2004 14:34:57 -0000 Received: from wedge.madpilot.net (192.168.13.11) by 0 with SMTP; 28 Dec 2004 14:34:57 -0000 Received: from wedge.madpilot.net (localhost.madpilot.net [127.0.0.1]) by wedge.madpilot.net (8.13.1/8.12.11) with ESMTP id iBSEYuHl095847 for ; Tue, 28 Dec 2004 15:34:56 +0100 (CET) (envelope-from mad@wedge.madpilot.net) Received: (from mad@localhost) by wedge.madpilot.net (8.13.1/8.12.11/Submit) id iBSEYuqu095846; Tue, 28 Dec 2004 15:34:56 +0100 (CET) (envelope-from mad) Message-Id: <200412281434.iBSEYuqu095846@wedge.madpilot.net> Date: Tue, 28 Dec 2004 15:34:56 +0100 (CET) From: Guido Falsi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/75572: [maintainer-update] comm/obexapp: 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: Tue, 28 Dec 2004 14:40:27 -0000 >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@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 + #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 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 + #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 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 + #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 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 + #include + #include +-#include ++#include + #include + #include + #include >Release-Note: >Audit-Trail: >Unformatted: