From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 23 13:40:13 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3AA0D1065674 for ; Mon, 23 Jul 2012 13:40:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 13E998FC1B for ; Mon, 23 Jul 2012 13:40:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6NDeCrQ017819 for ; Mon, 23 Jul 2012 13:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6NDeCNE017818; Mon, 23 Jul 2012 13:40:12 GMT (envelope-from gnats) Resent-Date: Mon, 23 Jul 2012 13:40:12 GMT Resent-Message-Id: <201207231340.q6NDeCNE017818@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, William Waites Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4C113106566C for ; Mon, 23 Jul 2012 13:34:51 +0000 (UTC) (envelope-from ww@gallows.inf.ed.ac.uk) Received: from nougat.ucs.ed.ac.uk (nougat.ucs.ed.ac.uk [129.215.13.205]) by mx1.freebsd.org (Postfix) with ESMTP id BA16F8FC0A for ; Mon, 23 Jul 2012 13:34:50 +0000 (UTC) Received: from gallows.inf.ed.ac.uk (gallows.inf.ed.ac.uk [129.215.164.39]) by nougat.ucs.ed.ac.uk (8.13.8/8.13.4) with ESMTP id q6ND0Lcp004271 for ; Mon, 23 Jul 2012 14:00:27 +0100 (BST) Received: by gallows.inf.ed.ac.uk (Postfix, from userid 1001) id 0B5D95E70; Mon, 23 Jul 2012 13:59:19 +0100 (BST) Message-Id: <20120723125919.0B5D95E70@gallows.inf.ed.ac.uk> Date: Mon, 23 Jul 2012 13:59:19 +0100 (BST) From: William Waites To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/170084: Fix net/pimdd build X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: William Waites List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2012 13:40:13 -0000 >Number: 170084 >Category: ports >Synopsis: Fix net/pimdd build >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Jul 23 13:40:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: William Waites >Release: FreeBSD 8.2-RELEASE amd64 >Organization: University of Edinburgh >Environment: System: FreeBSD gallows.inf.ed.ac.uk 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: net/pimdd is marked as broken, the problem is simply some defines that look for NetBSD. Modifying these to also check for FreeBSD makes pimdd compile >How-To-Repeat: cd /usr/ports/net/pimdd && make install clean >Fix: Patch: diff -ruN net/pimdd.orig/Makefile net/pimdd/Makefile --- net/pimdd.orig/Makefile 2012-07-23 13:52:30.000000000 +0100 +++ net/pimdd/Makefile 2012-07-23 13:52:05.000000000 +0100 @@ -20,10 +20,6 @@ .include -.if ${OSVERSION} >= 800070 -BROKEN= does not compile: error: IGMP_HOST_MEMBERSHIP_REPORT undeclared -.endif - post-patch: ${REINPLACE_CMD} -e 's|/etc/pimd.conf|${PREFIX}/etc/pimd.conf|g' ${WRKSRC}/pathnames.h diff -ruN net/pimdd.orig/files/patch-defs.h net/pimdd/files/patch-defs.h --- net/pimdd.orig/files/patch-defs.h 1970-01-01 01:00:00.000000000 +0100 +++ net/pimdd/files/patch-defs.h 2012-07-23 13:51:18.000000000 +0100 @@ -0,0 +1,20 @@ +--- defs.h.orig 2012-07-23 13:50:47.000000000 +0100 ++++ defs.h 2012-07-23 13:35:04.000000000 +0100 +@@ -262,7 +262,7 @@ + + #ifndef IGMP_MEMBERSHIP_QUERY + #define IGMP_MEMBERSHIP_QUERY IGMP_HOST_MEMBERSHIP_QUERY +-#if !(defined(NetBSD)) ++#if !(defined(NetBSD)) && !(defined(FreeBSD)) + #define IGMP_V1_MEMBERSHIP_REPORT IGMP_HOST_MEMBERSHIP_REPORT + #define IGMP_V2_MEMBERSHIP_REPORT IGMP_HOST_NEW_MEMBERSHIP_REPORT + #else +@@ -272,7 +272,7 @@ + #define IGMP_V2_LEAVE_GROUP IGMP_HOST_LEAVE_MESSAGE + #endif + +-#if defined(NetBSD) ++#if defined(NetBSD) || defined(FreeBSD) + #define IGMP_MTRACE_RESP IGMP_MTRACE_REPLY + #define IGMP_MTRACE IGMP_MTRACE_QUERY + #endif -- The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336. >Release-Note: >Audit-Trail: >Unformatted: