svn commit: r396342 - in head: . net net/mcast-tools net/pim6-tools net/pim6-tools/files net/pim6dd net/pim6dd/files net/pim6sd net/pim6sd/files
Hiroki Sato
hrs at FreeBSD.org
Mon Sep 7 19:23:33 UTC 2015
Author: hrs
Date: Mon Sep 7 19:23:26 2015
New Revision: 396342
URL: https://svnweb.freebsd.org/changeset/ports/396342
Log:
Rename and split net/mcast-tools into net/pim6-tools, net/pim6sd,
and net/pim6dd.
Added:
head/net/pim6-tools/
- copied from r395030, head/net/mcast-tools/
head/net/pim6-tools/files/patch-configure.in (contents, props changed)
head/net/pim6dd/
- copied from r395030, head/net/mcast-tools/
head/net/pim6dd/files/patch-configure.in (contents, props changed)
head/net/pim6dd/files/pim6dd.in (contents, props changed)
head/net/pim6sd/
- copied from r395030, head/net/mcast-tools/
head/net/pim6sd/files/patch-configure.in (contents, props changed)
head/net/pim6sd/files/pim6sd.in (contents, props changed)
Deleted:
head/net/mcast-tools/
head/net/pim6-tools/files/pim6dd.conf.sample
head/net/pim6dd/files/patch-mfc-Makefile.am
head/net/pim6dd/files/patch-pim6sd-Makefile.am
head/net/pim6sd/files/patch-mfc-Makefile.am
head/net/pim6sd/files/pim6dd.conf.sample
Modified:
head/MOVED
head/net/Makefile
head/net/pim6-tools/Makefile
head/net/pim6-tools/files/patch-mfc-Makefile.am
head/net/pim6-tools/files/patch-pim6sd-Makefile.am
head/net/pim6-tools/pkg-descr
head/net/pim6-tools/pkg-plist
head/net/pim6dd/Makefile
head/net/pim6dd/files/pim6dd.conf.sample (contents, props changed)
head/net/pim6dd/pkg-descr
head/net/pim6dd/pkg-plist
head/net/pim6sd/Makefile
head/net/pim6sd/files/patch-pim6sd-Makefile.am
head/net/pim6sd/pkg-descr
head/net/pim6sd/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Mon Sep 7 19:10:32 2015 (r396341)
+++ head/MOVED Mon Sep 7 19:23:26 2015 (r396342)
@@ -7859,3 +7859,4 @@ games/linux-candycruncher-demo||2015-09-
games/linux-gorky17-demo||2015-09-01|Has expired: Broken for more than 6 months
sysutils/syslog-ng33||2015-09-01|Has expired: No longer supported by Balabit cince November 2014.
textproc/ruby-xmlconfigfile|textproc/ruby-xml-configfile|2015-09-03|Rename to match our ruby naming
+net/mcast-tools|net/pim6-tools|2015-09-07|Rename
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Mon Sep 7 19:10:32 2015 (r396341)
+++ head/net/Makefile Mon Sep 7 19:23:26 2015 (r396342)
@@ -373,7 +373,6 @@
SUBDIR += macchanger
SUBDIR += mad_fcl
SUBDIR += malo-firmware-kmod
- SUBDIR += mcast-tools
SUBDIR += mdns-repeater
SUBDIR += mediastreamer
SUBDIR += mediatomb
@@ -879,6 +878,9 @@
SUBDIR += php56-sockets
SUBDIR += php56-xmlrpc
SUBDIR += phpldapadmin
+ SUBDIR += pim6-tools
+ SUBDIR += pim6dd
+ SUBDIR += pim6sd
SUBDIR += pimd
SUBDIR += pimdd
SUBDIR += pipsecd
Modified: head/net/pim6-tools/Makefile
==============================================================================
--- head/net/mcast-tools/Makefile Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6-tools/Makefile Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,23 +1,23 @@
-# Created by: suz
# $FreeBSD$
-PORTNAME= mcast-tools
+PORTNAME= pim6
PORTVERSION= 20061214
-PORTREVISION= 1
CATEGORIES= net ipv6
-MASTER_SITES= SF
+MASTER_SITES= SF/mcast-tools
+PKGNAMESUFFIX= -tools
+DISTNAME= mcast-tools-${PORTVERSION}
MAINTAINER= hrs at FreeBSD.org
-COMMENT= IPv6 multicast routing daemons and tools
+COMMENT= IPv6 multicast tools
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= autoreconf
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake aclocal autoconf
-AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= YACC=${YACC}
post-install:
- ${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample ${STAGEDIR}${PREFIX}/etc
- ${INSTALL_DATA} ${FILESDIR}/pim6dd.conf.sample ${STAGEDIR}${PREFIX}/etc
${INSTALL_DATA} ${WRKSRC}/mfc/mfc.conf.sample ${STAGEDIR}${PREFIX}/etc
.include <bsd.port.mk>
Added: head/net/pim6-tools/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pim6-tools/files/patch-configure.in Mon Sep 7 19:23:26 2015 (r396342)
@@ -0,0 +1,31 @@
+--- configure.in.orig 2006-06-24 08:53:46 UTC
++++ configure.in
+@@ -5,7 +5,7 @@ AC_PREREQ(2.59)
+ AC_INIT(README)
+ AM_CONFIG_HEADER(include/config.h)
+ AM_INIT_AUTOMAKE(mcast-tools, 20050926)
+-SUBDIRS="mcastread mcastsend mfc mtrace6 pim6dd pim6sd pmsft"
++SUBDIRS="mcastread mcastsend mfc mtrace6 pim6sd pmsft"
+ AC_SUBST(SUBDIRS)
+
+ # Checks for programs.
+@@ -145,16 +145,16 @@ main ()
+ exit (1);
+ exit (0);
+ }],
+- [AC_DEFINE(HAVE_ROUTING_SOCKETS)
++ [AC_DEFINE([HAVE_ROUTING_SOCKETS],[1],[foo])
+ UK_METHOD=routesock.o
+ AC_MSG_RESULT(routing socket)],
+- [AC_DEFINE(HAVE_NETLINK)
++ [AC_DEFINE([HAVE_NETLINK],[1],[foo])
+ UK_METHOD=netlink.o
+ AC_MSG_RESULT(netlink)])
+ AC_SUBST(UK_METHOD)
+
+ dnl Checks for RFC3542
+-AC_CHECK_LIB([c], [inet6_opt_init], [AC_DEFINE(HAVE_RFC3542)], )
++AC_CHECK_LIB([c], [inet6_opt_init], [AC_DEFINE([HAVE_RFC3542],[1],[foo])], )
+
+ AC_CONFIG_FILES([Makefile
+ mcastread/Makefile
Modified: head/net/pim6-tools/files/patch-mfc-Makefile.am
==============================================================================
--- head/net/mcast-tools/files/patch-mfc-Makefile.am Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6-tools/files/patch-mfc-Makefile.am Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,6 +1,6 @@
---- mfc/Makefile.am.orig 2005-12-11 14:15:10.000000000 +0900
-+++ mfc/Makefile.am 2013-10-17 13:52:36.000000000 +0900
-@@ -9,15 +9,19 @@
+--- mfc/Makefile.am.orig 2005-12-11 05:15:10 UTC
++++ mfc/Makefile.am
+@@ -9,15 +9,19 @@ DISTCLEANFILES = cftoken.c cfparse.c cfp
# Config file parser (this is necessary because not all yacc generate y.tab.h)
cftoken.o: cftoken.c cfparse.h
Modified: head/net/pim6-tools/files/patch-pim6sd-Makefile.am
==============================================================================
--- head/net/mcast-tools/files/patch-pim6sd-Makefile.am Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6-tools/files/patch-pim6sd-Makefile.am Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,29 +1,17 @@
---- pim6sd/Makefile.am.orig 2005-12-11 14:15:12.000000000 +0900
-+++ pim6sd/Makefile.am 2013-10-17 13:54:42.000000000 +0900
-@@ -12,15 +12,19 @@
+--- pim6sd/Makefile.am.orig 2005-12-11 05:15:12 UTC
++++ pim6sd/Makefile.am
+@@ -1,13 +1,8 @@
+ SUBDIRS=.
+-sbin_PROGRAMS= pim6sd
+ sbin_SCRIPTS= pim6stat
+-pim6sd_SOURCES= mld6.c mld6_proto.c mld6v2.c mld6v2_proto.c inet6.c kern.c main.c config.c debug.c vers.c callout.c route.c vif.c timer.c mrt.c pim6.c pim6_proto.c rp.c crc.c trace.c cfparse.y cftoken.l routesock.c netlink.c
+ man1_MANS=pim6stat.1
+-man5_MANS=pim6sd.conf.5
+-man8_MANS=pim6sd.8
+ pim6sd_LIBS=@LIBS@ @LEXLIBS@
+-noinst_HEADERS=callout.h cfparse-defs.h cfparse.h config.h crc.h debug.h defs.h inet6.h kern.h mld6.h mld6_proto.h mld6v2.h mld6v2_proto.h mrt.h pathnames.h pim6.h pim6_proto.h pimd.h route.h routesock.h rp.h timer.h trace.h var.h vif.h vmbuf.h mroute6.h
+-EXTRA_DIST = ${man1_MANS} ${man5_MANS} ${man8_MANS} pim6sd.conf.sample ssm.conf.sample pim6stat BUGS.TODO BUGS.V6 LICENSE.mrouted LICENSE.pim6sd LICENSE.pimd README README.SSM README.first
++EXTRA_DIST = pim6stat
+ DISTCLEANFILES = cftoken.c cfparse.c cfparse.h
# Config file parser (this is necessary because not all yacc generate y.tab.h)
- cftoken.o: cftoken.c cfparse.h
-- $(COMPILE) -c -o $@ $<
-+ $(COMPILE) -c -o $@ cftoken.c
-
- cfparse.o: cfparse.c
-- $(COMPILE) -c -o $@ $<
-+ $(COMPILE) -c -o $@ $?
-
- cftoken.c: cftoken.l
-- $(LEX) -ocftoken.c $<
-+ $(LEX) -o$@ $?
-
--cfparse.h cfparse.c: cfparse.y
-- $(YACC) -d $< && \
-- mv y.tab.c cfparse.c && \
-- mv y.tab.h cfparse.h
-+y.tab.c y.tab.h: cfparse.y
-+ $(YACC) -d $?
-+
-+cfparse.h: y.tab.h
-+ mv y.tab.h $@
-+
-+cfparse.c: y.tab.c
-+ mv y.tab.c $@
Modified: head/net/pim6-tools/pkg-descr
==============================================================================
--- head/net/mcast-tools/pkg-descr Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6-tools/pkg-descr Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,5 +1,4 @@
-mcast-tools is a package containing IPv6-multicast routing daemons and tools,
-comprising the following programs.
+Tools for IPv6 multicast routing including:
- mcastread
an IPv6 multicast receiver
@@ -8,15 +7,10 @@ comprising the following programs.
- mfc
an IPv6 multicast routing daemon, which only supports static
multicast routing.
- - pim6sd
- an IPv6 multicast routing daemon, which supports PIM-SM
- (Protocol Independent Multicast Sparse-Mode Version 2), and
- PIM-SSM (Source-Specific Multicast using PIM-SM)
- - pim6dd
- an IPv6 multicast routing daemon, which supports PIM-DM
- (Protocol Independent Multicast Dense-Mode Version 2)
- pmsft
a test program for Multicast Source Filter (MSF) using APIs
specified in Socket Interface Extention for MSF (RFC3678).
(on a non-IGMPv3/MLDv2-aware kernel, only join/leave
operation is supported)
+
+WWW: http://mcast-tools.sourceforge.net/
Modified: head/net/pim6-tools/pkg-plist
==============================================================================
--- head/net/mcast-tools/pkg-plist Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6-tools/pkg-plist Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,21 +1,13 @@
-etc/pim6sd.conf.sample
-etc/pim6dd.conf.sample
-etc/mfc.conf.sample
+ at sample etc/mfc.conf.sample
bin/mtrace6
bin/mcastread
bin/mcastsend
bin/pmsft
sbin/mfc
-sbin/pim6dd
-sbin/pim6sd
sbin/pim6stat
man/man1/mcastread.1.gz
man/man1/mcastsend.1.gz
man/man1/pim6stat.1.gz
man/man1/pmsft.1.gz
-man/man5/pim6dd.conf.5.gz
-man/man5/pim6sd.conf.5.gz
man/man8/mfc.8.gz
man/man8/mtrace6.8.gz
-man/man8/pim6dd.8.gz
-man/man8/pim6sd.8.gz
Modified: head/net/pim6dd/Makefile
==============================================================================
--- head/net/mcast-tools/Makefile Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6dd/Makefile Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,23 +1,25 @@
-# Created by: suz
# $FreeBSD$
-PORTNAME= mcast-tools
-PORTVERSION= 20061214
-PORTREVISION= 1
+PORTNAME= pim6
+PORTVERSION= 0.2.1.0.a.15
CATEGORIES= net ipv6
-MASTER_SITES= SF
+MASTER_SITES= SF/mcast-tools
+PKGNAMESUFFIX= dd
+DISTNAME= mcast-tools-20061214
MAINTAINER= hrs at FreeBSD.org
-COMMENT= IPv6 multicast routing daemons and tools
+COMMENT= IPv6 PIM-DM multicast routing daemon
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= autoreconf
+USE_RC_SUBR= ${PORTNAME}${PKGNAMESUFFIX}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake aclocal autoconf
-AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= YACC=${YACC}
post-install:
- ${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample ${STAGEDIR}${PREFIX}/etc
- ${INSTALL_DATA} ${FILESDIR}/pim6dd.conf.sample ${STAGEDIR}${PREFIX}/etc
- ${INSTALL_DATA} ${WRKSRC}/mfc/mfc.conf.sample ${STAGEDIR}${PREFIX}/etc
+ ${INSTALL_DATA} ${FILESDIR}/pim6dd.conf.sample \
+ ${STAGEDIR}${PREFIX}/etc
.include <bsd.port.mk>
Added: head/net/pim6dd/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pim6dd/files/patch-configure.in Mon Sep 7 19:23:26 2015 (r396342)
@@ -0,0 +1,39 @@
+--- configure.in.orig 2006-06-24 08:53:46 UTC
++++ configure.in
+@@ -5,7 +5,7 @@ AC_PREREQ(2.59)
+ AC_INIT(README)
+ AM_CONFIG_HEADER(include/config.h)
+ AM_INIT_AUTOMAKE(mcast-tools, 20050926)
+-SUBDIRS="mcastread mcastsend mfc mtrace6 pim6dd pim6sd pmsft"
++SUBDIRS="pim6dd"
+ AC_SUBST(SUBDIRS)
+
+ # Checks for programs.
+@@ -145,23 +145,17 @@ main ()
+ exit (1);
+ exit (0);
+ }],
+- [AC_DEFINE(HAVE_ROUTING_SOCKETS)
++ [AC_DEFINE([HAVE_ROUTING_SOCKETS],[1],[foo])
+ UK_METHOD=routesock.o
+ AC_MSG_RESULT(routing socket)],
+- [AC_DEFINE(HAVE_NETLINK)
++ [AC_DEFINE([HAVE_NETLINK],[1],[foo])
+ UK_METHOD=netlink.o
+ AC_MSG_RESULT(netlink)])
+ AC_SUBST(UK_METHOD)
+
+ dnl Checks for RFC3542
+-AC_CHECK_LIB([c], [inet6_opt_init], [AC_DEFINE(HAVE_RFC3542)], )
++AC_CHECK_LIB([c], [inet6_opt_init], [AC_DEFINE([HAVE_RFC3542],[1],[foo])], )
+
+ AC_CONFIG_FILES([Makefile
+- mcastread/Makefile
+- mcastsend/Makefile
+- mfc/Makefile
+- mtrace6/Makefile
+- pim6dd/Makefile
+- pim6sd/Makefile
+- pmsft/Makefile])
++ pim6dd/Makefile])
+ AC_OUTPUT
Modified: head/net/pim6dd/files/pim6dd.conf.sample
==============================================================================
--- head/net/mcast-tools/files/pim6dd.conf.sample Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6dd/files/pim6dd.conf.sample Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,3 +1,3 @@
-# $FreeBSD: /tmp/pcvs/ports/net/mcast-tools/files/pim6dd.conf.sample,v 1.1 2005-11-21 22:33:50 suz Exp $
+# $FreeBSD$
#
phyint stf0 disable
Added: head/net/pim6dd/files/pim6dd.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pim6dd/files/pim6dd.in Mon Sep 7 19:23:26 2015 (r396342)
@@ -0,0 +1,25 @@
+#!/bin/sh
+# $FreeBSD$
+#
+# PROVIDE: pim6dd
+# REQUIRE: netif routing
+# KEYWORD: nojail
+
+#
+# Add the following to /etc/rc.conf[.local] to enable this service
+#
+# pim6dd_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="pim6dd"
+rcvar="${name}_enable"
+command="%%PREFIX%%/sbin/${name}"
+required_files="%%PREFIX%%/etc/${name}.conf"
+extra_commands=reload
+
+load_rc_config $name
+: ${pim6dd_enable="NO"}
+run_rc_command "$1"
+
Modified: head/net/pim6dd/pkg-descr
==============================================================================
--- head/net/mcast-tools/pkg-descr Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6dd/pkg-descr Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,22 +1,4 @@
-mcast-tools is a package containing IPv6-multicast routing daemons and tools,
-comprising the following programs.
+An IPv6 multicast routing daemon, which supports PIM-DM
+(Protocol Independent Multicast Dense-Mode Version 2).
- - mcastread
- an IPv6 multicast receiver
- - mcastsend
- an IPv6 multicast sender
- - mfc
- an IPv6 multicast routing daemon, which only supports static
- multicast routing.
- - pim6sd
- an IPv6 multicast routing daemon, which supports PIM-SM
- (Protocol Independent Multicast Sparse-Mode Version 2), and
- PIM-SSM (Source-Specific Multicast using PIM-SM)
- - pim6dd
- an IPv6 multicast routing daemon, which supports PIM-DM
- (Protocol Independent Multicast Dense-Mode Version 2)
- - pmsft
- a test program for Multicast Source Filter (MSF) using APIs
- specified in Socket Interface Extention for MSF (RFC3678).
- (on a non-IGMPv3/MLDv2-aware kernel, only join/leave
- operation is supported)
+WWW: http://mcast-tools.sourceforge.net/
Modified: head/net/pim6dd/pkg-plist
==============================================================================
--- head/net/mcast-tools/pkg-plist Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6dd/pkg-plist Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,21 +1,4 @@
-etc/pim6sd.conf.sample
-etc/pim6dd.conf.sample
-etc/mfc.conf.sample
-bin/mtrace6
-bin/mcastread
-bin/mcastsend
-bin/pmsft
-sbin/mfc
+ at sample etc/pim6dd.conf.sample
sbin/pim6dd
-sbin/pim6sd
-sbin/pim6stat
-man/man1/mcastread.1.gz
-man/man1/mcastsend.1.gz
-man/man1/pim6stat.1.gz
-man/man1/pmsft.1.gz
man/man5/pim6dd.conf.5.gz
-man/man5/pim6sd.conf.5.gz
-man/man8/mfc.8.gz
-man/man8/mtrace6.8.gz
man/man8/pim6dd.8.gz
-man/man8/pim6sd.8.gz
Modified: head/net/pim6sd/Makefile
==============================================================================
--- head/net/mcast-tools/Makefile Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6sd/Makefile Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,23 +1,25 @@
-# Created by: suz
# $FreeBSD$
-PORTNAME= mcast-tools
-PORTVERSION= 20061214
-PORTREVISION= 1
+PORTNAME= pim6
+PORTVERSION= 2.1.0.a.23
CATEGORIES= net ipv6
-MASTER_SITES= SF
+MASTER_SITES= SF/mcast-tools
+PKGNAMESUFFIX= sd
+DISTNAME= mcast-tools-20061214
MAINTAINER= hrs at FreeBSD.org
-COMMENT= IPv6 multicast routing daemons and tools
+COMMENT= IPv6 PIM-SM and PIM-SSM multicast routing daemon
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= autoreconf
+USE_RC_SUBR= ${PORTNAME}${PKGNAMESUFFIX}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake aclocal autoconf
-AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= YACC=${YACC}
post-install:
- ${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample ${STAGEDIR}${PREFIX}/etc
- ${INSTALL_DATA} ${FILESDIR}/pim6dd.conf.sample ${STAGEDIR}${PREFIX}/etc
- ${INSTALL_DATA} ${WRKSRC}/mfc/mfc.conf.sample ${STAGEDIR}${PREFIX}/etc
+ ${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample \
+ ${STAGEDIR}${PREFIX}/etc
.include <bsd.port.mk>
Added: head/net/pim6sd/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pim6sd/files/patch-configure.in Mon Sep 7 19:23:26 2015 (r396342)
@@ -0,0 +1,39 @@
+--- configure.in.orig 2006-06-24 08:53:46 UTC
++++ configure.in
+@@ -5,7 +5,7 @@ AC_PREREQ(2.59)
+ AC_INIT(README)
+ AM_CONFIG_HEADER(include/config.h)
+ AM_INIT_AUTOMAKE(mcast-tools, 20050926)
+-SUBDIRS="mcastread mcastsend mfc mtrace6 pim6dd pim6sd pmsft"
++SUBDIRS="pim6sd"
+ AC_SUBST(SUBDIRS)
+
+ # Checks for programs.
+@@ -145,23 +145,17 @@ main ()
+ exit (1);
+ exit (0);
+ }],
+- [AC_DEFINE(HAVE_ROUTING_SOCKETS)
++ [AC_DEFINE([HAVE_ROUTING_SOCKETS],[1],[foo])
+ UK_METHOD=routesock.o
+ AC_MSG_RESULT(routing socket)],
+- [AC_DEFINE(HAVE_NETLINK)
++ [AC_DEFINE([HAVE_NETLINK],[1],[foo])
+ UK_METHOD=netlink.o
+ AC_MSG_RESULT(netlink)])
+ AC_SUBST(UK_METHOD)
+
+ dnl Checks for RFC3542
+-AC_CHECK_LIB([c], [inet6_opt_init], [AC_DEFINE(HAVE_RFC3542)], )
++AC_CHECK_LIB([c], [inet6_opt_init], [AC_DEFINE([HAVE_RFC3542],[1],[foo])], )
+
+ AC_CONFIG_FILES([Makefile
+- mcastread/Makefile
+- mcastsend/Makefile
+- mfc/Makefile
+- mtrace6/Makefile
+- pim6dd/Makefile
+- pim6sd/Makefile
+- pmsft/Makefile])
++ pim6sd/Makefile])
+ AC_OUTPUT
Modified: head/net/pim6sd/files/patch-pim6sd-Makefile.am
==============================================================================
--- head/net/mcast-tools/files/patch-pim6sd-Makefile.am Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6sd/files/patch-pim6sd-Makefile.am Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,29 +1,25 @@
---- pim6sd/Makefile.am.orig 2005-12-11 14:15:12.000000000 +0900
-+++ pim6sd/Makefile.am 2013-10-17 13:54:42.000000000 +0900
-@@ -12,15 +12,19 @@
+--- pim6sd/Makefile.am.orig 2005-12-11 05:15:12 UTC
++++ pim6sd/Makefile.am
+@@ -1,13 +1,11 @@
+ SUBDIRS=.
+ sbin_PROGRAMS= pim6sd
+-sbin_SCRIPTS= pim6stat
+ pim6sd_SOURCES= mld6.c mld6_proto.c mld6v2.c mld6v2_proto.c inet6.c kern.c main.c config.c debug.c vers.c callout.c route.c vif.c timer.c mrt.c pim6.c pim6_proto.c rp.c crc.c trace.c cfparse.y cftoken.l routesock.c netlink.c
+-man1_MANS=pim6stat.1
+ man5_MANS=pim6sd.conf.5
+ man8_MANS=pim6sd.8
+ pim6sd_LIBS=@LIBS@ @LEXLIBS@
+ noinst_HEADERS=callout.h cfparse-defs.h cfparse.h config.h crc.h debug.h defs.h inet6.h kern.h mld6.h mld6_proto.h mld6v2.h mld6v2_proto.h mrt.h pathnames.h pim6.h pim6_proto.h pimd.h route.h routesock.h rp.h timer.h trace.h var.h vif.h vmbuf.h mroute6.h
+-EXTRA_DIST = ${man1_MANS} ${man5_MANS} ${man8_MANS} pim6sd.conf.sample ssm.conf.sample pim6stat BUGS.TODO BUGS.V6 LICENSE.mrouted LICENSE.pim6sd LICENSE.pimd README README.SSM README.first
++EXTRA_DIST = ${man1_MANS} ${man5_MANS} ${man8_MANS} pim6sd.conf.sample ssm.conf.sample BUGS.TODO BUGS.V6 LICENSE.mrouted LICENSE.pim6sd LICENSE.pimd README README.SSM README.first
+ DISTCLEANFILES = cftoken.c cfparse.c cfparse.h
# Config file parser (this is necessary because not all yacc generate y.tab.h)
- cftoken.o: cftoken.c cfparse.h
-- $(COMPILE) -c -o $@ $<
-+ $(COMPILE) -c -o $@ cftoken.c
+@@ -21,6 +19,6 @@ cftoken.c: cftoken.l
+ $(LEX) -ocftoken.c $<
- cfparse.o: cfparse.c
-- $(COMPILE) -c -o $@ $<
-+ $(COMPILE) -c -o $@ $?
-
- cftoken.c: cftoken.l
-- $(LEX) -ocftoken.c $<
-+ $(LEX) -o$@ $?
-
--cfparse.h cfparse.c: cfparse.y
+ cfparse.h cfparse.c: cfparse.y
- $(YACC) -d $< && \
-- mv y.tab.c cfparse.c && \
-- mv y.tab.h cfparse.h
-+y.tab.c y.tab.h: cfparse.y
-+ $(YACC) -d $?
-+
-+cfparse.h: y.tab.h
-+ mv y.tab.h $@
-+
-+cfparse.c: y.tab.c
-+ mv y.tab.c $@
++ $(YACC) -d cfparse.y && \
+ mv y.tab.c cfparse.c && \
+ mv y.tab.h cfparse.h
Added: head/net/pim6sd/files/pim6sd.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pim6sd/files/pim6sd.in Mon Sep 7 19:23:26 2015 (r396342)
@@ -0,0 +1,25 @@
+#!/bin/sh
+# $FreeBSD$
+#
+# PROVIDE: pim6sd
+# REQUIRE: netif routing
+# KEYWORD: nojail
+
+#
+# Add the following to /etc/rc.conf[.local] to enable this service
+#
+# pim6sd_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="pim6sd"
+rcvar="${name}_enable"
+command="%%PREFIX%%/sbin/${name}"
+required_files="%%PREFIX%%/etc/${name}.conf"
+extra_commands=reload
+
+load_rc_config $name
+: ${pim6sd_enable="NO"}
+run_rc_command "$1"
+
Modified: head/net/pim6sd/pkg-descr
==============================================================================
--- head/net/mcast-tools/pkg-descr Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6sd/pkg-descr Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,22 +1,5 @@
-mcast-tools is a package containing IPv6-multicast routing daemons and tools,
-comprising the following programs.
+An IPv6 multicast routing daemon, which supports PIM-SM
+(Protocol Independent Multicast Sparse-Mode Version 2), and
+PIM-SSM (Source-Specific Multicast using PIM-SM).
- - mcastread
- an IPv6 multicast receiver
- - mcastsend
- an IPv6 multicast sender
- - mfc
- an IPv6 multicast routing daemon, which only supports static
- multicast routing.
- - pim6sd
- an IPv6 multicast routing daemon, which supports PIM-SM
- (Protocol Independent Multicast Sparse-Mode Version 2), and
- PIM-SSM (Source-Specific Multicast using PIM-SM)
- - pim6dd
- an IPv6 multicast routing daemon, which supports PIM-DM
- (Protocol Independent Multicast Dense-Mode Version 2)
- - pmsft
- a test program for Multicast Source Filter (MSF) using APIs
- specified in Socket Interface Extention for MSF (RFC3678).
- (on a non-IGMPv3/MLDv2-aware kernel, only join/leave
- operation is supported)
+WWW: http://mcast-tools.sourceforge.net/
Modified: head/net/pim6sd/pkg-plist
==============================================================================
--- head/net/mcast-tools/pkg-plist Sat Aug 22 13:27:34 2015 (r395030)
+++ head/net/pim6sd/pkg-plist Mon Sep 7 19:23:26 2015 (r396342)
@@ -1,21 +1,4 @@
-etc/pim6sd.conf.sample
-etc/pim6dd.conf.sample
-etc/mfc.conf.sample
-bin/mtrace6
-bin/mcastread
-bin/mcastsend
-bin/pmsft
-sbin/mfc
-sbin/pim6dd
+ at sample etc/pim6sd.conf.sample
sbin/pim6sd
-sbin/pim6stat
-man/man1/mcastread.1.gz
-man/man1/mcastsend.1.gz
-man/man1/pim6stat.1.gz
-man/man1/pmsft.1.gz
-man/man5/pim6dd.conf.5.gz
man/man5/pim6sd.conf.5.gz
-man/man8/mfc.8.gz
-man/man8/mtrace6.8.gz
-man/man8/pim6dd.8.gz
man/man8/pim6sd.8.gz
More information about the svn-ports-all
mailing list