- Update to 2.3.rc1

PR:		ports/61586
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu> (maintainer)

39 files changed, 447 insertions, 489 deletions

diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile
index 3cb10b04ed8a..303cdd0ff4a0 100644
--- a/net-mgmt/rancid-devel/Makefile
+++ b/net-mgmt/rancid-devel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	rancid
-PORTVERSION=	2.2.2
-PORTREVISION=	4
+PORTVERSION=	2.3.r1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
+DISTNAME=	${PORTNAME}-2.3.rc1
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Really Awesome New Cisco confIg Differ
@@ -28,14 +28,22 @@ CONFIGURE_ARGS=			\
 
 MANPREFIX=	${PREFIX}/rancid
 
-MAN1=		lg_intro.1 par.1 do-diffs.1 alogin.1 blogin.1 clogin.1 \
-		control_rancid.1 create_cvs.1 rancid.1 rancid_intro.1 \
-		elogin.1 f10rancid.1 flogin.1 hlogin.1 hrancid.1 jlogin.1 \
-		jrancid.1 francid.1 cat5rancid.1 erancid.1 mrancid.1 xrancid.1
+MAN1=		alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \
+		cssrancid.1 elogin.1 erancid.1 f10rancid.1 flogin.1 fnrancid.1 \
+		francid.1 hlogin.1 hrancid.1 htlogin.1 htrancid.1 jerancid.1 \
+		jlogin.1 jrancid.1 lg_intro.1 mrancid.1 nlogin.1 nrancid.1 \
+		nslogin.1 nsrancid.1 par.1 prancid.1 rancid-cvs.1 rancid-run.1 \
+		rancid.1 rancid_intro.1 rivlogin.1 rivrancid.1 tntlogin.1 \
+		tntrancid.1 xrancid.1 zrancid.1
 
-MAN5=		env.5 lg.conf.5 cloginrc.5 router.db.5
+MAN5=		lg.conf.5 cloginrc.5 rancid.conf.5 router.db.5
 
-CONFIG_FILES=	bin/env util/lg/lg.conf
+OLDCONFIG_FILE1=	bin/env
+OLDCONFIG_FILE2=	util/lg/lg.conf
+NEWCONFIG_FILES=	etc/rancid.conf etc/lg.conf
+
+pre-everything::
+	@ ${ECHO} "Make sure your rancid repository is quit before upgrading; disable rancid cron jobs"
 
 post-install:
 	@ ${SED} -e "s:%%INSTDIR%%:${PREFIX}/rancid:g" pkg-message >${PKGMESSAGE}
@@ -44,11 +52,24 @@ post-install:
 	@ ${CAT} ${PKGMESSAGE}
 	@ ${ECHO}
 .endif
