1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

- Fix build with clang, now no gcc is required on 10+ [1]

- Adapt it to new RAW socket behavior introduced in 10.0 [1]
- Support staging [1]
- Convert to new options framework
- Respect CFLAGS

PR:		ports/186127 [1]
Submitted by:	Olivier Cochard-Labbe <olivier@cochard.me>
This commit is contained in:
Pawel Pekala 2014-02-21 22:30:51 +00:00
parent bacdc82202
commit 3dfe4b6f75
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=345558
4 changed files with 44 additions and 14 deletions

View File

@ -3,6 +3,7 @@
PORTNAME= pimdd
PORTVERSION= 0.2.1.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://antc.uoregon.edu/PIMDM/
DISTNAME= pimd-dense
@ -11,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= UO Dense Protocol-Independent Multicast (PIM-DM) daemon for IPv4
MAKE_ARGS+= CC="${CC}"
USE_GCC= any
NO_MAN= yes
@ -20,22 +20,18 @@ PLIST_FILES= sbin/pimdd \
PORTDOCS= pimd-dense.html README CHANGES RELEASE.NOTES
NO_STAGE= yes
.include <bsd.port.pre.mk>
OPTIONS_DEFINE= DOCS
EXTRA_PATCHES= ${FILESDIR}/extra-patch-defs.h
post-patch:
${REINPLACE_CMD} -e 's|/etc/pimd.conf|${PREFIX}/etc/pimd.conf|g' ${WRKSRC}/pathnames.h
${REINPLACE_CMD} -e 's|-Wall -g|${CFLAGS}|' ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pimdd ${PREFIX}/sbin/pimdd
${INSTALL_DATA} ${WRKSRC}/pimdd.conf ${PREFIX}/etc/pimdd.conf.sample
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}/${i}
.endfor
.endif
${INSTALL_PROGRAM} ${WRKSRC}/pimdd ${STAGEDIR}${PREFIX}/sbin/pimdd
${INSTALL_DATA} ${WRKSRC}/pimdd.conf ${STAGEDIR}${PREFIX}/etc/pimdd.conf.sample
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View File

@ -1,5 +1,14 @@
--- Makefile.orig Fri Sep 29 11:53:31 2006
+++ Makefile Fri Sep 29 11:53:50 2006
--- Makefile.orig 1999-11-30 18:58:53.000000000 +0100
+++ Makefile 2013-09-08 09:39:18.947517833 +0200
@@ -53,7 +53,7 @@
# Support for Resource Reservations), currently used by RSVP.
RSRRDEF= -DRSRR
-CC = gcc
+#CC = gcc
MCAST_INCLUDE= -Iinclude
LDFLAGS=
@@ -63,7 +63,7 @@
#CONFIGCONFIGCONFIG
### Compilation flags for different platforms. Uncomment only one of them

View File

@ -0,0 +1,14 @@
--- igmp.c.orig 2014-01-22 00:05:49.560452946 +0100
+++ igmp.c 2014-01-22 00:06:57.098508699 +0100
@@ -168,7 +168,11 @@
#ifdef RAW_INPUT_IS_RAW
ipdatalen = ntohs(ip->ip_len) - iphdrlen;
#else
+ #if __FreeBSD_version >= 1000000
+ ipdatalen = ip->ip_len - iphdrlen;
+ #else
ipdatalen = ip->ip_len;
+ #endif
#endif
if (iphdrlen + ipdatalen != recvlen) {
log(LOG_WARNING, 0,

View File

@ -0,0 +1,11 @@
--- pim_proto.c.orig 2014-01-26 12:48:37.048478574 +0100
+++ pim_proto.c 2014-01-26 12:51:08.180470630 +0100
@@ -669,7 +669,7 @@
"\tPRUNE src %s, group %s - scheduling delayed join",
inet_fmt(source, s1), inet_fmt(group, s2));
- schedule_delayed_join(mrtentry_ptr, uni_target_addr);
+ schedule_delayed_join(mrtentry_ptr, uni_target_addr.unicast_addr);
}
}