Solaris Package files: Rename Quagga to FRR

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

solaris/Makefile.am

@@ -7,13 +7,13 @@
 # the names of the various subpackages, and some convenient 
 # derived variables.
 pkg_names = daemons dev doc libs smf
-pkg_quagga_daemons = zebra bgpd ospfd ospf6d ripd ripngd
+pkg_frr_daemons = zebra bgpd ospfd ospf6d ripd ripngd
 pkg_name_rev = @PACKAGE_VERSION@-@CONFDATE@-@target_os@-@target_cpu@
 pkg_depends = $(pkg_names:%=depend.%)
 pkg_packages = $(pkg_names:%=@PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg)
 pkg_pkginfos = $(pkg_names:%=pkginfo.%.full)
 pkg_prototypes = $(pkg_names:%=prototype.%)
-pkg_manifests = quagga.xml
+pkg_manifests = frr.xml
 
 # pkgmk variable substitutions wont grok ${variable} in prototype
 # file, so we cant let autoconf generate the file sadly
@@ -35,7 +35,7 @@ edit = $(SED) \
 	-e 's,@enable_user\@,$(enable_user),g' \
 	-e 's,@enable_group\@,$(enable_group),g' \
 	-e 's,@enable_vty_group\@,$(enable_vty_group),g' \
-	-e 's,@quagga_statedir\@,$(quagga_statedir),g' \
+	-e 's,@frr_statedir\@,$(frr_statedir),g' \
 	-e 's,[@]PACKAGE_NAME[@],@PACKAGE_NAME@,g' \
  	-e 's,[@]PACKAGE_TARNAME[@],@PACKAGE_TARNAME@,g' \
  	-e 's,[@]PACKAGE_VERSION[@],@PACKAGE_VERSION@,g' \
@@ -90,15 +90,15 @@ depend.%: $(srcdir)/depend.%.in Makefile
 	$(edit) $< > $@
 
 # method file (bit like init script)
-quagga.init: $(srcdir)/quagga.init.in Makefile
+frr.init: $(srcdir)/frr.init.in Makefile
 	rm -f $@
 	$(edit) $< > $@
 
 # construct the pkg
 @PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg: prototype.% \
-		depend.% quagga.init pkginfo.%.full
+		depend.% frr.init pkginfo.%.full
 	($(pkg_make) && \
-	$(pkg_trans) "QUAGGA$*")
+	$(pkg_trans) "FRR$*")
 
 %.pkg.gz : %.pkg
 	(gzip -c $< > $@)
@@ -107,17 +107,17 @@ quagga.init: $(srcdir)/quagga.init.in Makefile
 #BUILT_SOURCES = pkginfo.daemons pkginfo.dev pkginfo.doc pkginfo.libs \
 #	prototype.daemons prototype.dev prototype.doc prototype.libs
 BUILT_SOURCES = $(pkg_pkginfos) pkginfo.tmpl $(pkg_prototypes) \
-	$(pkg_manifests) $(pkg_depends) quagga.init
+	$(pkg_manifests) $(pkg_depends) frr.init
 
 CLEANFILES = $(BUILT_SOURCES) $(pkg_packages)
 
 EXTRA_DIST = $(pkg_manifests:%=%.in) $(pkg_prototypes:%=%.in) \
 	$(pkg_names:%=pkginfo.%.tmpl.in) $(srcdir)/pkginfo.tmpl.in \
-	$(pkg_depends:%=%.in) quagga.init.in README.txt
+	$(pkg_depends:%=%.in) frr.init.in README.txt
 
 pkg-root-install:
 	(cd $(top_builddir) && \
-	 $(MAKE) DESTDIR=$(abs_builddir)/quagga-root install)
+	 $(MAKE) DESTDIR=$(abs_builddir)/frr-root install)
 
 packages: $(pkg_packages)
 

solaris/README.txt

@@ -15,21 +15,20 @@ Requirements:
   
   i.manifest must be at least version 1.5. Place these scripts in
   this directory if you are using Solaris 10 GA (which does not ship with
-  these scripts), or in the solaris/ directory in the Quagga source.
+  these scripts), or in the solaris/ directory in the FreeRangeRouting source.
 
 
 Package creation instructions:
 ------------------------------
 
-1. Configure and build Quagga in the top level build directory as per
+1. Configure and build FreeRangeRouting (frr) in the top level build directory as per normal, eg:
-normal, eg:
 
-	./configure --prefix=/usr/local/quagga \
+	./configure --prefix=/usr/local/frr \
-		--localstatedir=/var/run/quagga
+		--localstatedir=/var/run/frr \
 		--enable-gcc-rdynamic --enable-opaque-lsa --enable-ospf-te \
-		--enable-multipath=64 --enable-user=quagga \
+		--enable-multipath=64 --enable-user=frr \
 		--enable-ospfclient=yes --enable-ospfapi=yes  \
-		--enable-group=quagga --enable-nssa --enable-opaque-lsa
+		--enable-group=frr --enable-nssa --enable-opaque-lsa
 
 You will need /usr/sfw/bin and /usr/ccs/bin in your path.
 
@@ -45,13 +44,13 @@ appropriate, eg:
 
 This should result in 4 packages being created:
 
-	quagga-libs-...-$ARCH.pkg 	- QUAGGAlibs
+	frr-libs-...-$ARCH.pkg 	- FRRlibs
-	quagga-daemons-...-$ARCH.pkg	- QUAGGAdaemons
+	frr-daemons-...-$ARCH.pkg	- FRRdaemons
-	quagga-doc-...-$ARCH.pkg	- QUAGGAdoc
+	frr-doc-...-$ARCH.pkg	- FRRdoc
-	quagga-dev-...-$ARCH.pkg	- QUAGGAdev
+	frr-dev-...-$ARCH.pkg	- FRRdev
-	quagga-smf-...-$ARCH.pkg	- QUAGGAsmf
+	frr-smf-...-$ARCH.pkg	- FRRsmf
 
-QUAGGAlibs and QUAGGAdaemons are needed for daemon runtime. QUAGGAsmf
+FRRlibs and FRRdaemons are needed for daemon runtime. FRRsmf
 provides the required bits for Solaris 10+ SMF support.
 
 
@@ -59,7 +58,7 @@ Install and post-install configuration notes:
 ---------------------------------------------
 
 - If you specified a user/group which does not exist per default on Solaris
-  (eg quagga/quagga) you *must* create these before installing these on a
+  (eg frr/frr) you *must* create these before installing these on a
   system. The packages do *not* create the users.
 
 - The configuration files are not created. You must create the configuration