-.for file in ${CONFIG_FILES}
-	@ if [ -f ${PREFIX}/rancid/${file}.dist ] ; then \
-	${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.dist"; \
-	${ECHO} "       : *** review ${file}.dist for new/deprecated switches or install in place ${file}";  \
+.for file in ${NEWCONFIG_FILES}
+	@ if [ -f ${PREFIX}/rancid/${file} ] ; then \
+	${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \
+	${ECHO} "       : *** review ${file}.sample for new/deprecated switches or install in place ${file}";  \
 	fi
 .endfor
+	@ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} ] ; then \
+	${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \
+	${ECHO} "       : *** ${PREFIX}/rancid/etc/rancid.conf. Merge from sample and old file "; \
+	fi
+	@ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \
+	${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \
+	${ECHO} "       : *** ${PREFIX}/rancid/etc/lg.conf. Merge from sample and old file "; \
+	fi
+	@ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} -o \
+	-f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \
+	${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/rancid/var "; \
+	${ECHO} "       : *** Copy the repository if you want to keep the history "; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/rancid-devel/distinfo b/net-mgmt/rancid-devel/distinfo
index d1df95e5fc0f..0c9e0fe85aa9 100644
--- a/net-mgmt/rancid-devel/distinfo
+++ b/net-mgmt/rancid-devel/distinfo
@@ -1 +1 @@
-MD5 (rancid-2.2.2.tar.gz) = bd77b33ca00cc954737c8097ffa74220
+MD5 (rancid-2.3.rc1.tar.gz) = fb98161366fee76c879b4400805ec5bb
diff --git a/net-mgmt/rancid-devel/files/patch-Makefile.am b/net-mgmt/rancid-devel/files/patch-Makefile.am
deleted file mode 100644
index 246e638fd59d..000000000000
--- a/net-mgmt/rancid-devel/files/patch-Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.am.orig	Mon Jun  3 14:01:32 2002
---- Makefile.am	Mon Jun  3 14:02:03 2002
-***************
-*** 22,28 ****
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
---- 22,28 ----
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES FAQ README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
diff --git a/net-mgmt/rancid-devel/files/patch-Makefile.in b/net-mgmt/rancid-devel/files/patch-Makefile.in
deleted file mode 100644
index eabf76568439..000000000000
--- a/net-mgmt/rancid-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.in.orig	Mon Jun  3 14:01:40 2002
---- Makefile.in	Mon Jun  3 14:02:40 2002
-***************
-*** 354,360 ****
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
---- 354,360 ----
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES FAQ README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
diff --git a/net-mgmt/rancid-devel/files/patch-bin::Makefile.in b/net-mgmt/rancid-devel/files/patch-bin::Makefile.in
deleted file mode 100644
index 623a67fbfd79..000000000000
--- a/net-mgmt/rancid-devel/files/patch-bin::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- bin/Makefile.in.orig	Fri Aug  9 23:59:06 2002
-+++ bin/Makefile.in	Mon Mar 17 15:46:42 2003
-@@ -375,13 +375,7 @@
- 	for prog in $(BIN_PROGS) ; do \
- 	    $(INSTALL) $$prog $(bindir); \
- 	done; \
--	if test -f $(bindir)/env ; then \
--	    echo "WARNING: *** $(bindir)/env exists: installing as env.new."; \
--	    echo "         *** review env.new for new/deprecated switches"; \
--	    $(INSTALL_DATA) env $(bindir)/env.new; \
--	else \
--	    $(INSTALL_DATA) env $(bindir); \
--	fi
-+	    $(INSTALL_DATA) env $(bindir)/env.dist
- # BIN_DATAS are empty at the moment.
- #       for prog in $(BIN_DATAS) ; do \
- #           $(INSTALL_DATA) $$prog $(PREFIX)/bin; \
diff --git a/net-mgmt/rancid-devel/files/patch-bin::hpfilter.c b/net-mgmt/rancid-devel/files/patch-bin::hpfilter.c
deleted file mode 100644
index fd749ebde788..000000000000
--- a/net-mgmt/rancid-devel/files/patch-bin::hpfilter.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/hpfilter.c.orig	Wed Oct 15 15:52:48 2003
-+++ bin/hpfilter.c	Wed Oct 15 15:53:08 2003
-@@ -382,7 +382,7 @@
- usage(void)
- {
-     fprintf(stderr,
--"usage: %s [-hv] <telnet|ssh> <hostname>
-+"usage: %s [-hv] <telnet|ssh> <hostname>\n\
- ", progname);
-     return;
- }
-@@ -391,7 +391,7 @@
- vers(void)
- {
-     fprintf(stderr,
--"%s: %s version %s
-+"%s: %s version %s\n\
- ", progname, package, version);
-     return;
- }
diff --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am b/net-mgmt/rancid-devel/files/patch-etc::Makefile.am
new file mode 100644
index 000000000000..e4805556c2c8
--- /dev/null
+++ b/net-mgmt/rancid-devel/files/patch-etc::Makefile.am
@@ -0,0 +1,29 @@
+--- etc/Makefile.am.orig	Sun Jan 18 02:30:29 2004
++++ etc/Makefile.am	Sun Jan 18 02:32:16 2004
+@@ -29,24 +29,8 @@
+ CLEANFILES= $(pkgdata_DATA)
+ 
+ install-data-local: all
+-	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	fi; \
+-	if test -f $(sysconfdir)/lg.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	fi;
++	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ \
++	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/ 
+ 
+ #clean:
+ #	rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)
diff --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.in b/net-mgmt/rancid-devel/files/patch-etc::Makefile.in
new file mode 100644
index 000000000000..1f78dfe1b6d5
--- /dev/null
+++ b/net-mgmt/rancid-devel/files/patch-etc::Makefile.in
@@ -0,0 +1,29 @@
+--- etc/Makefile.in.orig	Sun Jan 18 02:37:08 2004
++++ etc/Makefile.in	Sun Jan 18 02:38:03 2004
+@@ -342,24 +342,8 @@
+ 
+ 
+ install-data-local: all
+-	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	fi; \
+-	if test -f $(sysconfdir)/lg.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	fi;
++	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/; \
++	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
+ 
+ lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
+ 	rm -f lg.conf.sample lg.conf.sample.tmp; \
diff --git a/net-mgmt/rancid-devel/files/patch-util::Makefile.in b/net-mgmt/rancid-devel/files/patch-util::Makefile.in
deleted file mode 100644
index 833b917fc36e..000000000000
--- a/net-mgmt/rancid-devel/files/patch-util::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-*** util/Makefile.in.orig	Mon Jun  3 14:21:54 2002
---- util/Makefile.in	Mon Jun  3 14:23:55 2002
-***************
-*** 1,6 ****
-  PREFIX = @prefix@
-  
-! INSTALL = @INSTALL@
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  UTIL_PROGS = @RD_UTIL_PROGS@
---- 1,6 ----
-  PREFIX = @prefix@
-  
-! INSTALL = @INSTALL_SCRIPT@
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  UTIL_PROGS = @RD_UTIL_PROGS@
diff --git a/net-mgmt/rancid-devel/files/patch-util::lg::Makefile.in b/net-mgmt/rancid-devel/files/patch-util::lg::Makefile.in
deleted file mode 100644
index 54d62727828b..000000000000
--- a/net-mgmt/rancid-devel/files/patch-util::lg::Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- util/lg/Makefile.in.orig	Fri Aug  9 23:59:06 2002
-+++ util//lg/Makefile.in	Mon Mar 17 15:48:24 2003
-@@ -1,6 +1,6 @@
- PREFIX = @prefix@
- 
--INSTALL = @INSTALL@
-+INSTALL = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
-@@ -13,13 +13,7 @@
- 	for file in $(UTIL_LG_PROGS) ; do \
- 	    $(INSTALL) $$file $(PREFIX)/util/lg; \
- 	done; \
--	if test -f $(PREFIX)/util/lg/lg.conf ; then \
--	    echo "WARNING: *** $(PREFIX)/util/lg/lg.conf exists: installing as lg.conf.new."; \
--	    echo "         *** review lg.conf.new for new/deprecated switches"; \
--	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.new; \
--	else \
--	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg; \
--	fi; \
-+	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.dist; \
- 	for file in *README* *.html; do \
- 	    $(INSTALL_DATA) $$file $(PREFIX)/util/lg; \
- 	done
diff --git a/net-mgmt/rancid-devel/pkg-descr b/net-mgmt/rancid-devel/pkg-descr
index c0d9ccf4140f..676fe9aae64c 100644
--- a/net-mgmt/rancid-devel/pkg-descr
+++ b/net-mgmt/rancid-devel/pkg-descr
@@ -2,7 +2,7 @@ Rancid monitors a router's (or device's) configuration, including software
 and hardware (cards, serial numbers, etc), using CVS. Rancid currently 
 supports Bay routers, Cisco routers, Juniper routers, Catalyst switches, 
 Foundry switches, Redback NASs, ADC EZT3 muxes, MRTd (and thus likely IRRd), 
-Alteon switches, and HP procurve switches. 
+Alteon switches, HP procurve switches, Hitachi routers. 
 
 Rancid logs into each of the devices in a router table file, runs various 
 commands, chomps the output, and emails any differences ( sample) from 
diff --git a/net-mgmt/rancid-devel/pkg-message b/net-mgmt/rancid-devel/pkg-message
index b41462caeca9..517216c88a5c 100644
--- a/net-mgmt/rancid-devel/pkg-message
+++ b/net-mgmt/rancid-devel/pkg-message
@@ -1,8 +1,11 @@
 For further configuration information please look at 
-%%INSTDIR%%/README. 
+%%INSTDIR%%/share/rancid/README. 
+
+If you are upgrading from the previous version of rancid look at
+%%INSTDIR%%/share/rancid/UPGRADING.
 
 If you would like to set up Rancid to be browseable from Web, 
 you need to install devel/cvsweb or devel/viewcvs.
 
 For rancid looking-glass copy the actual CGIs (located at
-%%INSTDIR%%/util/lg/{lg.cgi lgform.cgi}) to your cgi-bin.
+%%INSTDIR%%/bin/{lg.cgi lgform.cgi}) to your cgi-bin.
diff --git a/net-mgmt/rancid-devel/pkg-plist b/net-mgmt/rancid-devel/pkg-plist
index bde32fcd160e..fc753236a97d 100644
--- a/net-mgmt/rancid-devel/pkg-plist
+++ b/net-mgmt/rancid-devel/pkg-plist
@@ -1,49 +1,70 @@
-rancid/util/lg/lg.cgi
-rancid/util/lg/lgform.cgi
-rancid/util/lg/lg.conf.dist
-rancid/util/lg/README
-rancid/util/lg/index.html
-rancid/util/lg/lgnotes.html
-rancid/util/README
-rancid/util/rtrfilter
-rancid/util/rtrfilter.README
-rancid/util/cisco-load.exp
-rancid/util/cisco-reload.exp
-rancid/util/downreport
-rancid/util/getipacctg
-rancid/bin/hpfilter
-rancid/bin/cat5rancid
-rancid/bin/control_rancid
+@exec mkdir -p %D/rancid/var
+@exec chmod 775 %D/rancid/var
 rancid/bin/alogin
 rancid/bin/arancid
