- update to version 2.3.8

Changes:
http://www.shrubbery.net/rancid/CHANGES

Additional portlint fixes

PR:		165974
Submitted by:	ohauer
Approved by:	Mohacsi Janos <janos.mohacsi@bsd.hu> (maintainer)
Feature safe:	yes

7 files changed, 29 insertions, 32 deletions

diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile
index 241e16433fd0..19aba430933e 100644
--- a/net-mgmt/rancid/Makefile
+++ b/net-mgmt/rancid/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rancid
-PORTVERSION=	2.3.6
+PORTVERSION=	2.3.8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 
@@ -21,8 +21,8 @@ USE_PERL5=	yes
 SUB_FILES=	pkg-message
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=			\
-		--localstatedir=${PREFIX}/var/${PORTNAME}/ \
+
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/var/${PORTNAME}/ \
 		--bindir=${PREFIX}/libexec/${PORTNAME}/ \
 		--sysconfdir=${PREFIX}/etc/${PORTNAME}/
 
@@ -31,8 +31,8 @@ MAN1=		agmrancid.1 alogin.1 arancid.1 arrancid.1 avologin.1 avorancid.1 \
 		control_rancid.1 cssrancid.1 elogin.1 erancid.1 f10rancid.1 \
 		f5rancid.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 mrvlogin.1 mrvrancid.1 nlogin.1 nrancid.1 nslogin.1 \
-		nsrancid.1 nxrancid.1 fnlogin.1 \
+		mrancid.1 mrvlogin.1 mrvrancid.1 mtlogin.1 mtrancid.1 \
+		nlogin.1 nrancid.1 nslogin.1 nsrancid.1 nxrancid.1 fnlogin.1 \
 		par.1 prancid.1 rancid-cvs.1 rancid-run.1 rancid.1 \
 		rancid_intro.1 rivlogin.1 rivrancid.1 \
 		rrancid.1 srancid.1 tlogin.1 tntlogin.1 tntrancid.1 trancid.1 \
diff --git a/net-mgmt/rancid/distinfo b/net-mgmt/rancid/distinfo
index 4b959491eb64..f208d81088c5 100644
--- a/net-mgmt/rancid/distinfo
+++ b/net-mgmt/rancid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rancid-2.3.6.tar.gz) = d9b963d435fdf9129d80f30f5d28fcc3a2ae3ec52bd5ed598ca8c9abff6395b3
-SIZE (rancid-2.3.6.tar.gz) = 372436
+SHA256 (rancid-2.3.8.tar.gz) = 44e44c87a22968d5229c01d60aa46960da023a24846eef43f9e3c8d70fd5b3fb
+SIZE (rancid-2.3.8.tar.gz) = 379908
diff --git a/net-mgmt/rancid/files/patch-bin-rancid.in b/net-mgmt/rancid/files/patch-bin-rancid.in
deleted file mode 100644
index 41125bdec988..000000000000
--- a/net-mgmt/rancid/files/patch-bin-rancid.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- control_rancid.old  2010-09-17 09:30:59.000000000 +0200
-+++ bin/control_rancid.in      2010-09-17 09:33:03.000000000 +0200
-@@ -345,6 +345,10 @@
- done
- cd $DIR
-
-+if [ $RCSSYS = svn ] ; then
-+    $RCSSYS update >/dev/null 2>&1
-+fi
-+
- # no routers, empty list or all 'down'
- if [ ! -s routers.up ]
- then	
diff --git a/net-mgmt/rancid/files/patch-bin__control_rancid.in b/net-mgmt/rancid/files/patch-bin__control_rancid.in
new file mode 100644
index 000000000000..0b659c35cadc
--- /dev/null
+++ b/net-mgmt/rancid/files/patch-bin__control_rancid.in
@@ -0,0 +1,13 @@
+--- ./bin/control_rancid.in.orig	2011-01-10 21:17:17.000000000 +0100
++++ ./bin/control_rancid.in	2012-04-09 23:03:03.000000000 +0200
+@@ -347,6 +347,10 @@
+ done
+ cd $DIR
+ 
++if [ $RCSSYS = svn ] ; then
++    $RCSSYS update >/dev/null 2>&1
++fi
++
+ # no routers, empty list or all 'down'
+ if [ ! -s routers.up ]
+ then
diff --git a/net-mgmt/rancid/files/patch-etc::Makefile.am b/net-mgmt/rancid/files/patch-etc__Makefile.am
index 6a967375cf8d..0619c990cd54 100644
--- a/net-mgmt/rancid/files/patch-etc::Makefile.am
+++ b/net-mgmt/rancid/files/patch-etc__Makefile.am
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- etc/Makefile.am.orig
-+++ etc/Makefile.am
-@@ -33,26 +33,8 @@
+--- ./etc/Makefile.am.orig	2010-02-27 09:49:56.000000000 +0100
++++ ./etc/Makefile.am	2012-04-09 23:03:03.000000000 +0200
+@@ -58,26 +58,8 @@
  endif
  
  install-data-local: all
diff --git a/net-mgmt/rancid/files/patch-etc::Makefile.in b/net-mgmt/rancid/files/patch-etc__Makefile.in
index 66e8a0709bb2..6a57323243d9 100644
--- a/net-mgmt/rancid/files/patch-etc::Makefile.in
+++ b/net-mgmt/rancid/files/patch-etc__Makefile.in
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- etc/Makefile.in.orig
-+++ etc/Makefile.in
-@@ -375,26 +375,8 @@
+--- ./etc/Makefile.in.orig	2011-11-17 22:10:11.000000000 +0100
++++ ./etc/Makefile.in	2012-04-09 23:03:03.000000000 +0200
+@@ -423,26 +423,8 @@
  
  
  install-data-local: all
diff --git a/net-mgmt/rancid/pkg-plist b/net-mgmt/rancid/pkg-plist
index 95a9adcab913..89ae36c5eabb 100644
--- a/net-mgmt/rancid/pkg-plist
+++ b/net-mgmt/rancid/pkg-plist
@@ -36,6 +36,8 @@ libexec/rancid/lgform.cgi
 libexec/rancid/mrancid
 libexec/rancid/mrvlogin
 libexec/rancid/mrvrancid
+libexec/rancid/mtlogin
+libexec/rancid/mtrancid
 libexec/rancid/nlogin
 libexec/rancid/nrancid
 libexec/rancid/nxrancid
@@ -75,6 +77,7 @@ etc/rancid/rancid.conf.sample
 %%DATADIR%%/index.html
 %%DATADIR%%/lg.conf.sample
 %%DATADIR%%/lgnotes.html
+%%DATADIR%%/rancid-cvspurge
 %%DATADIR%%/rancid.conf.sample
 %%DATADIR%%/rtrfilter
 @dirrm %%DATADIR%%