@@ -69,107 +68,107 @@ Install and post-install configuration notes:
 
 	 password whatever
 
-  The user which quagga runs as must have write permissions on this file, no
+  The user which frr runs as must have write permissions on this file, no
   other user should have read permissions, and you would also have to enable
   the telnet interface (see below).
 
 - SMF notes:
 
-  - QUAGGAsmf installs a svc:/network/routing/quagga service, with an
+  - FRRsmf installs a svc:/network/routing/frr service, with an
     instance for each daemon
   
-  - The state of all instances of quagga service can be inspected with:
+  - The state of all instances of frr service can be inspected with:
   
-  	svcs -l svc:/network/routing/quagga
+  	svcs -l svc:/network/routing/frr
   
-    or typically just with a shortcut of 'quagga':
+    or typically just with a shortcut of 'frr':
     
-    	svcs -l quagga
+    	svcs -l frr
   
-  - A specific instance of the quagga service can be inspected by specifying
+  - A specific instance of the frr service can be inspected by specifying
-    the daemon name as the instance, ie quagga:<daemon>:
+    the daemon name as the instance, ie frr:<daemon>:
     
-    	svcs -l svc:/network/routing/quagga:zebra
+    	svcs -l svc:/network/routing/frr:zebra
-    	svcs -l svc:/network/routing/quagga:ospfd
+    	svcs -l svc:/network/routing/frr:ospfd
     	<etc>
 
-    or typically just with the shortcut of 'quagga:<daemon>' or even
+    or typically just with the shortcut of 'frr:<daemon>' or even
     <daemon>:
     
-    	svcs -l quagga:zebra
+    	svcs -l frr:zebra
     	svcs -l ospfd
     
     Eg:
     
     # # svcs -l ripd
-    fmri         svc:/network/routing/quagga:ripd
+    fmri         svc:/network/routing/frr:ripd
-    name         Quagga: ripd, RIPv1/2 IPv4 routing protocol daemon.
+    name         FreeRangeRouting: ripd, RIPv1/2 IPv4 routing protocol daemon.
     enabled      true
     state        online
     next_state   none
     state_time   Wed Jun 15 16:21:02 2005
-    logfile      /var/svc/log/network-routing-quagga:ripd.log
+    logfile      /var/svc/log/network-routing-frr:ripd.log
     restarter    svc:/system/svc/restarter:default
     contract_id  93 
-    dependency   require_all/restart svc:/network/routing/quagga:zebra (online)
+    dependency   require_all/restart svc:/network/routing/frr:zebra (online)
-    dependency   require_all/restart file://localhost//usr/local/quagga/etc/ripd.conf (online)
+    dependency   require_all/restart file://localhost//usr/local/frr/etc/ripd.conf (online)
     dependency   require_all/none svc:/system/filesystem/usr:default (online)
     dependency   require_all/none svc:/network/loopback (online)
 
   - Configuration of startup options is by way of SMF properties in a
-    property group named 'quagga'. The defaults should automatically be
+    property group named 'frr'. The defaults should automatically be
-    inline with how you configured Quagga in Step 1 above. 
+    inline with how you configured FreeRangeRouting in Step 1 above. 
   
   - By default the VTY interface is disabled. To change this, see below for
-    how to set the 'quagga/vty_port' property as appropriate for
+    how to set the 'frr/vty_port' property as appropriate for
     /each/ service. Also, the VTY is set to listen only to localhost by
-    default, you may change the 'quagga/vty_addr' property as appropriate
+    default, you may change the 'frr/vty_addr' property as appropriate
-    for both of the 'quagga' service and specific individual instances of
+    for both of the 'frr' service and specific individual instances of
-    the 'quagga' service (ie quagga:zebra, quagga:ospfd, etc..).
+    the 'frr' service (ie frr:zebra, frr:ospfd, etc..).
     
-  - Properties belonging to the 'quagga' service are inherited by all
+  - Properties belonging to the 'frr' service are inherited by all
     instances. Eg:
     
-    # svcprop -p quagga svc:/network/routing/quagga
+    # svcprop -p frr svc:/network/routing/frr
-    quagga/group astring root
+    frr/group astring root
-    quagga/retain boolean false
+    frr/retain boolean false
-    quagga/user astring root
+    frr/user astring root
-    quagga/vty_addr astring 127.1
+    frr/vty_addr astring 127.1
-    quagga/vty_port integer 0
+    frr/vty_port integer 0
     
-    # svcprop -p quagga svc:/network/routing/quagga:ospfd
+    # svcprop -p frr svc:/network/routing/frr:ospfd
-    quagga/retain_routes boolean false
+    frr/retain_routes boolean false
-    quagga/group astring root
+    frr/group astring root
-    quagga/retain boolean false
+    frr/retain boolean false
-    quagga/user astring root
+    frr/user astring root
-    quagga/vty_addr astring 127.1
+    frr/vty_addr astring 127.1
-    quagga/vty_port integer 0
+    frr/vty_port integer 0
     
     All instances will inherit these properties, unless the instance itself
     overrides these defaults. This also implies one can modify properties of
-    the 'quagga' service and have them apply to all daemons.
+    the 'frr' service and have them apply to all daemons.
     
-    # svccfg -s svc:/network/routing/quagga \
+    # svccfg -s svc:/network/routing/frr \
-    	setprop quagga/vty_addr = astring: ::1
+    	setprop frr/vty_addr = astring: ::1
     
-    # svcprop -p quagga svc:/network/routing/quagga
+    # svcprop -p frr svc:/network/routing/frr
-    quagga/group astring root
+    frr/group astring root
-    quagga/retain boolean false
+    frr/retain boolean false
-    quagga/user astring root
+    frr/user astring root
-    quagga/vty_port integer 0
+    frr/vty_port integer 0
-    quagga/vty_addr astring ::1
+    frr/vty_addr astring ::1
     
     # # You *must* refresh instances to have the property change
     # # take affect for the 'running snapshot' of service state.
-    # svcadm refresh quagga:ospfd
+    # svcadm refresh frr:ospfd
     
-    # svcprop -p quagga svc:/network/routing/quagga:ospfd
+    # svcprop -p frr svc:/network/routing/frr:ospfd
-    quagga/retain_routes boolean false
+    frr/retain_routes boolean false
-    quagga/group astring root
+    frr/group astring root
-    quagga/retain boolean false
+    frr/retain boolean false
-    quagga/user astring root
+    frr/user astring root
-    quagga/vty_port integer 0
+    frr/vty_port integer 0
-    quagga/vty_addr astring ::1
+    frr/vty_addr astring ::1
     
     Other daemon-specific options/properties may be available, however they
     are not yet honoured/used (eg ospfd/apiserver on svc:/network/ospf).