-rancid/bin/clogin
-rancid/bin/create_cvs
 rancid/bin/blogin
 rancid/bin/brancid
-rancid/bin/do-diffs
+rancid/bin/cat5rancid
+rancid/bin/clogin
+rancid/bin/control_rancid
+rancid/bin/cssrancid
 rancid/bin/elogin
 rancid/bin/erancid
 rancid/bin/f10rancid
 rancid/bin/flogin
+rancid/bin/fnrancid
 rancid/bin/francid
-rancid/bin/jlogin
-rancid/bin/jrancid
 rancid/bin/hlogin
+rancid/bin/hpuifilter
 rancid/bin/hrancid
+rancid/bin/htlogin
+rancid/bin/htrancid
+rancid/bin/jerancid
+rancid/bin/jlogin
+rancid/bin/jrancid
+rancid/bin/lg.cgi
+rancid/bin/lgform.cgi
 rancid/bin/mrancid
+rancid/bin/nlogin
+rancid/bin/nrancid
+rancid/bin/nslogin
+rancid/bin/nsrancid
 rancid/bin/par
-rancid/bin/rancid-fe
+rancid/bin/prancid
 rancid/bin/rancid
-rancid/bin/rename
+rancid/bin/rancid-cvs
+rancid/bin/rancid-fe
+rancid/bin/rancid-run
+rancid/bin/rivlogin
+rancid/bin/rivrancid
 rancid/bin/rrancid
+rancid/bin/tntlogin
+rancid/bin/tntrancid
 rancid/bin/xrancid
-rancid/bin/env.dist
-rancid/CHANGES
-rancid/README
-rancid/FAQ
-rancid/cloginrc.sample
-@dirrm rancid/util/lg
-@dirrm rancid/util
+rancid/bin/zrancid
+rancid/etc/lg.conf.sample
+rancid/etc/rancid.conf.sample
+rancid/share/rancid/CHANGES
+rancid/share/rancid/COPYING
+rancid/share/rancid/FAQ
+rancid/share/rancid/README
+rancid/share/rancid/README.lg
+rancid/share/rancid/README.misc
+rancid/share/rancid/UPGRADING
+rancid/share/rancid/cisco-load.exp
+rancid/share/rancid/cisco-reload.exp
+rancid/share/rancid/cloginrc.sample
+rancid/share/rancid/downreport
+rancid/share/rancid/getipacctg
+rancid/share/rancid/index.html
+rancid/share/rancid/lg.conf.sample
+rancid/share/rancid/lgnotes.html
+rancid/share/rancid/rancid.conf.sample
+rancid/share/rancid/rtrfilter
+@dirrm rancid/share/rancid
+@dirrm rancid/share
+@dirrm rancid/var
+@dirrm rancid/etc
 @dirrm rancid/bin
 @dirrm rancid/man/man1
 @dirrm rancid/man/man5
diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile
index 3cb10b04ed8a..303cdd0ff4a0 100644
--- a/net-mgmt/rancid/Makefile
+++ b/net-mgmt/rancid/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	rancid
-PORTVERSION=	2.2.2
-PORTREVISION=	4
+PORTVERSION=	2.3.r1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
+DISTNAME=	${PORTNAME}-2.3.rc1
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Really Awesome New Cisco confIg Differ
@@ -28,14 +28,22 @@ CONFIGURE_ARGS=			\
 
 MANPREFIX=	${PREFIX}/rancid
 
-MAN1=		lg_intro.1 par.1 do-diffs.1 alogin.1 blogin.1 clogin.1 \
-		control_rancid.1 create_cvs.1 rancid.1 rancid_intro.1 \
-		elogin.1 f10rancid.1 flogin.1 hlogin.1 hrancid.1 jlogin.1 \
-		jrancid.1 francid.1 cat5rancid.1 erancid.1 mrancid.1 xrancid.1
+MAN1=		alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \
+		cssrancid.1 elogin.1 erancid.1 f10rancid.1 flogin.1 fnrancid.1 \
+		francid.1 hlogin.1 hrancid.1 htlogin.1 htrancid.1 jerancid.1 \
+		jlogin.1 jrancid.1 lg_intro.1 mrancid.1 nlogin.1 nrancid.1 \
+		nslogin.1 nsrancid.1 par.1 prancid.1 rancid-cvs.1 rancid-run.1 \
+		rancid.1 rancid_intro.1 rivlogin.1 rivrancid.1 tntlogin.1 \
+		tntrancid.1 xrancid.1 zrancid.1
 
