This version introduces a few new features that we hope to expand upon in

future releases, the most prominent of which is removal of rancid-fe and
several device-specific script in exchange for device-specific and generic
libraries and a generic script.  The generic script, which assumed the
name rancid, loads the relevant library and runs commands as defined by a
configuration file, which means less code duplication, users can more
easily adjust the commands that are run and create their own "device_types"
or filters without altering the base code, and hopefully this means it is
easier for users to upgrade to future versions.

See rancid.types.conf(5).  Please, for your benefit and ours, do not alter
the rancid.types.base configuration file; new versions of RANCiD purposely
overwrite this file at installation time.

Not all of the device types have been converted to libraries yet, just
the prominent ones or those prominent to us: Cisco, Juniper, Compass,
Arbor, MRV.  We also still have suggestions from users about this new
process to consider and/or implement.

3.0 also includes a new version of par(1) implemented in C.  It fixes a
few bugs in the perl version and hopefully does not introduce any new ones.

NOTE WELL: The router.db field separator has been changed to ';' from ':'
to avoid conflict with IPv6 addresses and etc.

3 files changed, 35 insertions, 17 deletions

diff --git a/net/rancid/Makefile b/net/rancid/Makefile
index d6bfe3ea2fa..d57e9119cdc 100644
--- a/net/rancid/Makefile
+++ b/net/rancid/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/07/12 10:45:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2014/04/02 09:11:11 pettai Exp $
 #
 
-DISTNAME=		rancid-2.3.8
-PKGREVISION=		3
+DISTNAME=		rancid-3.0
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.shrubbery.net/pub/rancid/
 
@@ -37,6 +36,8 @@ PKG_SHELL.${RC_USER}=	${SH}
 PKG_USERS_VARS+=	RC_USER
 PKG_GROUPS_VARS+=	RC_GROUP
 
+REPLACE_PERL=		lib/dell.pm.in
+
 EGDIR=			${PREFIX}/share/examples/rancid
 PKG_SYSCONFSUBDIR?=	rancid
 CONF_FILES_PERMS=	${EGDIR}/lg.conf.sample ${PKG_SYSCONFDIR}/lg.conf \
diff --git a/net/rancid/PLIST b/net/rancid/PLIST
index cb1bb68ad21..0acfa334c46 100644
--- a/net/rancid/PLIST
+++ b/net/rancid/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2012/02/25 16:03:37 pettai Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/04/02 09:11:11 pettai Exp $
 bin/agmrancid
 bin/alogin
+bin/anlogin
+bin/anrancid
 bin/arancid
 bin/arrancid
 bin/avologin
@@ -9,8 +11,10 @@ bin/blogin
 bin/brancid
 bin/cat5rancid
 bin/clogin
+bin/complogin
 bin/control_rancid
 bin/cssrancid
+bin/dllogin
 bin/elogin
 bin/erancid
 bin/f10rancid
@@ -18,7 +22,6 @@ bin/f5rancid
 bin/flogin
 bin/fnlogin
 bin/fnrancid
-bin/francid
 bin/hlogin
 bin/hpuifilter
 bin/hrancid
@@ -26,12 +29,10 @@ bin/htlogin
 bin/htrancid
 bin/jerancid
 bin/jlogin
-bin/jrancid
 bin/lg.cgi
 bin/lgform.cgi
 bin/mrancid
 bin/mrvlogin
-bin/mrvrancid
 bin/mtlogin
 bin/mtrancid
 bin/nlogin
@@ -53,11 +54,24 @@ bin/tlogin
 bin/tntlogin
 bin/tntrancid
 bin/trancid
+bin/xilogin
+bin/xirancid
 bin/xrancid
-bin/xrrancid
 bin/zrancid
+etc/rancid/rancid.types.base
+lib/rancid/arbor.pm
+lib/rancid/dell.pm
+lib/rancid/eos.pm
+lib/rancid/foundry.pm
+lib/rancid/ios.pm
+lib/rancid/iosxr.pm
+lib/rancid/junos.pm
+lib/rancid/mrv.pm
+lib/rancid/rancid.pm
 man/man1/agmrancid.1
 man/man1/alogin.1
+man/man1/anlogin.1
+man/man1/anrancid.1
 man/man1/arancid.1
 man/man1/arrancid.1
 man/man1/avologin.1
@@ -66,8 +80,11 @@ man/man1/blogin.1
 man/man1/brancid.1
 man/man1/cat5rancid.1
 man/man1/clogin.1
+man/man1/complogin.1
+man/man1/comprancid.1
 man/man1/control_rancid.1
 man/man1/cssrancid.1
+man/man1/dllogin.1
 man/man1/elogin.1
 man/man1/erancid.1
 man/man1/f10rancid.1
@@ -75,18 +92,15 @@ man/man1/f5rancid.1
 man/man1/flogin.1
 man/man1/fnlogin.1
 man/man1/fnrancid.1
-man/man1/francid.1
 man/man1/hlogin.1
 man/man1/hrancid.1
 man/man1/htlogin.1
 man/man1/htrancid.1
 man/man1/jerancid.1
 man/man1/jlogin.1
-man/man1/jrancid.1
 man/man1/lg_intro.1
 man/man1/mrancid.1
 man/man1/mrvlogin.1
-man/man1/mrvrancid.1
 man/man1/mtlogin.1
 man/man1/mtrancid.1
 man/man1/nlogin.1
@@ -108,12 +122,16 @@ man/man1/tlogin.1
 man/man1/tntlogin.1
 man/man1/tntrancid.1
 man/man1/trancid.1
+man/man1/xilogin.1
+man/man1/xirancid.1
 man/man1/xrancid.1
-man/man1/xrrancid.1
 man/man1/zrancid.1
+man/man3/rancid.3
 man/man5/cloginrc.5
 man/man5/lg.conf.5
 man/man5/rancid.conf.5
+man/man5/rancid.types.base.5
+man/man5/rancid.types.conf.5
 man/man5/router.db.5
 share/doc/rancid/CHANGES
 share/doc/rancid/COPYING
@@ -135,4 +153,3 @@ share/doc/rancid/rancid.conf.sample
 share/doc/rancid/rtrfilter
 share/examples/rancid/lg.conf.sample
 share/examples/rancid/rancid.conf.sample
-@pkgdir etc/rancid
diff --git a/net/rancid/distinfo b/net/rancid/distinfo
index aa5fd5d995d..810745c5bc9 100644
--- a/net/rancid/distinfo
+++ b/net/rancid/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/02/25 16:03:37 pettai Exp $
+$NetBSD: distinfo,v 1.5 2014/04/02 09:11:11 pettai Exp $
 
-SHA1 (rancid-2.3.8.tar.gz) = 7469d7f9e39e9f86f977f1f0963300e5d183088f
-RMD160 (rancid-2.3.8.tar.gz) = 6105398f85617bce2053d7219e7586c1b80b76ab
-Size (rancid-2.3.8.tar.gz) = 379908 bytes
+SHA1 (rancid-3.0.tar.gz) = 246aa70bab85692a9545380e3515ac618e256e59
+RMD160 (rancid-3.0.tar.gz) = f06de4bf8b5063c54ca198e1fbfa421ceec974c7
+Size (rancid-3.0.tar.gz) = 452750 bytes