From owner-svn-ports-all@FreeBSD.ORG Thu Oct 2 18:33:44 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 743F6308; Thu, 2 Oct 2014 18:33:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46944D7D; Thu, 2 Oct 2014 18:33:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s92IXi12031779; Thu, 2 Oct 2014 18:33:44 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s92IXhgG031777; Thu, 2 Oct 2014 18:33:43 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201410021833.s92IXhgG031777@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 2 Oct 2014 18:33:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369845 - in head/net/quagga: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Oct 2014 18:33:44 -0000 Author: mat Date: Thu Oct 2 18:33:43 2014 New Revision: 369845 URL: https://svnweb.freebsd.org/changeset/ports/369845 QAT: https://qat.redports.org/buildarchive/r369845/ Log: Learn to write shell scripts. Pointy hat to: mat Sponsored by: Absolight Modified: head/net/quagga/Makefile head/net/quagga/files/quagga.in Modified: head/net/quagga/Makefile ============================================================================== --- head/net/quagga/Makefile Thu Oct 2 18:31:30 2014 (r369844) +++ head/net/quagga/Makefile Thu Oct 2 18:33:43 2014 (r369845) @@ -3,6 +3,7 @@ PORTNAME= quagga PORTVERSION= 0.99.23.1 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH Modified: head/net/quagga/files/quagga.in ============================================================================== --- head/net/quagga/files/quagga.in Thu Oct 2 18:31:30 2014 (r369844) +++ head/net/quagga/files/quagga.in Thu Oct 2 18:33:43 2014 (r369845) @@ -43,44 +43,6 @@ quagga_flags=${quagga_flags:-"-d"} quagga_daemons=${quagga_daemons:-"zebra ripd ripngd ospfd ospf6d bgpd isisd"} quagga_vtysh_boot=${quagga_vtysh_boot:-"NO"} -quagga_cmd=$1 - -case "$1" in - force*) - quagga_cmd=${quagga_cmd#force} - ;; - fast*) - quagga_cmd=${quagga_cmd#fast} - ;; -esac -shift - -if [ $# -ge 1 ]; then - quagga_daemons="$*" -fi - -case "${quagga_cmd}" in - start) - if [ ! -z ${quagga_extralibs_path} ]; then - /sbin/ldconfig -m ${quagga_extralibs_path} - fi - do_cmd "start" - ;; - stop) - quagga_daemons=$(reverse_list ${quagga_daemons}) - do_cmd "stop" - ;; - restart) - quagga_daemons=$(reverse_list ${quagga_daemons}) - do_cmd "stop" - quagga_daemons=$(reverse_list ${quagga_daemons}) - do_cmd "start" - ;; - *) - do_cmd "${quagga_cmd}" - ;; -esac - check_config() { echo "Checking $daemon.conf" @@ -137,3 +99,41 @@ do_cmd() fi return ${ret} } + +quagga_cmd=$1 + +case "$1" in + force*) + quagga_cmd=${quagga_cmd#force} + ;; + fast*) + quagga_cmd=${quagga_cmd#fast} + ;; +esac +shift + +if [ $# -ge 1 ]; then + quagga_daemons="$*" +fi + +case "${quagga_cmd}" in + start) + if [ ! -z ${quagga_extralibs_path} ]; then + /sbin/ldconfig -m ${quagga_extralibs_path} + fi + do_cmd "start" + ;; + stop) + quagga_daemons=$(reverse_list ${quagga_daemons}) + do_cmd "stop" + ;; + restart) + quagga_daemons=$(reverse_list ${quagga_daemons}) + do_cmd "stop" + quagga_daemons=$(reverse_list ${quagga_daemons}) + do_cmd "start" + ;; + *) + do_cmd "${quagga_cmd}" + ;; +esac