Bug 170084
| Summary: | Fix net/pimdd build | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | wwaites |
| Component: | Individual Port(s) | Assignee: | Alex Kozlov <ak> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
Responsible Changed From-To: freebsd-ports-bugs->ak I'll take it. Author: ak Date: Wed Jul 25 06:20:43 2012 New Revision: 301509 URL: http://svn.freebsd.org/changeset/ports/301509 Log: - Fix build on FreeBSD 8+ [1] - Remove pkg-plist PR: ports/170084 [1] Submitted by: William Waites <wwaites@tardis.ed.ac.uk> Added: head/net/pimdd/files/extra-patch-defs.h (contents, props changed) Deleted: head/net/pimdd/pkg-plist Modified: head/net/pimdd/Makefile (contents, props changed) Modified: head/net/pimdd/Makefile ============================================================================== --- head/net/pimdd/Makefile Wed Jul 25 05:37:55 2012 (r301508) +++ head/net/pimdd/Makefile Wed Jul 25 06:20:43 2012 (r301509) @@ -12,16 +12,19 @@ MASTER_SITES= http://antc.uoregon.edu/PI DISTNAME= pimd-dense MAINTAINER= ports@FreeBSD.org -COMMENT= \ - UO Dense Protocol-Independent Multicast (PIM-DM) daemon for IPv4 +COMMENT= UO Dense Protocol-Independent Multicast (PIM-DM) daemon for IPv4 -NO_MAN= defined -PIMDD_DOCS= pimd-dense.html README CHANGES RELEASE.NOTES +NO_MAN= yes + +PLIST_FILES= sbin/pimdd \ + etc/pimdd.conf.sample + +PORTDOCS= pimd-dense.html README CHANGES RELEASE.NOTES .include <bsd.port.pre.mk> .if ${OSVERSION} >= 800070 -BROKEN= does not compile: error: IGMP_HOST_MEMBERSHIP_REPORT undeclared +EXTRA_PATCHES= ${FILESDIR}/extra-patch-defs.h .endif post-patch: @@ -32,7 +35,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/pimdd.conf ${PREFIX}/etc/pimdd.conf.sample .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} -.for i in ${PIMDD_DOCS} +.for i in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}/${i} .endfor .endif Added: head/net/pimdd/files/extra-patch-defs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pimdd/files/extra-patch-defs.h Wed Jul 25 06:20:43 2012 (r301509) @@ -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 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed, with minor changes. Thanks! |
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 Fix: Patch: -- The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336.--PjXwKvgGPDNbQKpa9HgXdzf7mnpKgLo79WeuFhhZ2AgPSJxb Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" 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 How-To-Repeat: cd /usr/ports/net/pimdd && make install clean