diff options
| author | ak <ak@FreeBSD.org> | 2012-07-25 14:20:43 +0800 |
|---|---|---|
| committer | ak <ak@FreeBSD.org> | 2012-07-25 14:20:43 +0800 |
| commit | c72cc7a3f36bdc8502fd2932570ed6520ca23d03 (patch) | |
| tree | 1639306e9b433fea6f0f04199d67cc58d0de532d /net/pimdd | |
| parent | 10bb0b9e5bf9061cf0fd5a9db4bd02549fd7ddde (diff) | |
| download | freebsd-ports-gnome-c72cc7a3f36bdc8502fd2932570ed6520ca23d03.tar.gz freebsd-ports-gnome-c72cc7a3f36bdc8502fd2932570ed6520ca23d03.tar.zst freebsd-ports-gnome-c72cc7a3f36bdc8502fd2932570ed6520ca23d03.zip | |
- Fix build on FreeBSD 8+ [1]
- Remove pkg-plist
PR: ports/170084 [1]
Submitted by: William Waites <wwaites@tardis.ed.ac.uk>
Diffstat (limited to 'net/pimdd')
| -rw-r--r-- | net/pimdd/Makefile | 15 | ||||
| -rw-r--r-- | net/pimdd/files/extra-patch-defs.h | 20 | ||||
| -rw-r--r-- | net/pimdd/pkg-plist | 7 |
3 files changed, 29 insertions, 13 deletions
diff --git a/net/pimdd/Makefile b/net/pimdd/Makefile index eac4c6b8f9a1..7481ac30d2d9 100644 --- a/net/pimdd/Makefile +++ b/net/pimdd/Makefile @@ -12,16 +12,19 @@ MASTER_SITES= http://antc.uoregon.edu/PIMDM/ 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 diff --git a/net/pimdd/files/extra-patch-defs.h b/net/pimdd/files/extra-patch-defs.h new file mode 100644 index 000000000000..1df669efa476 --- /dev/null +++ b/net/pimdd/files/extra-patch-defs.h @@ -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 diff --git a/net/pimdd/pkg-plist b/net/pimdd/pkg-plist deleted file mode 100644 index 1fd25ad4710a..000000000000 --- a/net/pimdd/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -sbin/pimdd -etc/pimdd.conf.sample -%%PORTDOCS%%%%DOCSDIR%%/pimd-dense.html -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES -%%PORTDOCS%%@dirrm %%DOCSDIR%% |