svn commit: r396335 - in head/net/mrouted: . files
Hiroki Sato
hrs at FreeBSD.org
Mon Sep 7 18:24:40 UTC 2015
Author: hrs
Date: Mon Sep 7 18:24:38 2015
New Revision: 396335
URL: https://svnweb.freebsd.org/changeset/ports/396335
Log:
Update to 3.9.7.
Deleted:
head/net/mrouted/files/patch-route.c
head/net/mrouted/files/patch-vif.c
Modified:
head/net/mrouted/Makefile
head/net/mrouted/distinfo
head/net/mrouted/files/mrouted.in
head/net/mrouted/files/patch-Makefile
head/net/mrouted/files/patch-mtrace.c
Modified: head/net/mrouted/Makefile
==============================================================================
--- head/net/mrouted/Makefile Mon Sep 7 18:15:20 2015 (r396334)
+++ head/net/mrouted/Makefile Mon Sep 7 18:24:38 2015 (r396335)
@@ -2,10 +2,8 @@
# $FreeBSD$
PORTNAME= mrouted
-PORTVERSION= 3.9.6
-PORTREVISION= 1
+PORTVERSION= 3.9.7
CATEGORIES= net
-MASTER_SITES= GHC
MAINTAINER= hrs at FreeBSD.org
COMMENT= Multicast routing daemon providing DVMRP for IPv4
@@ -13,19 +11,19 @@ COMMENT= Multicast routing daemon provid
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_RC_SUBR= mrouted
-USES= gmake tar:bzip2
+USES= tar:bzip2
USE_GITHUB= yes
+USE_RC_SUBR= mrouted
GH_ACCOUNT= troglobit
-MAKE_ARGS= sysconfdir=${PREFIX}/etc \
- mandir=${MAN8PREFIX}/man/man8
+HAS_CONFIGURE= yes
+MAKE_ARGS= sysconfdir="${PREFIX}/etc" \
+ mandir="${MAN8PREFIX}/man/man8"
PORTDOCS= README AUTHORS ChangeLog
PLIST_FILES= sbin/map-mbone sbin/mrouted sbin/mrinfo sbin/mtrace \
etc/mrouted.conf man/man8/map-mbone.8.gz \
man/man8/mrinfo.8.gz man/man8/mrouted.8.gz \
man/man8/mtrace.8.gz
OPTIONS_DEFINE= DOCS
-
-DOCS_MAKE_ARGS= datadir=${DOCSDIR} doc=yes
+DOCS_MAKE_ARGS= datadir="${DOCSDIR}" doc=yes
.include <bsd.port.mk>
Modified: head/net/mrouted/distinfo
==============================================================================
--- head/net/mrouted/distinfo Mon Sep 7 18:15:20 2015 (r396334)
+++ head/net/mrouted/distinfo Mon Sep 7 18:24:38 2015 (r396335)
@@ -1,2 +1,2 @@
-SHA256 (mrouted-3.9.6.tar.bz2) = 8f6bdbd6eec1da3f6b0ca651a0484d7bdf7d7ead6c5d47abbaef0dfed949eccf
-SIZE (mrouted-3.9.6.tar.bz2) = 112713
+SHA256 (troglobit-mrouted-3.9.7_GH0.tar.bz2) = 181908f7025c5a2dee2e50d86888780469eaa9e1bd42d3eca9dfed8274aecd3d
+SIZE (troglobit-mrouted-3.9.7_GH0.tar.bz2) = 142560
Modified: head/net/mrouted/files/mrouted.in
==============================================================================
--- head/net/mrouted/files/mrouted.in Mon Sep 7 18:15:20 2015 (r396334)
+++ head/net/mrouted/files/mrouted.in Mon Sep 7 18:24:38 2015 (r396335)
@@ -1,8 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $
# $FreeBSD$
-#
# PROVIDE: mrouted
# REQUIRE: netif routing cleanvar
@@ -11,11 +9,12 @@
. /etc/rc.subr
name="mrouted"
-rcvar=mrouted_enable
-command=%%PREFIX%%/sbin/${name}
+rcvar="${name}_enable"
+command="%%PREFIX%%/sbin/$name"
pidfile="/var/run/${name}.pid"
-required_files=%%PREFIX%%/etc/${name}.conf
+required_files="%%PREFIX%%/etc/${name}.conf"
extra_commands="reload"
+: ${mrouted_enable-"NO"}
load_rc_config $name
run_rc_command "$1"
Modified: head/net/mrouted/files/patch-Makefile
==============================================================================
--- head/net/mrouted/files/patch-Makefile Mon Sep 7 18:15:20 2015 (r396334)
+++ head/net/mrouted/files/patch-Makefile Mon Sep 7 18:24:38 2015 (r396335)
@@ -1,15 +1,49 @@
---- Makefile.orig 2011-10-23 17:03:36.000000000 +0900
-+++ Makefile 2013-10-17 12:59:19.000000000 +0900
-@@ -51,7 +51,7 @@
+--- Makefile.orig 2014-12-28 14:23:52 UTC
++++ Makefile
+@@ -16,8 +16,8 @@ CC ?= $(CROSS)gcc
+
+ prefix ?= /usr/local
+ sysconfdir ?= /etc
+-datadir = $(prefix)/share/doc/mrouted
+-mandir = $(prefix)/share/man/man8
++datadir ?= $(prefix)/share/doc/mrouted
++mandir ?= $(prefix)/share/man/man8
+
+ # This magic trick looks like a comment, but works on BSD PMake
+ #include <config.mk>
+@@ -36,15 +36,15 @@ MTRACE_OBJS = mtrace.o $(EXTRA_OBJS)
+
+ ## Common
+ CFLAGS += $(MCAST_INCLUDE) $(INCLUDES) $(DEFS) $(USERCOMPILE)
+-CFLAGS += -O2 -W -Wall -Werror
++#CFLAGS += -O2 -W -Wall -Werror
+ #CFLAGS += -O -g
+ LDLIBS = $(EXTRA_LIBS)
+ LDFLAGS += -Wl,-Map,$@.map
+ OBJS = $(IGMP_OBJS) $(ROUTER_OBJS) $(MAPPER_OBJS) $(MRINFO_OBJS) \
$(MTRACE_OBJS) $(MSTAT_OBJS)
SRCS = $(OBJS:.o=.c)
- MANS = $(addsuffix .8,$(EXECS))
+-MANS = $(addsuffix .8,$(EXECS))
-DISTFILES = README AUTHORS LICENSE ChangeLog
++MANS = ${EXECS:S/$/.8/}
+DISTFILES = README AUTHORS ChangeLog
LINT = splint
LINTFLAGS = $(MCAST_INCLUDE) $(filter-out -W -Wall -Werror, $(CFLAGS)) -posix-lib -weak -skipposixheaders
-@@ -70,13 +70,13 @@
+@@ -52,24 +52,22 @@ LINTFLAGS = $(MCAST_INCLUDE) $(filte
+ all: $(EXECS) $(MSTAT)
+
+ .y.c:
+- @printf " YACC $@\n"
+- @$(YACC) $<
++ $(YACC) $<
+ - at mv y.tab.c $@ || mv $(<:.y=.tab.c) $@
+
+ .c.o:
+- @printf " CC $@\n"
+- @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
install: $(EXECS)
@install -d $(DESTDIR)$(prefix)/sbin
@install -d $(DESTDIR)$(sysconfdir)
@@ -17,7 +51,8 @@
+ @[ -z "${doc}" ] || install -d $(DESTDIR)$(datadir)
@install -d $(DESTDIR)$(mandir)
@for file in $(EXECS); do \
- install -m 0755 $$file $(DESTDIR)$(prefix)/sbin/$$file; \
+- install -m 0755 $$file $(DESTDIR)$(prefix)/sbin/$$file; \
++ install -s -m 0755 $$file $(DESTDIR)$(prefix)/sbin/$$file; \
done
@install -b -m 0644 $(CONFIG) $(DESTDIR)$(sysconfdir)/$(CONFIG)
- @for file in $(DISTFILES); do \
@@ -25,3 +60,36 @@
install -m 0644 $$file $(DESTDIR)$(datadir)/$$file; \
done
@for file in $(MANS); do \
+@@ -87,27 +85,22 @@ uninstall:
+ done
+
+ mrouted: $(IGMP_OBJS) $(ROUTER_OBJS) $(CMULIBS)
+- @printf " LINK $@\n"
+- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
+
+ vers.c: Makefile
+ @echo $(VERSION) | sed -e 's/.*/char todaysversion[]="&";/' > vers.c
+
+ map-mbone: $(IGMP_OBJS) $(MAPPER_OBJS)
+- @printf " LINK $@\n"
+- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
+
+ mrinfo: $(IGMP_OBJS) $(MRINFO_OBJS)
+- @printf " LINK $@\n"
+- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
+
+ mtrace: $(IGMP_OBJS) $(MTRACE_OBJS)
+- @printf " LINK $@\n"
+- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
+
+ mstat: $(MSTAT_OBJS) $(CMULIBS)
+- @printf " LINK $@\n"
+- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
+
+ # Runs Clang scan-build on the whole tree
+ check: clean
Modified: head/net/mrouted/files/patch-mtrace.c
==============================================================================
--- head/net/mrouted/files/patch-mtrace.c Mon Sep 7 18:15:20 2015 (r396334)
+++ head/net/mrouted/files/patch-mtrace.c Mon Sep 7 18:24:38 2015 (r396335)
@@ -1,5 +1,5 @@
---- mtrace.c.orig 2011-10-23 10:03:36.000000000 +0200
-+++ mtrace.c 2014-12-20 20:31:14.000000000 +0100
+--- mtrace.c.orig 2014-12-28 14:23:52 UTC
++++ mtrace.c
@@ -903,6 +903,12 @@ void stat_line(struct tr_resp *r, struct
}
}
More information about the svn-ports-all
mailing list