-MAN5=		env.5 lg.conf.5 cloginrc.5 router.db.5
+MAN5=		lg.conf.5 cloginrc.5 rancid.conf.5 router.db.5
 
-CONFIG_FILES=	bin/env util/lg/lg.conf
+OLDCONFIG_FILE1=	bin/env
+OLDCONFIG_FILE2=	util/lg/lg.conf
+NEWCONFIG_FILES=	etc/rancid.conf etc/lg.conf
+
+pre-everything::
+	@ ${ECHO} "Make sure your rancid repository is quit before upgrading; disable rancid cron jobs"
 
 post-install:
 	@ ${SED} -e "s:%%INSTDIR%%:${PREFIX}/rancid:g" pkg-message >${PKGMESSAGE}
@@ -44,11 +52,24 @@ post-install:
 	@ ${CAT} ${PKGMESSAGE}
 	@ ${ECHO}
 .endif
-.for file in ${CONFIG_FILES}
-	@ if [ -f ${PREFIX}/rancid/${file}.dist ] ; then \
-	${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.dist"; \
-	${ECHO} "       : *** review ${file}.dist for new/deprecated switches or install in place ${file}";  \
+.for file in ${NEWCONFIG_FILES}
+	@ if [ -f ${PREFIX}/rancid/${file} ] ; then \
+	${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \
+	${ECHO} "       : *** review ${file}.sample for new/deprecated switches or install in place ${file}";  \
 	fi
 .endfor
+	@ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} ] ; then \
+	${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \
+	${ECHO} "       : *** ${PREFIX}/rancid/etc/rancid.conf. Merge from sample and old file "; \
+	fi
+	@ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \
+	${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \
+	${ECHO} "       : *** ${PREFIX}/rancid/etc/lg.conf. Merge from sample and old file "; \
+	fi
+	@ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} -o \
+	-f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \
+	${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/rancid/var "; \
+	${ECHO} "       : *** Copy the repository if you want to keep the history "; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/rancid/distinfo b/net-mgmt/rancid/distinfo
index d1df95e5fc0f..0c9e0fe85aa9 100644
--- a/net-mgmt/rancid/distinfo
+++ b/net-mgmt/rancid/distinfo
@@ -1 +1 @@
-MD5 (rancid-2.2.2.tar.gz) = bd77b33ca00cc954737c8097ffa74220
+MD5 (rancid-2.3.rc1.tar.gz) = fb98161366fee76c879b4400805ec5bb
diff --git a/net-mgmt/rancid/files/patch-Makefile.am b/net-mgmt/rancid/files/patch-Makefile.am
deleted file mode 100644
index 246e638fd59d..000000000000
--- a/net-mgmt/rancid/files/patch-Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.am.orig	Mon Jun  3 14:01:32 2002
---- Makefile.am	Mon Jun  3 14:02:03 2002
-***************
-*** 22,28 ****
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
---- 22,28 ----
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES FAQ README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
diff --git a/net-mgmt/rancid/files/patch-Makefile.in b/net-mgmt/rancid/files/patch-Makefile.in
deleted file mode 100644
index eabf76568439..000000000000
--- a/net-mgmt/rancid/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.in.orig	Mon Jun  3 14:01:40 2002
---- Makefile.in	Mon Jun  3 14:02:40 2002
-***************
-*** 354,360 ****
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
---- 354,360 ----
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES FAQ README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
diff --git a/net-mgmt/rancid/files/patch-bin::Makefile.in b/net-mgmt/rancid/files/patch-bin::Makefile.in
deleted file mode 100644
index 623a67fbfd79..000000000000
--- a/net-mgmt/rancid/files/patch-bin::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- bin/Makefile.in.orig	Fri Aug  9 23:59:06 2002
-+++ bin/Makefile.in	Mon Mar 17 15:46:42 2003
-@@ -375,13 +375,7 @@
- 	for prog in $(BIN_PROGS) ; do \
- 	    $(INSTALL) $$prog $(bindir); \
- 	done; \
--	if test -f $(bindir)/env ; then \
--	    echo "WARNING: *** $(bindir)/env exists: installing as env.new."; \
--	    echo "         *** review env.new for new/deprecated switches"; \
--	    $(INSTALL_DATA) env $(bindir)/env.new; \
--	else \
--	    $(INSTALL_DATA) env $(bindir); \
--	fi
-+	    $(INSTALL_DATA) env $(bindir)/env.dist
- # BIN_DATAS are empty at the moment.
- #       for prog in $(BIN_DATAS) ; do \
- #           $(INSTALL_DATA) $$prog $(PREFIX)/bin; \
diff --git a/net-mgmt/rancid/files/patch-bin::hpfilter.c b/net-mgmt/rancid/files/patch-bin::hpfilter.c
deleted file mode 100644
index fd749ebde788..000000000000
--- a/net-mgmt/rancid/files/patch-bin::hpfilter.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/hpfilter.c.orig	Wed Oct 15 15:52:48 2003
-+++ bin/hpfilter.c	Wed Oct 15 15:53:08 2003
-@@ -382,7 +382,7 @@
- usage(void)
- {
-     fprintf(stderr,
--"usage: %s [-hv] <telnet|ssh> <hostname>
-+"usage: %s [-hv] <telnet|ssh> <hostname>\n\
- ", progname);
-     return;
- }
-@@ -391,7 +391,7 @@
- vers(void)
- {
-     fprintf(stderr,
--"%s: %s version %s
-+"%s: %s version %s\n\
- ", progname, package, version);
-     return;
- }
diff --git a/net-mgmt/rancid/files/patch-etc::Makefile.am b/net-mgmt/rancid/files/patch-etc::Makefile.am
new file mode 100644
index 000000000000..e4805556c2c8
--- /dev/null
+++ b/net-mgmt/rancid/files/patch-etc::Makefile.am
@@ -0,0 +1,29 @@
+--- etc/Makefile.am.orig	Sun Jan 18 02:30:29 2004
++++ etc/Makefile.am	Sun Jan 18 02:32:16 2004
+@@ -29,24 +29,8 @@
+ CLEANFILES= $(pkgdata_DATA)
+ 
+ install-data-local: all
+-	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	fi; \
+-	if test -f $(sysconfdir)/lg.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	fi;
++	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ \
++	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/ 
+ 
+ #clean:
+ #	rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)
diff --git a/net-mgmt/rancid/files/patch-etc::Makefile.in b/net-mgmt/rancid/files/patch-etc::Makefile.in
new file mode 100644
index 000000000000..1f78dfe1b6d5
--- /dev/null
+++ b/net-mgmt/rancid/files/patch-etc::Makefile.in
@@ -0,0 +1,29 @@
+--- etc/Makefile.in.orig	Sun Jan 18 02:37:08 2004
++++ etc/Makefile.in	Sun Jan 18 02:38:03 2004
+@@ -342,24 +342,8 @@
+ 
+ 
+ install-data-local: all
+-	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	fi; \
+-	if test -f $(sysconfdir)/lg.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	fi;
++	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/; \
++	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
+ 
+ lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
+ 	rm -f lg.conf.sample lg.conf.sample.tmp; \
diff --git a/net-mgmt/rancid/files/patch-util::Makefile.in b/net-mgmt/rancid/files/patch-util::Makefile.in
deleted file mode 100644
index 833b917fc36e..000000000000
--- a/net-mgmt/rancid/files/patch-util::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-*** util/Makefile.in.orig	Mon Jun  3 14:21:54 2002
---- util/Makefile.in	Mon Jun  3 14:23:55 2002
-***************
-*** 1,6 ****
-  PREFIX = @prefix@
-  
-! INSTALL = @INSTALL@
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  UTIL_PROGS = @RD_UTIL_PROGS@
---- 1,6 ----
-  PREFIX = @prefix@
-  
-! INSTALL = @INSTALL_SCRIPT@
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  UTIL_PROGS = @RD_UTIL_PROGS@
diff --git a/net-mgmt/rancid/files/patch-util::lg::Makefile.in b/net-mgmt/rancid/files/patch-util::lg::Makefile.in
deleted file mode 100644
index 54d62727828b..000000000000
--- a/net-mgmt/rancid/files/patch-util::lg::Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- util/lg/Makefile.in.orig	Fri Aug  9 23:59:06 2002
-+++ util//lg/Makefile.in	Mon Mar 17 15:48:24 2003
-@@ -1,6 +1,6 @@
- PREFIX = @prefix@
- 
--INSTALL = @INSTALL@
-+INSTALL = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
-@@ -13,13 +13,7 @@
- 	for file in $(UTIL_LG_PROGS) ; do \
- 	    $(INSTALL) $$file $(PREFIX)/util/lg; \
- 	done; \
--	if test -f $(PREFIX)/util/lg/lg.conf ; then \
--	    echo "WARNING: *** $(PREFIX)/util/lg/lg.conf exists: installing as lg.conf.new."; \
--	    echo "         *** review lg.conf.new for new/deprecated switches"; \
--	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.new; \
--	else \
--	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg; \
--	fi; \
-+	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.dist; \
- 	for file in *README* *.html; do \
- 	    $(INSTALL_DATA) $$file $(PREFIX)/util/lg; \
- 	done
diff --git a/net-mgmt/rancid/pkg-descr b/net-mgmt/rancid/pkg-descr
index c0d9ccf4140f..676fe9aae64c 100644
--- a/net-mgmt/rancid/pkg-descr
+++ b/net-mgmt/rancid/pkg-descr
@@ -2,7 +2,7 @@ Rancid monitors a router's (or device's) configuration, including software
 and hardware (cards, serial numbers, etc), using CVS. Rancid currently 
 supports Bay routers, Cisco routers, Juniper routers, Catalyst switches, 
 Foundry switches, Redback NASs, ADC EZT3 muxes, MRTd (and thus likely IRRd), 
-Alteon switches, and HP procurve switches. 
+Alteon switches, HP procurve switches, Hitachi routers. 
 
 Rancid logs into each of the devices in a router table file, runs various 
 commands, chomps the output, and emails any differences ( sample) from 
diff --git a/net-mgmt/rancid/pkg-message b/net-mgmt/rancid/pkg-message
index b41462caeca9..517216c88a5c 100644
--- a/net-mgmt/rancid/pkg-message
+++ b/net-mgmt/rancid/pkg-message
@@ -1,8 +1,11 @@
 For further configuration information please look at 
-%%INSTDIR%%/README. 
+%%INSTDIR%%/share/rancid/README. 
+
+If you are upgrading from the previous version of rancid look at
+%%INSTDIR%%/share/rancid/UPGRADING.
 
 If you would like to set up Rancid to be browseable from Web, 
 you need to install devel/cvsweb or devel/viewcvs.
 
 For rancid looking-glass copy the actual CGIs (located at
-%%INSTDIR%%/util/lg/{lg.cgi lgform.cgi}) to your cgi-bin.
+%%INSTDIR%%/bin/{lg.cgi lgform.cgi}) to your cgi-bin.
diff --git a/net-mgmt/rancid/pkg-plist b/net-mgmt/rancid/pkg-plist
index bde32fcd160e..fc753236a97d 100644
--- a/net-mgmt/rancid/pkg-plist
+++ b/net-mgmt/rancid/pkg-plist
@@ -1,49 +1,70 @@
-rancid/util/lg/lg.cgi
-rancid/util/lg/lgform.cgi
-rancid/util/lg/lg.conf.dist
-rancid/util/lg/README
-rancid/util/lg/index.html
-rancid/util/lg/lgnotes.html
-rancid/util/README
-rancid/util/rtrfilter
-rancid/util/rtrfilter.README
-rancid/util/cisco-load.exp
-rancid/util/cisco-reload.exp
-rancid/util/downreport
-rancid/util/getipacctg
-rancid/bin/hpfilter
-rancid/bin/cat5rancid
-rancid/bin/control_rancid
+@exec mkdir -p %D/rancid/var
+@exec chmod 775 %D/rancid/var
 rancid/bin/alogin
 rancid/bin/arancid