@@ -177,12 +176,11 @@ Install and post-install configuration notes:
   - As SMF is dependency aware, restarting network/zebra will restart all the
     other daemons.
   
-  - To upgrade from one set of Quagga packages to a newer release, one must
+  - To upgrade from one set of FreeRangeRouting packages to a newer release,
-    first pkgrm the installed packages. When one pkgrm's QUAGGAsmf all
+    one must first pkgrm the installed packages. When one pkgrm's FRRsmf all
     property configuration will be lost, and any customisations will have to
-    redone after installing the updated QUAGGAsmf package.
+    redone after installing the updated FRRsmf package.
   
 - These packages are not supported by Sun Microsystems, report bugs via the
-  usual Quagga channels, ie Bugzilla. Improvements/contributions of course
+  usual FreeRangeRouting channels, ie Issue Tracker. Improvements/contributions of course would be greatly appreciated.
-  would be greatly appreciated.
 

solaris/depend.daemons.in

@@ -1,4 +1,4 @@
-P QUAGGAlibs Quagga common runtime libraries
+P FRRlibs FreeRangeRouting common runtime libraries
 	@PACKAGE_VERSION@,REV=@CONFDATE@
 P SUNWcsu Core Solaris, (Usr)
 P SUNWcsr Core Solaris Libraries (Root)

solaris/depend.dev.in

@@ -1,2 +1,2 @@
-P QUAGGAlibs Quagga common runtime libraries
+P FRRlibs FreeRangeRouting common runtime libraries
 	@PACKAGE_VERSION@,REV=@CONFDATE@

solaris/depend.libs.in

@@ -1,5 +1,5 @@
 P SUNWcslr  Core Solaris Libraries (Root)
 P SUNWcsl Core Solaris, (Shared Libs)
 P SUNWlibmsr Math & Microtasking Libraries (Root)
-R QUAGGAdaemons Quagga daemons
+R FRRdaemons FreeRangeRouting daemons
-R QUAGGAdev
+R FRRdev

solaris/depend.smf.in

@@ -1,4 +1,4 @@
-P QUAGGAdaemons Quagga daemons
+P FRRaemons FreeRangeRouting daemons
 	@PACKAGE_VERSION@,REV=@CONFDATE@
 P SUNWcsu Core Solaris, (Usr)
 P SUNWcsr Core Solaris Libraries (Root)

solaris/frr.init.in

@@ -3,22 +3,22 @@
 # Copyright 2007 Sun Microsystems, Inc. All rights reserved.
 # Use is subject to license terms.
 #
-# This file is part of Quagga.
+# This file is part of FreeRangeRouting.
 #
-# Quagga is free software; you can redistribute it and/or modify it
+# FreeRangeRouting is free software; you can redistribute it and/or modify 
-# under the terms of the GNU General Public License as published by the
+# it under the terms of the GNU General Public License as published by the
 # Free Software Foundation; either version 2, or (at your option) any
 # later version.
 #
-# Quagga is distributed in the hope that it will be useful, but
+# FreeRangeRouting is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Quagga; see the file COPYING.  If not, write to the Free
+# along with FreeRangeRouting; see the file COPYING.  If not, write to 
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
-# 02111-1307, USA.
+# Boston, MA 02111-1307, USA.
 #
 # Starts/stops the given daemon
 
