svn commit: r301509 - in head/net/pimdd: . files

[Alex Kozlov]

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 at 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 at 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