-rancid/bin/clogin
-rancid/bin/create_cvs
 rancid/bin/blogin
 rancid/bin/brancid
-rancid/bin/do-diffs
+rancid/bin/cat5rancid
+rancid/bin/clogin
+rancid/bin/control_rancid
+rancid/bin/cssrancid
 rancid/bin/elogin
 rancid/bin/erancid
 rancid/bin/f10rancid
 rancid/bin/flogin
+rancid/bin/fnrancid
 rancid/bin/francid
-rancid/bin/jlogin
-rancid/bin/jrancid
 rancid/bin/hlogin
+rancid/bin/hpuifilter
 rancid/bin/hrancid
+rancid/bin/htlogin
+rancid/bin/htrancid
+rancid/bin/jerancid
+rancid/bin/jlogin
+rancid/bin/jrancid
+rancid/bin/lg.cgi
+rancid/bin/lgform.cgi
 rancid/bin/mrancid
+rancid/bin/nlogin
+rancid/bin/nrancid
+rancid/bin/nslogin
+rancid/bin/nsrancid
 rancid/bin/par
-rancid/bin/rancid-fe
+rancid/bin/prancid
 rancid/bin/rancid
-rancid/bin/rename
+rancid/bin/rancid-cvs
+rancid/bin/rancid-fe
+rancid/bin/rancid-run
+rancid/bin/rivlogin
+rancid/bin/rivrancid
 rancid/bin/rrancid