@@ -74,36 +74,36 @@ handle_routeadm_upgrade () {
 
 upgrade_config () {
 	DAEMON=$1
-	# handle upgrade of SUNWzebra to Quagga
+	# handle upgrade of SUNWzebra to FreeRangeRouting
-	if [ -d "/etc/quagga" -a ! -f "/etc/quagga/${DAEMON}.conf" ] ; then
+	if [ -d "/etc/frr" -a ! -f "/etc/frr/${DAEMON}.conf" ] ; then
 		if [ -f "/etc/sfw/zebra/${DAEMON}.conf" ] ; then
 			cp "/etc/sfw/zebra/${DAEMON}.conf" \
-				"/etc/quagga/${DAEMON}.conf.upgrade" \
+				"/etc/frr/${DAEMON}.conf.upgrade" \
 				|| exit $SMF_EXIT_ERR_FATAL
-			chown "${USER}:${GROUP}" "/etc/quagga/${DAEMON}.conf.upgrade" \
+			chown "${USER}:${GROUP}" "/etc/frr/${DAEMON}.conf.upgrade" \
 				|| exit $SMF_EXIT_ERR_FATAL
-			chmod 0600 "/etc/quagga/${DAEMON}.conf.upgrade" \
+			chmod 0600 "/etc/frr/${DAEMON}.conf.upgrade" \
 				|| exit $SMF_EXIT_ERR_FATAL
-			mv "/etc/quagga/${DAEMON}.conf.upgrade" "/etc/quagga/${DAEMON}.conf" \
+			mv "/etc/frr/${DAEMON}.conf.upgrade" "/etc/frr/${DAEMON}.conf" \
 				|| exit $SMF_EXIT_ERR_FATAL
 		fi
 	fi
 
-	if [ ! -f "/etc/quagga/${DAEMON}.conf" ] ; then
+	if [ ! -f "/etc/frr/${DAEMON}.conf" ] ; then
-		touch "/etc/quagga/${DAEMON}.conf.new" \
+		touch "/etc/frr/${DAEMON}.conf.new" \
 			|| exit $SMF_EXIT_ERR_FATAL
-		chown "${USER}:${GROUP}" "/etc/quagga/${DAEMON}.conf.new" \
+		chown "${USER}:${GROUP}" "/etc/frr/${DAEMON}.conf.new" \
 			|| exit $SMF_EXIT_ERR_FATAL
-		chmod 0600 "/etc/quagga/${DAEMON}.conf.new" \
+		chmod 0600 "/etc/frr/${DAEMON}.conf.new" \
 			|| exit $SMF_EXIT_ERR_FATAL
-		mv "/etc/quagga/${DAEMON}.conf.new" "/etc/quagga/${DAEMON}.conf" \
+		mv "/etc/frr/${DAEMON}.conf.new" "/etc/frr/${DAEMON}.conf" \
 			|| exit $SMF_EXIT_ERR_FATAL
 	fi
 }
 
 # Relevant to S10+
-quagga_is_globalzone () {
+frr_is_globalzone () {
-	if [ "${QUAGGA_INIT_ZONENAME:=`/sbin/zonename`}" = "global" \
+	if [ "${FRR_INIT_ZONENAME:=`/sbin/zonename`}" = "global" \
 		-o `/sbin/zonename -t` = "exclusive" ]; then
 		return 0
 	else
@@ -188,9 +188,9 @@ case $1 in
 esac
 
 if smf_present ; then
-	QUAGGA_METHOD="start"
+	FRR_METHOD="start"
 else
-	QUAGGA_METHOD="$1"
+	FRR_METHOD="$1"
 	shift;
 fi
 
@@ -208,7 +208,7 @@ case "${DAEMON}" in
 	bgpd)
 	;;
 	zebra | ospfd | ospf6d | ripd | ripngd )
-		quagga_is_globalzone || exit $SMF_EXIT_OK
+		frr_is_globalzone || exit $SMF_EXIT_OK
 	;;
 	*)
 		usage
@@ -216,7 +216,7 @@ case "${DAEMON}" in
 	;;
 esac
 
-# Older Quagga SMF packages pass daemon args on the commandline
+# Older FreeRangeRouting SMF packages pass daemon args on the commandline
 # Newer SMF routeadm model uses properties for each argument
 # so we must handle that.
 if [ smf_present -a -f "$ROUTEADMINCLUDE" ]; then
@@ -236,14 +236,14 @@ if [ ! -f "@sysconfdir@/${DAEMON}.conf" ] ; then
 	exit $SMF_EXIT_ERR_CONFIG
 fi
 
-# we need @quagga_statedir@ to exist, it probably is on tmpfs.
+# we need @frr_statedir@ to exist, it probably is on tmpfs.
-if [ ! -d @quagga_statedir@ ] ; then
+if [ ! -d @frr_statedir@ ] ; then
-	mkdir -p @quagga_statedir@
+	mkdir -p @frr_statedir@
-	chown @enable_user@:@enable_group@ @quagga_statedir@
+	chown @enable_user@:@enable_group@ @frr_statedir@
-	chmod 751 @quagga_statedir@
+	chmod 751 @frr_statedir@
 fi
 
-PIDFILE="@quagga_statedir@/${DAEMON}.pid"
+PIDFILE="@frr_statedir@/${DAEMON}.pid"
 
 start () {
 	if [ ! -x "$DAEMON_PATH/$DAEMON" ] ; then
@@ -259,7 +259,7 @@ stop_by_pidfile () {
 	fi
 }
 
-case "$QUAGGA_METHOD" in
+case "$FRR_METHOD" in
 'start')
 	start
 	;;

solaris/frr.xml.in

@@ -1,32 +1,32 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-	This file is part of Quagga.
+	This file is part of FreeRangeRouting (FRR)
 
-	Quagga is free software; you can redistribute it and/or modify it
+	FreeRangeRouting is free software; you can redistribute it and/or 
-	under the terms of the GNU General Public License as published by the
+	modify it under the terms of the GNU General Public License as 
-	Free Software Foundation; either version 2, or (at your option) any
+	published by the Free Software Foundation; either version 2, or 
-	later version.
+	(at your option) anylater version.
 
-	Quagga is distributed in the hope that it will be useful, but 
+	FreeRangeRouting is distributed in the hope that it will be useful, 
-	WITHOUT ANY WARRANTY; without even the implied warranty of
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 	General Public License for more details.
 
 	You should have received a copy of the GNU General Public License  
-	along with Quagga; see the file COPYING.  If not, write to the Free
+	along with FreeRangeRouting; see the file COPYING.  If not, write to 
-	Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+	the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
-	02111-1307, USA.
+	Boston, MA 02111-1307, USA.
 
 	Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 	Use is subject to license terms.
 
     Copyright 2015 Joyent, Inc.
 
-	ident	"@(#)quagga.xml	1.0	05/03/15 SMI"
+	ident	"@(#)frr.xml	1.0	19/01/17 SMI"
 -->
 
-<service_bundle type='manifest' name='SUNWquagga-daemons:quagga'>
+<service_bundle type='manifest' name='SUNWfrr-daemons:frr'>
 
 <service
 	name='network/routing/zebra'
@@ -34,7 +34,7 @@
 	version='1'>
 	
 	<single_instance />
-	<instance name='quagga' enabled='false'>
+	<instance name='frr' enabled='false'>
 	
 	<dependency name='fs'
 		grouping='require_all'
@@ -63,7 +63,7 @@
 	<exec_method
 		type='method'
 		name='start'
-		exec='/lib/svc/method/quagga zebra'
+		exec='/lib/svc/method/frr zebra'
 		timeout_seconds='60'>
 		<method_context>
 		  <method_credential
@@ -107,9 +107,9 @@
 		<propval name='value_authorization' type='astring' 
 		         value='solaris.smf.value.routing' />
 		
-		<!-- Options common to Quagga daemons
+		<!-- Options common to FreeRangeRouting daemons
 		     Property names are equivalent to the long
-		     option name, consult Quagga documentation -->
+		     option name, consult FreeRangeRouting documentation -->
 		<!-- The config file to use, if not the default -->
 		<propval name='config_file' type='astring' value=''/>
 		<!-- The vty_port to listen on if not the default.
@@ -124,7 +124,7 @@
 		     same name as user -->
 		<propval name='group' type='astring' value='' />
 		<!-- The pidfile to use, if not the default of
-		     @quagga_statedir@ -->
+		     @frr_statedir@ -->
 		<propval name='pid_file' type='astring' value='' />
 		
 		<!-- Options specific to zebra -->
@@ -142,14 +142,14 @@
 	<template>
 		<common_name>
 			<loctext xml:lang='C'>
-			Quagga: zebra, RIB, kernel intermediary and misc daemon
+			FreeRangeRouting: zebra, RIB, kernel intermediary and misc daemon
 			</loctext>
 		</common_name>
 		<documentation>
 			<manpage title='zebra' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='quagga.net' 
+			<doc_link name='freerangerouting.org' 
-				uri='http://www.quagga.net/' />
+				uri='http://www.freerangerouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -161,7 +161,7 @@
 	type='service'
 	version='1'>
 
-	<instance name='quagga' enabled='false'>
+	<instance name='frr' enabled='false'>
 
 	<dependency name='fs'
 		grouping='require_all'
@@ -194,13 +194,13 @@
 		grouping='require_all'
 		restart_on='restart'
 		type='service'>
-		<service_fmri value='svc:/network/routing/zebra:quagga' />
+		<service_fmri value='svc:/network/routing/zebra:frr' />
 	</dependency>
 
 	<exec_method
 		type='method'
 		name='start'
-		exec='/lib/svc/method/quagga ripd'
+		exec='/lib/svc/method/frr ripd'
 		timeout_seconds='60'>
 		<method_context>
 		  <method_credential
@@ -240,7 +240,7 @@
 		<propval name='value_authorization' type='astring' 
 		         value='solaris.smf.value.routing' />
 
-		<!-- Options common to Quagga daemons -->
+		<!-- Options common to FreeRangeRouting daemons -->
 		<!-- The config file to use, if not the default -->
 		<propval name='config_file' type='astring' value=''/>
 		<!-- The vty_port to listen on if not the default.
@@ -255,7 +255,7 @@
 		     same name as user -->
 		<propval name='group' type='astring' value='' />
 		<!-- The pidfile to use, if not the default of
-		     @quagga_statedir@ -->
+		     @frr_statedir@ -->
 		<propval name='pid_file' type='astring' value='' />
 		
 		<!-- Options specific to ripd -->
@@ -273,14 +273,14 @@
 	<template>
 		<common_name>
 			<loctext xml:lang='C'>
-			Quagga: ripd, RIPv1/2 IPv4 routing protocol daemon.
+			FreeRangeRouting: ripd, RIPv1/2 IPv4 routing protocol daemon.
 			</loctext>
 		</common_name>
 		<documentation>
 			<manpage title='ripd' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='quagga.net' 
+			<doc_link name='freerangerouting.org' 
-				uri='http://www.quagga.net/' />
+				uri='http://www.freerangerouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -292,7 +292,7 @@
 	type='service'
 	version='1'>
 
-	<instance name='quagga' enabled='false'>
+	<instance name='frr' enabled='false'>
 
 	<dependency name='fs'
 		grouping='require_all'
@@ -325,13 +325,13 @@
 		grouping='require_all'
 		restart_on='restart'
 		type='service'>
-		<service_fmri value='svc:/network/routing/zebra:quagga' />
+		<service_fmri value='svc:/network/routing/zebra:frr' />
 	</dependency>
 
 	<exec_method
 		type='method'
 		name='start'
-		exec='/lib/svc/method/quagga ripngd'
+		exec='/lib/svc/method/frr ripngd'
 		timeout_seconds='60'>
 		<method_context>
 		  <method_credential
@@ -369,7 +369,7 @@
 		<propval name='value_authorization' type='astring' 
 		         value='solaris.smf.value.routing' />
 
-		<!-- Options common to Quagga daemons -->
+		<!-- Options common to frr daemons -->
 		<!-- The config file to use, if not the default -->
 		<propval name='config_file' type='astring' value=''/>
 		<!-- The vty_port to listen on if not the default.
@@ -384,7 +384,7 @@
 		     same name as user -->
 		<propval name='group' type='astring' value='' />
 		<!-- The pidfile to use, if not the default of
-		     @quagga_statedir@ -->
+		     @frr_statedir@ -->
 		<propval name='pid_file' type='astring' value='' />
 
 		<!-- Options specific to ripngd -->
@@ -402,14 +402,14 @@
 	<template>
 		<common_name>
 			<loctext xml:lang='C'>
-			Quagga: ripngd, RIPng IPv6 routing protocol daemon.
+			frr: ripngd, RIPng IPv6 routing protocol daemon.
 			</loctext>
 		</common_name>
 		<documentation>
 			<manpage title='ripngd' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='quagga.net' 
+			<doc_link name='freerangerouting.org' 
-				uri='http://www.quagga.net/' />
+				uri='http://www.freerangerouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -421,7 +421,7 @@
 	type='service'
 	version='1'>
 
-	<instance name='quagga' enabled='false'>
+	<instance name='frr' enabled='false'>
 
 	<dependency name='fs'
 		grouping='require_all'
@@ -454,13 +454,13 @@
 		grouping='require_all'
 		restart_on='restart'
 		type='service'>
-		<service_fmri value='svc:/network/routing/zebra:quagga' />
+		<service_fmri value='svc:/network/routing/zebra:frr' />
 	</dependency>
 
 	<exec_method
 		type='method'
 		name='start'
-		exec='/lib/svc/method/quagga ospfd'
+		exec='/lib/svc/method/frr ospfd'
 		timeout_seconds='60'>
 		<method_context>
 		  <method_credential
@@ -503,7 +503,7 @@
 		<propval name='value_authorization' type='astring' 
 		         value='solaris.smf.value.routing' />
 
-		<!-- Options common to Quagga daemons -->
+		<!-- Options common to frr daemons -->
 		<!-- The config file to use, if not the default -->
 		<propval name='config_file' type='astring' value=''/>
 		<!-- The vty_port to listen on if not the default.
@@ -518,7 +518,7 @@
 		     same name as user -->
 		<propval name='group' type='astring' value='' />
 		<!-- The pidfile to use, if not the default of
-		     @quagga_statedir@ -->
+		     @frr_statedir@ -->
 		<propval name='pid_file' type='astring' value='' />
 	</property_group>
 
@@ -533,14 +533,14 @@
 	<template>
 		<common_name>
 			<loctext xml:lang='C'>
-			Quagga: ospfd, OSPFv2 IPv4 routing protocol daemon.
+			frr: ospfd, OSPFv2 IPv4 routing protocol daemon.
 			</loctext>
 		</common_name>
 		<documentation>
 			<manpage title='ospfd' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='quagga.net' 
+			<doc_link name='freerangerouting.org' 
-				uri='http://www.quagga.net/' />
+				uri='http://www.freerangerouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -552,7 +552,7 @@
 	type='service'
 	version='1'>
 
-	<instance name='quagga' enabled='false'>
+	<instance name='frr' enabled='false'>
 
 	<dependency name='fs'
 		grouping='require_all'
@@ -585,13 +585,13 @@
 		grouping='require_all'
 		restart_on='restart'
 		type='service'>
-		<service_fmri value='svc:/network/routing/zebra:quagga' />
+		<service_fmri value='svc:/network/routing/zebra:frr' />
 	</dependency>
 
 	<exec_method
 		type='method'
 		name='start'
-		exec='/lib/svc/method/quagga ospf6d'
+		exec='/lib/svc/method/frr ospf6d'
 		timeout_seconds='60'>
 		<method_context>
 		  <method_credential
@@ -629,7 +629,7 @@
 		<propval name='value_authorization' type='astring' 
 		         value='solaris.smf.value.routing' />
 
-		<!-- Options common to Quagga daemons -->
+		<!-- Options common to frr daemons -->
 		<!-- The config file to use, if not the default -->
 		<propval name='config_file' type='astring' value=''/>
 		<!-- The vty_port to listen on if not the default.
@@ -644,7 +644,7 @@
 		     same name as user -->
 		<propval name='group' type='astring' value='' />
 		<!-- The pidfile to use, if not the default of
-		     @quagga_statedir@ -->
+		     @frr_statedir@ -->
 		<propval name='pid_file' type='astring' value='' />
 	</property_group>
 
@@ -659,14 +659,14 @@
 	<template>
 		<common_name>
 			<loctext xml:lang='C'>
- 			Quagga: ospf6d, OSPFv3 IPv6 routing protocol daemon.
+ 			frr: ospf6d, OSPFv3 IPv6 routing protocol daemon.
 			</loctext>
 		</common_name>
 		<documentation>
 			<manpage title='ospf6d' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='quagga.net' 
+			<doc_link name='freerangerouting.org' 
-				uri='http://www.quagga.net/' />
+				uri='http://www.freerangerouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -679,7 +679,7 @@
 	type='service'
 	version='1'>
 
-	<instance name='quagga' enabled='false'>
+	<instance name='frr' enabled='false'>
 
 	<dependency name='fs'
 		grouping='require_all'
@@ -720,13 +720,13 @@
 		grouping='require_all'
 		restart_on='restart'
 		type='service'>
-		<service_fmri value='svc:/network/routing/zebra:quagga' />
+		<service_fmri value='svc:/network/routing/zebra:frr' />
 	</dependency>
 
 	<exec_method
 		type='method'
 		name='start'
-		exec='/lib/svc/method/quagga bgpd'
+		exec='/lib/svc/method/frr bgpd'
 		timeout_seconds='60'>
 		<method_context>
 		  <method_credential
@@ -771,7 +771,7 @@
 		<propval name='value_authorization' type='astring' 
 		         value='solaris.smf.value.routing' />
 
-		<!-- Options common to Quagga daemons. -->
+		<!-- Options common to frr daemons. -->
 		<!-- The config file to use, if not the default -->
 		<propval name='config_file' type='astring' value=''/>
 		<!-- The vty_port to listen on if not the default.
@@ -786,7 +786,7 @@
 		     same name as user -->
 		<propval name='group' type='astring' value='' />
 		<!-- The pidfile to use, if not the default of
-		     @quagga_statedir@ -->
+		     @frr_statedir@ -->
 		<propval name='pid_file' type='astring' value='' />
 
 		<!-- Options specific to bgpd -->
@@ -812,14 +812,14 @@
 	<template>
 		<common_name>
 			<loctext xml:lang='C'>
-			Quagga: bgpd, BGP routing protocol daemon.
+			frr: bgpd, BGP routing protocol daemon.
 			</loctext>
 		</common_name>
 		<documentation>
 			<manpage title='bgpd' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='quagga.net' 
+			<doc_link name='freerangerouting.org' 
-				uri='http://www.quagga.net/' />
+				uri='http://www.freerangerouting.org/' />
 		</documentation>
 	</template>
 	</instance>

solaris/pkginfo.daemons.tmpl.in

@@ -1,2 +1,2 @@
-PKG="QUAGGAdaemons"
+PKG="FRRdaemons"
 NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ daemons"

solaris/pkginfo.dev.tmpl.in

@@ -1,3 +1,3 @@
-PKG=QUAGGAdev
+PKG=FRRdev
 NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ development files"
 

solaris/pkginfo.doc.tmpl.in

@@ -1,2 +1,2 @@
-PKG=QUAGGAdoc
+PKG=FRRdoc
 NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ documentation"

solaris/pkginfo.libs.tmpl.in

@@ -1,2 +1,2 @@
-PKG=QUAGGAlibs
+PKG=FRRlibs
 NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ common runtime libraries"

solaris/pkginfo.smf.tmpl.in

@@ -1,2 +1,2 @@
-PKG="QUAGGAsmf"
+PKG="FRRsmf"
 NAME="@PACKAGE_NAME@ - @PACKAGE_NAME@ SMF support"

solaris/pkginfo.tmpl.in

@@ -1,9 +1,9 @@
 ARCH="@target_cpu@"
 CATEGORY="system"
 VERSION="@PACKAGE_VERSION@,REV=@CONFDATE@"
-VENDOR="http://www.quagga.net/"
+VENDOR="http://www.freerangerouting.org/"
 HOTLINE="@PACKAGE_BUGREPORT@"
-EMAIL=paul@quagga.net
+EMAIL=maintainers@freerangerouting.org
 DESC="@PACKAGE_NAME@ Routing Protocols"
 MAXINST=1
 CLASSES="none preserve renamenew manifest"

solaris/prototype.daemons.in

@@ -17,4 +17,4 @@ f none @sysconfdir@/ripd.conf.sample=$DESTDIR/@sysconfdir@/ripd.conf.sample 0644
 f none @sysconfdir@/ripngd.conf.sample=$DESTDIR/@sysconfdir@/ripngd.conf.sample 0644 root bin
 f none @sysconfdir@/ospfd.conf.sample=$DESTDIR/@sysconfdir@/ospfd.conf.sample 0644 root bin
 f none @sysconfdir@/ospf6d.conf.sample=$DESTDIR/@sysconfdir@/ospf6d.conf.sample 0644 root bin
-d none @quagga_statedir@=$DESTDIR/@quagga_statedir@ 0711 @enable_user@ @enable_group@
+d none @frr_statedir@=$DESTDIR/@frr_statedir@ 0711 @enable_user@ @enable_group@

solaris/prototype.dev.in

@@ -8,50 +8,50 @@ f none @libdir@/libospf.a=$DESTDIR/@libdir@/libospf.a 0644 root bin
 f none @libdir@/libospfapiclient.la=$DESTDIR/@libdir@/libospfapiclient.la 0755 root bin
 f none @libdir@/libospfapiclient.a=$DESTDIR/@libdir@/libospfapiclient.a 0644 root bin
 d none @includedir@=$DESTDIR/@includedir@ 0755 root bin
-d none @includedir@/quagga=$DESTDIR/@includedir@/quagga 0755 root bin
+d none @includedir@/frr=$DESTDIR/@includedir@/frr 0755 root bin
-d none @includedir@/quagga/ospfd=$DESTDIR/@includedir@/quagga/ospfd 0755 root bin
+d none @includedir@/frr/ospfd=$DESTDIR/@includedir@/frr/ospfd 0755 root bin
-f none @includedir@/quagga/ospfd/ospf_api.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_api.h 0644 root bin
+f none @includedir@/frr/ospfd/ospf_api.h=$DESTDIR/@includedir@/frr/ospfd/ospf_api.h 0644 root bin
-f none @includedir@/quagga/ospfd/ospf_asbr.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_asbr.h 0644 root bin
+f none @includedir@/frr/ospfd/ospf_asbr.h=$DESTDIR/@includedir@/frr/ospfd/ospf_asbr.h 0644 root bin
-f none @includedir@/quagga/ospfd/ospf_dump.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_dump.h 0644 root bin
+f none @includedir@/frr/ospfd/ospf_dump.h=$DESTDIR/@includedir@/frr/ospfd/ospf_dump.h 0644 root bin
-f none @includedir@/quagga/ospfd/ospf_lsa.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_lsa.h 0644 root bin
+f none @includedir@/frr/ospfd/ospf_lsa.h=$DESTDIR/@includedir@/frr/ospfd/ospf_lsa.h 0644 root bin
-f none @includedir@/quagga/ospfd/ospf_lsdb.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_lsdb.h 0644 root bin
+f none @includedir@/frr/ospfd/ospf_lsdb.h=$DESTDIR/@includedir@/frr/ospfd/ospf_lsdb.h 0644 root bin
-f none @includedir@/quagga/ospfd/ospf_nsm.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_nsm.h 0644 root bin
+f none @includedir@/frr/ospfd/ospf_nsm.h=$DESTDIR/@includedir@/frr/ospfd/ospf_nsm.h 0644 root bin
-f none @includedir@/quagga/ospfd/ospf_ism.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_ism.h 0644 root bin
+f none @includedir@/frr/ospfd/ospf_ism.h=$DESTDIR/@includedir@/frr/ospfd/ospf_ism.h 0644 root bin
-f none @includedir@/quagga/ospfd/ospf_opaque.h=$DESTDIR/@includedir@/quagga/ospfd/ospf_opaque.h 0644 root bin
+f none @includedir@/frr/ospfd/ospf_opaque.h=$DESTDIR/@includedir@/frr/ospfd/ospf_opaque.h 0644 root bin
-f none @includedir@/quagga/ospfd/ospfd.h=$DESTDIR/@includedir@/quagga/ospfd/ospfd.h 0644 root bin
+f none @includedir@/frr/ospfd/ospfd.h=$DESTDIR/@includedir@/frr/ospfd/ospfd.h 0644 root bin
-f none @includedir@/quagga/buffer.h=$DESTDIR/@includedir@/quagga/buffer.h 0644 root bin
+f none @includedir@/frr/buffer.h=$DESTDIR/@includedir@/frr/buffer.h 0644 root bin
-f none @includedir@/quagga/command.h=$DESTDIR/@includedir@/quagga/command.h 0644 root bin
+f none @includedir@/frr/command.h=$DESTDIR/@includedir@/frr/command.h 0644 root bin
-f none @includedir@/quagga/filter.h=$DESTDIR/@includedir@/quagga/filter.h 0644 root bin
+f none @includedir@/frr/filter.h=$DESTDIR/@includedir@/frr/filter.h 0644 root bin
-f none @includedir@/quagga/getopt.h=$DESTDIR/@includedir@/quagga/getopt.h 0644 root bin
+f none @includedir@/frr/getopt.h=$DESTDIR/@includedir@/frr/getopt.h 0644 root bin
-f none @includedir@/quagga/hash.h=$DESTDIR/@includedir@/quagga/hash.h 0644 root bin
+f none @includedir@/frr/hash.h=$DESTDIR/@includedir@/frr/hash.h 0644 root bin
-f none @includedir@/quagga/if.h=$DESTDIR/@includedir@/quagga/if.h 0644 root bin
+f none @includedir@/frr/if.h=$DESTDIR/@includedir@/frr/if.h 0644 root bin
-f none @includedir@/quagga/linklist.h=$DESTDIR/@includedir@/quagga/linklist.h 0644 root bin
+f none @includedir@/frr/linklist.h=$DESTDIR/@includedir@/frr/linklist.h 0644 root bin
-f none @includedir@/quagga/log.h=$DESTDIR/@includedir@/quagga/log.h 0644 root bin
+f none @includedir@/frr/log.h=$DESTDIR/@includedir@/frr/log.h 0644 root bin
-f none @includedir@/quagga/memory.h=$DESTDIR/@includedir@/quagga/memory.h 0644 root bin
+f none @includedir@/frr/memory.h=$DESTDIR/@includedir@/frr/memory.h 0644 root bin
-f none @includedir@/quagga/network.h=$DESTDIR/@includedir@/quagga/network.h 0644 root bin
+f none @includedir@/frr/network.h=$DESTDIR/@includedir@/frr/network.h 0644 root bin
-f none @includedir@/quagga/prefix.h=$DESTDIR/@includedir@/quagga/prefix.h 0644 root bin
+f none @includedir@/frr/prefix.h=$DESTDIR/@includedir@/frr/prefix.h 0644 root bin
-f none @includedir@/quagga/routemap.h=$DESTDIR/@includedir@/quagga/routemap.h 0644 root bin
+f none @includedir@/frr/routemap.h=$DESTDIR/@includedir@/frr/routemap.h 0644 root bin
-f none @includedir@/quagga/distribute.h=$DESTDIR/@includedir@/quagga/distribute.h 0644 root bin
+f none @includedir@/frr/distribute.h=$DESTDIR/@includedir@/frr/distribute.h 0644 root bin
-f none @includedir@/quagga/sockunion.h=$DESTDIR/@includedir@/quagga/sockunion.h 0644 root bin
+f none @includedir@/frr/sockunion.h=$DESTDIR/@includedir@/frr/sockunion.h 0644 root bin
-f none @includedir@/quagga/str.h=$DESTDIR/@includedir@/quagga/str.h 0644 root bin
+f none @includedir@/frr/str.h=$DESTDIR/@includedir@/frr/str.h 0644 root bin
-f none @includedir@/quagga/stream.h=$DESTDIR/@includedir@/quagga/stream.h 0644 root bin
+f none @includedir@/frr/stream.h=$DESTDIR/@includedir@/frr/stream.h 0644 root bin
-f none @includedir@/quagga/table.h=$DESTDIR/@includedir@/quagga/table.h 0644 root bin
+f none @includedir@/frr/table.h=$DESTDIR/@includedir@/frr/table.h 0644 root bin
-f none @includedir@/quagga/thread.h=$DESTDIR/@includedir@/quagga/thread.h 0644 root bin
+f none @includedir@/frr/thread.h=$DESTDIR/@includedir@/frr/thread.h 0644 root bin
-f none @includedir@/quagga/vector.h=$DESTDIR/@includedir@/quagga/vector.h 0644 root bin
+f none @includedir@/frr/vector.h=$DESTDIR/@includedir@/frr/vector.h 0644 root bin
-f none @includedir@/quagga/version.h=$DESTDIR/@includedir@/quagga/version.h 0644 root bin
+f none @includedir@/frr/version.h=$DESTDIR/@includedir@/frr/version.h 0644 root bin
-f none @includedir@/quagga/vty.h=$DESTDIR/@includedir@/quagga/vty.h 0644 root bin
+f none @includedir@/frr/vty.h=$DESTDIR/@includedir@/frr/vty.h 0644 root bin
-f none @includedir@/quagga/zebra.h=$DESTDIR/@includedir@/quagga/zebra.h 0644 root bin
+f none @includedir@/frr/zebra.h=$DESTDIR/@includedir@/frr/zebra.h 0644 root bin
-f none @includedir@/quagga/plist.h=$DESTDIR/@includedir@/quagga/plist.h 0644 root bin
+f none @includedir@/frr/plist.h=$DESTDIR/@includedir@/frr/plist.h 0644 root bin
-f none @includedir@/quagga/zclient.h=$DESTDIR/@includedir@/quagga/zclient.h 0644 root bin
+f none @includedir@/frr/zclient.h=$DESTDIR/@includedir@/frr/zclient.h 0644 root bin
-f none @includedir@/quagga/sockopt.h=$DESTDIR/@includedir@/quagga/sockopt.h 0644 root bin
+f none @includedir@/frr/sockopt.h=$DESTDIR/@includedir@/frr/sockopt.h 0644 root bin
-f none @includedir@/quagga/smux.h=$DESTDIR/@includedir@/quagga/smux.h 0644 root bin
+f none @includedir@/frr/smux.h=$DESTDIR/@includedir@/frr/smux.h 0644 root bin
-f none @includedir@/quagga/md5.h=$DESTDIR/@includedir@/quagga/md5.h 0644 root bin
+f none @includedir@/frr/md5.h=$DESTDIR/@includedir@/frr/md5.h 0644 root bin
-f none @includedir@/quagga/if_rmap.h=$DESTDIR/@includedir@/quagga/if_rmap.h 0644 root bin
+f none @includedir@/frr/if_rmap.h=$DESTDIR/@includedir@/frr/if_rmap.h 0644 root bin
-f none @includedir@/quagga/keychain.h=$DESTDIR/@includedir@/quagga/keychain.h 0644 root bin
+f none @includedir@/frr/keychain.h=$DESTDIR/@includedir@/frr/keychain.h 0644 root bin
-f none @includedir@/quagga/privs.h=$DESTDIR/@includedir@/quagga/privs.h 0644 root bin
+f none @includedir@/frr/privs.h=$DESTDIR/@includedir@/frr/privs.h 0644 root bin
-f none @includedir@/quagga/sigevent.h=$DESTDIR/@includedir@/quagga/sigevent.h 0644 root bin
+f none @includedir@/frr/sigevent.h=$DESTDIR/@includedir@/frr/sigevent.h 0644 root bin
-f none @includedir@/quagga/pqueue.h=$DESTDIR/@includedir@/quagga/pqueue.h 0644 root bin
+f none @includedir@/frr/pqueue.h=$DESTDIR/@includedir@/frr/pqueue.h 0644 root bin
-f none @includedir@/quagga/jhash.h=$DESTDIR/@includedir@/quagga/jhash.h 0644 root bin
+f none @includedir@/frr/jhash.h=$DESTDIR/@includedir@/frr/jhash.h 0644 root bin
-f none @includedir@/quagga/zassert.h=$DESTDIR/@includedir@/quagga/zassert.h 0644 root bin
+f none @includedir@/frr/zassert.h=$DESTDIR/@includedir@/frr/zassert.h 0644 root bin
-d none @includedir@/quagga/ospfapi=$DESTDIR/@includedir@/quagga/ospfapi 0755 root bin
+d none @includedir@/frr/ospfapi=$DESTDIR/@includedir@/frr/ospfapi 0755 root bin
-f none @includedir@/quagga/ospfapi/ospf_apiclient.h=$DESTDIR/@includedir@/quagga/ospfapi/ospf_apiclient.h 0644 root bin
+f none @includedir@/frr/ospfapi/ospf_apiclient.h=$DESTDIR/@includedir@/frr/ospfapi/ospf_apiclient.h 0644 root bin

solaris/prototype.doc.in

@@ -3,7 +3,7 @@ i depend=$abs_builddir/depend.doc
 i copying=$abs_top_srcdir/COPYING
 d none @infodir@=$DESTDIR/@infodir@ 0755 root bin
 #f none @infodir@/dir=$DESTDIR/@infodir@/dir 0644 root bin
-f none @infodir@/quagga.info=$DESTDIR/@infodir@/quagga.info 0644 root bin
+f none @infodir@/frr.info=$DESTDIR/@infodir@/frr.info 0644 root bin
 d none @mandir@=$DESTDIR/@mandir@ 0755 root bin
 d none @mandir@/man1=$DESTDIR/@mandir@/man1 0755 root bin
 f none @mandir@/man1/vtysh.1=$DESTDIR/@mandir@/man1/vtysh.1 0644 root bin

solaris/prototype.smf.in

@@ -3,6 +3,6 @@ i depend=$abs_builddir/depend.smf
 i copying=$abs_top_srcdir/COPYING
 i i.manifest
 i r.manifest
-f manifest var/svc/manifest/network/quagga.xml 0444 root bin
+f manifest var/svc/manifest/network/frr.xml 0444 root bin
 #f none var/svc/profile/@PACKAGE_TARNAME@_options.xml=$abs_builddir/options.xml 0755 root sys
-f none lib/svc/method/quagga=$abs_builddir/quagga.init 0755 root bin
+f none lib/svc/method/frr=$abs_builddir/frr.init 0755 root bin