svn commit: r525713 - in head/net/frr5: . files

[Olivier Cochard]

Author: olivier
Date: Mon Feb 10 16:25:53 2020
New Revision: 525713
URL: https://svnweb.freebsd.org/changeset/ports/525713

Log:
  - Fix starting daemon in integrated configuration mode
  - While here, add 'dynamicrouting' to RC's PROVIDE and fix Makefile order
  
  PR:		239497
  Submitted by:	Nicolas Deffayet <nicolas at deffayet.com>

Modified:
  head/net/frr5/Makefile
  head/net/frr5/files/frr.in

Modified: head/net/frr5/Makefile
==============================================================================
--- head/net/frr5/Makefile	Mon Feb 10 15:42:52 2020	(r525712)
+++ head/net/frr5/Makefile	Mon Feb 10 16:25:53 2020	(r525713)
@@ -2,8 +2,8 @@
 
 PORTNAME=	frr
 PORTVERSION=	5.0.2
-PORTREVISION=	2
 DISTVERSIONPREFIX=	frr-
+PORTREVISION=	3
 CATEGORIES=	net
 PKGNAMESUFFIX=	5
 
@@ -13,13 +13,14 @@ COMMENT=	IP routing protocol suite including BGP, IS-I
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
+		makeinfo python:2.7,build readline
+
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libjson-c.so:devel/json-c
 
 CONFLICTS=	openbgpd openospfd zebra quagga frr6 frr7
 
-USES=		autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
-		makeinfo python:2.7,build readline
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes

Modified: head/net/frr5/files/frr.in
==============================================================================
--- head/net/frr5/files/frr.in	Mon Feb 10 15:42:52 2020	(r525712)
+++ head/net/frr5/files/frr.in	Mon Feb 10 16:25:53 2020	(r525713)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 
-# PROVIDE: frr
+# PROVIDE: frr dynamicrouting
 # REQUIRE: netif routing
 # KEYWORD: nojailvnet shutdown
 
@@ -92,12 +92,16 @@ do_cmd()
 	frr_cmd=$1
 	for daemon in ${frr_daemons}; do
 	    command=%%PREFIX%%/sbin/${daemon}
-	    required_files=%%ETCDIR%%/${daemon}.conf
+	    if checkyesno frr_vtysh_boot; then
+                required_files=%%ETCDIR%%/frr.conf
+	    else
+	        required_files=%%ETCDIR%%/${daemon}.conf
+	    fi
 	    pidfile=/var/run/frr/${daemon}.pid
 	    if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then
 		check_config
 	    fi
-	    if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then
+	    if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ] && ! checkyesno frr_vtysh_boot; then
 			continue
 	    fi
 	    if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then