+rancid/bin/tntlogin
+rancid/bin/tntrancid
 rancid/bin/xrancid
-rancid/bin/env.dist
-rancid/CHANGES
-rancid/README
-rancid/FAQ
-rancid/cloginrc.sample
-@dirrm rancid/util/lg
-@dirrm rancid/util
+rancid/bin/zrancid
+rancid/etc/lg.conf.sample
+rancid/etc/rancid.conf.sample
+rancid/share/rancid/CHANGES
+rancid/share/rancid/COPYING
+rancid/share/rancid/FAQ
+rancid/share/rancid/README
+rancid/share/rancid/README.lg
+rancid/share/rancid/README.misc
+rancid/share/rancid/UPGRADING
+rancid/share/rancid/cisco-load.exp
+rancid/share/rancid/cisco-reload.exp
+rancid/share/rancid/cloginrc.sample
+rancid/share/rancid/downreport
+rancid/share/rancid/getipacctg
+rancid/share/rancid/index.html
+rancid/share/rancid/lg.conf.sample
+rancid/share/rancid/lgnotes.html
+rancid/share/rancid/rancid.conf.sample
+rancid/share/rancid/rtrfilter
+@dirrm rancid/share/rancid
+@dirrm rancid/share
+@dirrm rancid/var
+@dirrm rancid/etc
 @dirrm rancid/bin
 @dirrm rancid/man/man1
 @dirrm rancid/man/man5
diff --git a/net/rancid/Makefile b/net/rancid/Makefile
index 3cb10b04ed8a..303cdd0ff4a0 100644
--- a/net/rancid/Makefile
+++ b/net/rancid/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	rancid
-PORTVERSION=	2.2.2
-PORTREVISION=	4
+PORTVERSION=	2.3.r1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
+DISTNAME=	${PORTNAME}-2.3.rc1
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Really Awesome New Cisco confIg Differ
@@ -28,14 +28,22 @@ CONFIGURE_ARGS=			\
 
 MANPREFIX=	${PREFIX}/rancid
 
-MAN1=		lg_intro.1 par.1 do-diffs.1 alogin.1 blogin.1 clogin.1 \
-		control_rancid.1 create_cvs.1 rancid.1 rancid_intro.1 \
-		elogin.1 f10rancid.1 flogin.1 hlogin.1 hrancid.1 jlogin.1 \
-		jrancid.1 francid.1 cat5rancid.1 erancid.1 mrancid.1 xrancid.1
+MAN1=		alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \
+		cssrancid.1 elogin.1 erancid.1 f10rancid.1 flogin.1 fnrancid.1 \
+		francid.1 hlogin.1 hrancid.1 htlogin.1 htrancid.1 jerancid.1 \
+		jlogin.1 jrancid.1 lg_intro.1 mrancid.1 nlogin.1 nrancid.1 \
+		nslogin.1 nsrancid.1 par.1 prancid.1 rancid-cvs.1 rancid-run.1 \
+		rancid.1 rancid_intro.1 rivlogin.1 rivrancid.1 tntlogin.1 \
+		tntrancid.1 xrancid.1 zrancid.1
 
-MAN5=		env.5 lg.conf.5 cloginrc.5 router.db.5
+MAN5=		lg.conf.5 cloginrc.5 rancid.conf.5 router.db.5
 
-CONFIG_FILES=	bin/env util/lg/lg.conf
+OLDCONFIG_FILE1=	bin/env
+OLDCONFIG_FILE2=	util/lg/lg.conf
+NEWCONFIG_FILES=	etc/rancid.conf etc/lg.conf
+
+pre-everything::
+	@ ${ECHO} "Make sure your rancid repository is quit before upgrading; disable rancid cron jobs"
 
 post-install:
 	@ ${SED} -e "s:%%INSTDIR%%:${PREFIX}/rancid:g" pkg-message >${PKGMESSAGE}
@@ -44,11 +52,24 @@ post-install:
 	@ ${CAT} ${PKGMESSAGE}
 	@ ${ECHO}
 .endif
