From owner-svn-ports-all@FreeBSD.ORG Mon Nov 12 03:03:03 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A35743FA; Mon, 12 Nov 2012 03:03:03 +0000 (UTC) (envelope-from sumikawa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8A1418FC12; Mon, 12 Nov 2012 03:03:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAC333qk041851; Mon, 12 Nov 2012 03:03:03 GMT (envelope-from sumikawa@svn.freebsd.org) Received: (from sumikawa@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAC333Lu041849; Mon, 12 Nov 2012 03:03:03 GMT (envelope-from sumikawa@svn.freebsd.org) Message-Id: <201211120303.qAC333Lu041849@svn.freebsd.org> From: Munechika SUMIKAWA Date: Mon, 12 Nov 2012 03:03:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307324 - in head/net/zebra: . 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.14 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: Mon, 12 Nov 2012 03:03:03 -0000 Author: sumikawa Date: Mon Nov 12 03:03:03 2012 New Revision: 307324 URL: http://svnweb.freebsd.org/changeset/ports/307324 Log: - Use arguments for different zebra services. Default is "-d" - Update to use OPTIONSNG - Rename LIBPAM to PAM (shared description) - Drop my maintainership PR: ports/170678 Submitted by: jgh Feature safe: yes Modified: head/net/zebra/Makefile head/net/zebra/files/zebractl.in Modified: head/net/zebra/Makefile ============================================================================== --- head/net/zebra/Makefile Mon Nov 12 02:39:40 2012 (r307323) +++ head/net/zebra/Makefile Mon Nov 12 03:03:03 2012 (r307324) @@ -21,67 +21,83 @@ COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 CONFLICTS= openbgpd-[0-9]* quagga-[0-9]* quagga-re-[0-9]* openospfd-[0-9]* SUB_FILES= pkg-message zebractl +SUB_LIST= BGPDARGS=${BGPDARGS} \ + OSPFDARGS=${OSPFDARGS} \ + OSPF6DARGS=${OSPFDARGS} \ + RIPDARGS=${RIPDARGS} \ + RIPNGDARGS=${RIPNGDARGS} \ + ZEBRAARGS=${ZEBRAARGS} USE_SUBMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/zebra SCRIPTS_ENV= WRKDIRPREFIX=${WRKDIRPREFIX} -OPTIONS= IPV6 "enable IPv6 support" on \ - LIBPAM "enable PAM authentication for vtysh" off \ - OSPFNSSA "turn on undergoing NSSA feature" off \ - SNMP "enable SNMP support" off \ - TCPZEBRA "enable TCP/IP socket connection" off \ - BGPD "enable BGPD" on \ - OSPF6D "enable OSPF6D" on \ - OSPFD "enable OSPFD" on \ - RIPD "enable RIPD" on \ - RIPNGD "enable RIPNGD" on \ - VTYSH "enable VTYSH" on +OPTIONS_DEFINE= IPV6 PAM OSPFNSSA SNMP TCPZEBRA BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH + +PAM_DESC= PAM authentication for vtysh +OSPFNSSA_DESC= undergoing NSSA feature +TCPZEBRA_DESC= TCP/IP socket connection +BGPD_DESC= BGPD support +OSPF6D_DESC= OSPF6D support +OSPFD_DESC= OSPFD support +RIPD_DESC= RIPD support +RIPNGD_DESC= RIPNGD support +VTYSH_DESC= VTYSH support + +OPTIONS_DEFAULT= IPV6 BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH +NO_OPTIONS_SORT= yes MAN1= vtysh.1 MAN8= bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 INFO= zebra +BGPDARGS?= -d +OSPFDARGS?= -d +OSPF6DARGS?= -d +RIPDARGS?= -d +RIPNGDARGS?= -d +ZEBRAARGS?= -d + .include -.if defined (WITHOUT_IPV6) +.if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--disable-ipv6 WITHOUT_OSPF6D= yes WITHOUT_RIPNGD= yes .endif -.if defined (WITH_LIBPAM) +.if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+=--with-libpam .endif -.if defined (WITH_OSPFNSSA) +.if ${PORT_OPTIONS:MOSPFNSSA} CONFIGURE_ARGS+=--enable-nssa .endif -.if defined (WITH_SNMP) +.if ${PORT_OPTIONS:MSNMP} CONFIGURE_ARGS+=--enable-snmp LIB_DEPENDS+=snmp.4:${PORTSDIR}/net-mgmt/net-snmp4:install .endif -.if defined (WITH_TCPZEBRA) +.if ${PORT_OPTIONS:MTCPZEBRA} CONFIGURE_ARGS+=--enable-tcp-zebra .endif -.if !defined(WITHOUT_BGPD) +.if ${PORT_OPTIONS:MBGPD} PLIST_SUB+= BGPD="" .else CONFIGURE_ARGS+=--disable-bgpd PLIST_SUB+= BGPD="@comment " .endif -.if !defined(WITHOUT_OSPF6D) +.if ${PORT_OPTIONS:MOSPF6D} PLIST_SUB+= OSPF6D="" .else CONFIGURE_ARGS+=--disable-ospf6d PLIST_SUB+= OSPF6D="@comment " .endif -.if !defined(WITHOUT_OSPFD) +.if ${PORT_OPTIONS:MOSPFD} PLIST_SUB+= OSPF6D="" PLIST_SUB+= OSPFD="" .else @@ -89,21 +105,21 @@ CONFIGURE_ARGS+=--disable-ospfd PLIST_SUB+= OSPFD="@comment " .endif -.if !defined(WITHOUT_RIPD) +.if ${PORT_OPTIONS:MRIPD} PLIST_SUB+= RIPD="" .else CONFIGURE_ARGS+=--disable-ripd PLIST_SUB+= RIPD="@comment " .endif -.if !defined(WITHOUT_RIPNGD) +.if ${PORT_OPTIONS:MRIPNGD} PLIST_SUB+= RIPNGD="" .else CONFIGURE_ARGS+=--disable-ripngd PLIST_SUB+= RIPNGD="@comment " .endif -.if !defined(WITHOUT_VTYSH) +.if ${PORT_OPTIONS:MVTYSH) PLIST_SUB+= VTYSH="" CONFIGURE_ARGS+=--enable-vtysh .else Modified: head/net/zebra/files/zebractl.in ============================================================================== --- head/net/zebra/files/zebractl.in Mon Nov 12 02:39:40 2012 (r307323) +++ head/net/zebra/files/zebractl.in Mon Nov 12 03:03:03 2012 (r307324) @@ -24,17 +24,17 @@ case $1 in exit 1 fi [ -f %%ETCDIR%%/zebra.conf ] \ - && %%PREFIX%%/sbin/zebra -d && echo -n ' zebra' + && %%PREFIX%%/sbin/zebra %%ZEBRAARGS%% && echo -n ' zebra' [ -f %%ETCDIR%%/ripd.conf ] \ - && %%PREFIX%%/sbin/ripd -d && echo -n ' ripd' + && %%PREFIX%%/sbin/ripd %%RIPDARGS%% && echo -n ' ripd' [ -f %%ETCDIR%%/ripngd.conf ] \ - && %%PREFIX%%/sbin/ripngd -d && echo -n ' ripngd' + && %%PREFIX%%/sbin/ripngd %%RIPNGDARGS%% && echo -n ' ripngd' [ -f %%ETCDIR%%/ospfd.conf ] \ - && %%PREFIX%%/sbin/ospfd -d && echo -n ' ospfd' + && %%PREFIX%%/sbin/ospfd %%OSPFDARGS%% && echo -n ' ospfd' [ -f %%ETCDIR%%/ospf6d.conf ] \ - && %%PREFIX%%/sbin/ospf6d -d && echo -n ' ospf6d' + && %%PREFIX%%/sbin/ospf6d %%OSPF6DARGS%% && echo -n ' ospf6d' [ -f %%ETCDIR%%/bgpd.conf ] \ - && %%PREFIX%%/sbin/bgpd -d && echo -n ' bgpd' + && %%PREFIX%%/sbin/bgpd %%BGPDARGS%% && echo -n ' bgpd' ;; stop)