Date: Mon, 23 Jul 2012 13:59:19 +0100 (BST) From: William Waites <wwaites@tardis.ed.ac.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/170084: Fix net/pimdd build Message-ID: <20120723125919.0B5D95E70@gallows.inf.ed.ac.uk> Resent-Message-ID: <201207231340.q6NDeCNE017818@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
-.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120723125919.0B5D95E70>