-.for file in ${CONFIG_FILES}
-	@ if [ -f ${PREFIX}/rancid/${file}.dist ] ; then \
-	${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.dist"; \
-	${ECHO} "       : *** review ${file}.dist for new/deprecated switches or install in place ${file}";  \
+.for file in ${NEWCONFIG_FILES}
+	@ if [ -f ${PREFIX}/rancid/${file} ] ; then \
+	${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \
+	${ECHO} "       : *** review ${file}.sample for new/deprecated switches or install in place ${file}";  \
 	fi
 .endfor
+	@ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} ] ; then \
+	${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \
+	${ECHO} "       : *** ${PREFIX}/rancid/etc/rancid.conf. Merge from sample and old file "; \
+	fi
+	@ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \
+	${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \
+	${ECHO} "       : *** ${PREFIX}/rancid/etc/lg.conf. Merge from sample and old file "; \
+	fi
+	@ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} -o \
+	-f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \
+	${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/rancid/var "; \
+	${ECHO} "       : *** Copy the repository if you want to keep the history "; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/net/rancid/distinfo b/net/rancid/distinfo
index d1df95e5fc0f..0c9e0fe85aa9 100644
--- a/net/rancid/distinfo
+++ b/net/rancid/distinfo
@@ -1 +1 @@
-MD5 (rancid-2.2.2.tar.gz) = bd77b33ca00cc954737c8097ffa74220
+MD5 (rancid-2.3.rc1.tar.gz) = fb98161366fee76c879b4400805ec5bb
diff --git a/net/rancid/files/patch-Makefile.am b/net/rancid/files/patch-Makefile.am
deleted file mode 100644
index 246e638fd59d..000000000000
--- a/net/rancid/files/patch-Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.am.orig	Mon Jun  3 14:01:32 2002
---- Makefile.am	Mon Jun  3 14:02:03 2002
-***************
-*** 22,28 ****
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
---- 22,28 ----
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES FAQ README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
diff --git a/net/rancid/files/patch-Makefile.in b/net/rancid/files/patch-Makefile.in
deleted file mode 100644
index eabf76568439..000000000000
--- a/net/rancid/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.in.orig	Mon Jun  3 14:01:40 2002
---- Makefile.in	Mon Jun  3 14:02:40 2002
-***************
-*** 354,360 ****
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
---- 354,360 ----
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES FAQ README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
diff --git a/net/rancid/files/patch-bin::Makefile.in b/net/rancid/files/patch-bin::Makefile.in
deleted file mode 100644
index 623a67fbfd79..000000000000
--- a/net/rancid/files/patch-bin::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- bin/Makefile.in.orig	Fri Aug  9 23:59:06 2002
-+++ bin/Makefile.in	Mon Mar 17 15:46:42 2003
-@@ -375,13 +375,7 @@
- 	for prog in $(BIN_PROGS) ; do \
- 	    $(INSTALL) $$prog $(bindir); \
- 	done; \
--	if test -f $(bindir)/env ; then \
--	    echo "WARNING: *** $(bindir)/env exists: installing as env.new."; \
--	    echo "         *** review env.new for new/deprecated switches"; \
--	    $(INSTALL_DATA) env $(bindir)/env.new; \
--	else \
--	    $(INSTALL_DATA) env $(bindir); \
--	fi
-+	    $(INSTALL_DATA) env $(bindir)/env.dist
- # BIN_DATAS are empty at the moment.
- #       for prog in $(BIN_DATAS) ; do \
- #           $(INSTALL_DATA) $$prog $(PREFIX)/bin; \
diff --git a/net/rancid/files/patch-bin::hpfilter.c b/net/rancid/files/patch-bin::hpfilter.c
deleted file mode 100644
index fd749ebde788..000000000000
--- a/net/rancid/files/patch-bin::hpfilter.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/hpfilter.c.orig	Wed Oct 15 15:52:48 2003
-+++ bin/hpfilter.c	Wed Oct 15 15:53:08 2003
-@@ -382,7 +382,7 @@
- usage(void)
- {
-     fprintf(stderr,
--"usage: %s [-hv] <telnet|ssh> <hostname>
-+"usage: %s [-hv] <telnet|ssh> <hostname>\n\
- ", progname);
-     return;
- }
-@@ -391,7 +391,7 @@
- vers(void)
- {
-     fprintf(stderr,
--"%s: %s version %s
-+"%s: %s version %s\n\
- ", progname, package, version);
-     return;
- }
diff --git a/net/rancid/files/patch-etc::Makefile.am b/net/rancid/files/patch-etc::Makefile.am
new file mode 100644
index 000000000000..e4805556c2c8
--- /dev/null
+++ b/net/rancid/files/patch-etc::Makefile.am
@@ -0,0 +1,29 @@
+--- etc/Makefile.am.orig	Sun Jan 18 02:30:29 2004
++++ etc/Makefile.am	Sun Jan 18 02:32:16 2004
+@@ -29,24 +29,8 @@
+ CLEANFILES= $(pkgdata_DATA)
+ 
+ install-data-local: all
+-	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	fi; \
+-	if test -f $(sysconfdir)/lg.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	fi;
++	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ \
++	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/ 
+ 
+ #clean:
+ #	rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)
diff --git a/net/rancid/files/patch-etc::Makefile.in b/net/rancid/files/patch-etc::Makefile.in
new file mode 100644
index 000000000000..1f78dfe1b6d5
--- /dev/null
+++ b/net/rancid/files/patch-etc::Makefile.in
@@ -0,0 +1,29 @@
+--- etc/Makefile.in.orig	Sun Jan 18 02:37:08 2004
++++ etc/Makefile.in	Sun Jan 18 02:38:03 2004
+@@ -342,24 +342,8 @@
+ 
+ 
+ install-data-local: all
+-	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	fi; \
+-	if test -f $(sysconfdir)/lg.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	fi;
++	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/; \
++	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
+ 
+ lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
+ 	rm -f lg.conf.sample lg.conf.sample.tmp; \
diff --git a/net/rancid/files/patch-util::Makefile.in b/net/rancid/files/patch-util::Makefile.in
deleted file mode 100644
index 833b917fc36e..000000000000
--- a/net/rancid/files/patch-util::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-*** util/Makefile.in.orig	Mon Jun  3 14:21:54 2002
---- util/Makefile.in	Mon Jun  3 14:23:55 2002
-***************
-*** 1,6 ****
-  PREFIX = @prefix@
-  
-! INSTALL = @INSTALL@
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  UTIL_PROGS = @RD_UTIL_PROGS@
---- 1,6 ----
-  PREFIX = @prefix@
-  
-! INSTALL = @INSTALL_SCRIPT@
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  UTIL_PROGS = @RD_UTIL_PROGS@
diff --git a/net/rancid/files/patch-util::lg::Makefile.in b/net/rancid/files/patch-util::lg::Makefile.in
deleted file mode 100644
index 54d62727828b..000000000000
--- a/net/rancid/files/patch-util::lg::Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- util/lg/Makefile.in.orig	Fri Aug  9 23:59:06 2002
-+++ util//lg/Makefile.in	Mon Mar 17 15:48:24 2003
-@@ -1,6 +1,6 @@
- PREFIX = @prefix@
- 
--INSTALL = @INSTALL@
-+INSTALL = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
-@@ -13,13 +13,7 @@
- 	for file in $(UTIL_LG_PROGS) ; do \
- 	    $(INSTALL) $$file $(PREFIX)/util/lg; \
- 	done; \
--	if test -f $(PREFIX)/util/lg/lg.conf ; then \
--	    echo "WARNING: *** $(PREFIX)/util/lg/lg.conf exists: installing as lg.conf.new."; \
--	    echo "         *** review lg.conf.new for new/deprecated switches"; \
--	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.new; \
--	else \
--	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg; \
--	fi; \
-+	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.dist; \
- 	for file in *README* *.html; do \
- 	    $(INSTALL_DATA) $$file $(PREFIX)/util/lg; \
- 	done
diff --git a/net/rancid/pkg-descr b/net/rancid/pkg-descr
index c0d9ccf4140f..676fe9aae64c 100644
--- a/net/rancid/pkg-descr
+++ b/net/rancid/pkg-descr
@@ -2,7 +2,7 @@ Rancid monitors a router's (or device's) configuration, including software
 and hardware (cards, serial numbers, etc), using CVS. Rancid currently 
 supports Bay routers, Cisco routers, Juniper routers, Catalyst switches, 
 Foundry switches, Redback NASs, ADC EZT3 muxes, MRTd (and thus likely IRRd), 
-Alteon switches, and HP procurve switches. 
+Alteon switches, HP procurve switches, Hitachi routers. 
 
 Rancid logs into each of the devices in a router table file, runs various 
 commands, chomps the output, and emails any differences ( sample) from 
diff --git a/net/rancid/pkg-message b/net/rancid/pkg-message
index b41462caeca9..517216c88a5c 100644
--- a/net/rancid/pkg-message
+++ b/net/rancid/pkg-message
@@ -1,8 +1,11 @@
 For further configuration information please look at 
-%%INSTDIR%%/README. 
+%%INSTDIR%%/share/rancid/README. 
+
+If you are upgrading from the previous version of rancid look at
+%%INSTDIR%%/share/rancid/UPGRADING.
 
 If you would like to set up Rancid to be browseable from Web, 
 you need to install devel/cvsweb or devel/viewcvs.
 
 For rancid looking-glass copy the actual CGIs (located at
-%%INSTDIR%%/util/lg/{lg.cgi lgform.cgi}) to your cgi-bin.
+%%INSTDIR%%/bin/{lg.cgi lgform.cgi}) to your cgi-bin.
diff --git a/net/rancid/pkg-plist b/net/rancid/pkg-plist
index bde32fcd160e..fc753236a97d 100644
--- a/net/rancid/pkg-plist
+++ b/net/rancid/pkg-plist
@@ -1,49 +1,70 @@
-rancid/util/lg/lg.cgi
-rancid/util/lg/lgform.cgi
-rancid/util/lg/lg.conf.dist
-rancid/util/lg/README
-rancid/util/lg/index.html
-rancid/util/lg/lgnotes.html
-rancid/util/README
-rancid/util/rtrfilter
-rancid/util/rtrfilter.README
-rancid/util/cisco-load.exp
-rancid/util/cisco-reload.exp
-rancid/util/downreport
-rancid/util/getipacctg
-rancid/bin/hpfilter
-rancid/bin/cat5rancid
-rancid/bin/control_rancid
+@exec mkdir -p %D/rancid/var
+@exec chmod 775 %D/rancid/var
 rancid/bin/alogin
 rancid/bin/arancid
-rancid/bin/clogin
-rancid/bin/create_cvs
 rancid/bin/blogin
 rancid/bin/brancid
-rancid/bin/do-diffs
+rancid/bin/cat5rancid
+rancid/bin/clogin
+rancid/bin/control_rancid
+rancid/bin/cssrancid
 rancid/bin/elogin
 rancid/bin/erancid
 rancid/bin/f10rancid
 rancid/bin/flogin
+rancid/bin/fnrancid
 rancid/bin/francid
-rancid/bin/jlogin
-rancid/bin/jrancid
 rancid/bin/hlogin
+rancid/bin/hpuifilter
 rancid/bin/hrancid
+rancid/bin/htlogin
+rancid/bin/htrancid
+rancid/bin/jerancid
+rancid/bin/jlogin
+rancid/bin/jrancid
+rancid/bin/lg.cgi
+rancid/bin/lgform.cgi
 rancid/bin/mrancid
+rancid/bin/nlogin
+rancid/bin/nrancid
+rancid/bin/nslogin
+rancid/bin/nsrancid
 rancid/bin/par
-rancid/bin/rancid-fe
+rancid/bin/prancid
 rancid/bin/rancid
-rancid/bin/rename
+rancid/bin/rancid-cvs
+rancid/bin/rancid-fe
+rancid/bin/rancid-run
+rancid/bin/rivlogin
+rancid/bin/rivrancid
 rancid/bin/rrancid
+rancid/bin/tntlogin
+rancid/bin/tntrancid
 rancid/bin/xrancid
-rancid/bin/env.dist
-rancid/CHANGES
-rancid/README
-rancid/FAQ
-rancid/cloginrc.sample
-@dirrm rancid/util/lg
-@dirrm rancid/util
+rancid/bin/zrancid
+rancid/etc/lg.conf.sample
+rancid/etc/rancid.conf.sample
+rancid/share/rancid/CHANGES
+rancid/share/rancid/COPYING
+rancid/share/rancid/FAQ
+rancid/share/rancid/README
+rancid/share/rancid/README.lg
+rancid/share/rancid/README.misc
+rancid/share/rancid/UPGRADING
+rancid/share/rancid/cisco-load.exp
+rancid/share/rancid/cisco-reload.exp
+rancid/share/rancid/cloginrc.sample
+rancid/share/rancid/downreport
+rancid/share/rancid/getipacctg
+rancid/share/rancid/index.html
+rancid/share/rancid/lg.conf.sample
+rancid/share/rancid/lgnotes.html
+rancid/share/rancid/rancid.conf.sample
+rancid/share/rancid/rtrfilter
+@dirrm rancid/share/rancid
+@dirrm rancid/share
+@dirrm rancid/var
+@dirrm rancid/etc
 @dirrm rancid/bin
 @dirrm rancid/man/man1
 @dirrm rancid/man/man5