Index: head/net-mgmt/rancid3/Makefile
===================================================================
--- head/net-mgmt/rancid3/Makefile	(revision 439417)
+++ head/net-mgmt/rancid3/Makefile	(revision 439418)
@@ -1,115 +1,115 @@
 # Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
 
 PORTNAME=	rancid
 PORTVERSION=	3.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Really Awesome New Cisco confIg Differ
 
 LIB_DEPENDS=	libexpect.so:lang/expect
 RUN_DEPENDS=	p5-LockFile-Simple>=0:devel/p5-LockFile-Simple
 
 USES=		gmake perl5 shebangfix
 perl_OLD_CMD=	@PERLV_PATH@
 SHEBANG_FILES=	bin/*
 
 USERS=		rancid
 GROUPS=		rancid
 
 SUB_FILES=	pkg-message 200.rancid
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=${LOCALBASE}/var/${PORTNAME}/ \
 		--bindir=${LOCALBASE}/libexec/${PORTNAME}/ \
 		--sysconfdir=${LOCALBASE}/etc/${PORTNAME}/
 
 OLDCONFIG_FILE1=	bin/env
 OLDCONFIG_FILE2=	util/lg/lg.conf
 NEWERCONFIG_FILE1=	etc/rancid.conf
 NEWERCONFIG_FILE2=	etc/lg.conf
 NEWCONFIG_FILES=	rancid.conf lg.conf
 
 OPTIONS_DEFINE=		COMWARE SVN
 OPTIONS_DEFAULT=
 
 COMWARE_DESC=		Add experimental support for Comware devices
 SVN_DESC=		Use Subversion instead of CVS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOMWARE}
 PLIST_SUB+=	COMWARE=""
 .else
 PLIST_SUB+=	COMWARE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSVN}
 CONFIGURE_ARGS+=	--with-svn
 BUILD_DEPENDS+=		svn:devel/subversion
 .else
 CONFIGURE_ARGS+=	--without-svn
 RUN_DEPENDS+=		cvs:devel/cvs
 .endif
 
 pre-everything::
 	@ ${ECHO} "Make sure your rancid repository is quiet before upgrading; disable rancid cron jobs"
 
 post-patch:
 .if ${PORT_OPTIONS:MCOMWARE}
 	${CAT} ${FILESDIR}/comware_types.conf >> ${WRKSRC}/etc/rancid.types.base
 	${SED} -e 's/@VERSION@/${PORTVERSION}/g' ${FILESDIR}/cmwlogin.in > ${WRKDIR}/cmwlogin
 	${SED} -e 's/@VERSION@/${PORTVERSION}/g' ${FILESDIR}/cmw.pm.in > ${WRKDIR}/cmw.pm
 .endif
 	${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in
 	${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1
 	${REINPLACE_CMD} 's|uid=`perl|uid=`${PERL}|' ${WRKSRC}/etc/rancid.conf.sample.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/periodic/hourly
 	${INSTALL_SCRIPT} ${WRKDIR}/200.rancid ${STAGEDIR}${LOCALBASE}/etc/periodic/hourly
 	${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${LOCALBASE}/bin
 	${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${LOCALBASE}/bin
 .if ${PORT_OPTIONS:MCOMWARE}
 	${INSTALL_DATA} ${WRKDIR}/cmw.pm ${STAGEDIR}/${LOCALBASE}/lib/rancid
 	${INSTALL_SCRIPT} ${WRKDIR}/cmwlogin ${STAGEDIR}/${LOCALBASE}/libexec/rancid
 .endif
 .for file in ${NEWCONFIG_FILES}
 	@ if [ -f ${LOCALBASE}/etc/${PORTNAME}/${file} ] ; then \
 	${ECHO} "WARNING: *** new ${file} file is installed as ${LOCALBASE}/rancid/${file}.sample"; \
 	${ECHO} "       : *** review ${file}.sample for new/deprecated switches or install in place ${file}";  \
 	fi
 .endfor
 	@ if [ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE1} ] ; then \
 	${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${NEWERCONFIG_FILE1} has been replaced with "; \
 	${ECHO} "       : *** ${LOCALBASE}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \
 	fi
 	@ if [ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE2} ] ; then \
 	${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${NEWERCONFIG_FILE2} has been replaced with "; \
 	${ECHO} "       : *** ${LOCALBASE}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \
 	fi
 	@ if [ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE1} -o \
 	-f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE2} ] ; then \
 	${ECHO} "WARNING: *** New CVS Repository will be stored ${LOCALBASE}/var/${PORTNAME}/ "; \
 	${ECHO} "       : *** Copy the repository if you want to keep the history "; \
 	fi
 
 	@ if [ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE1} ] ; then \
 	${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \
 	${ECHO} "       : *** ${LOCALBASE}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \
 	fi
 	@ if [ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE2} ] ; then \
 	${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \
 	${ECHO} "       : *** ${LOCALBASE}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \
 	fi
 	@ if [ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE1} -o \
 	-f ${LOCALBASE}/rancid/${OLDCONFIG_FILE2} ] ; then \
 	${ECHO} "WARNING: *** New CVS Repository will be stored ${LOCALBASE}/rancid/var "; \
 	${ECHO} "       : *** Copy the repository if you want to keep the history "; \
 	fi
 
 .include <bsd.port.mk>
Index: head/net-mgmt/rancid3/files/patch-lib_ios.pm.in
===================================================================
--- head/net-mgmt/rancid3/files/patch-lib_ios.pm.in	(revision 439417)
+++ head/net-mgmt/rancid3/files/patch-lib_ios.pm.in	(revision 439418)
@@ -1,11 +1,11 @@
 --- lib/ios.pm.in.orig	2017-04-19 20:53:52 UTC
 +++ lib/ios.pm.in
 @@ -942,7 +942,7 @@ sub ShowFlash {
  	# to:
  	#                                     vlan.dat
  	#                                            vlan.dat
 -	if (/(dhcp_[^. ]*\.txt|vlan\.dat|sflog|syslog)\s*$/) {
-+	if (/(dhcp_[^. ]*\.txt|vlan\.dat|sflog|snooping|syslog|vtp_debug)\s*$/) {
++	if (/(dhcp_[^. ]*\.txt|vlan\.dat|sflog|snooping|syslog|vtp_debug.*log)\s*$/) {
  	    if (/(\s*\d+)(\s+[-rwx]+\s+)(\d+)(\s+)(\w+ \d+\s+\d+ \d+:\d+:\d+ .\d+:\d+)/) {
  		my($fn, $a, $sz, $c, $dt, $rem) = ($1, $2, $3, $4, $5, $');
  		my($fnl, $szl, $dtl) = (length($fn), length($sz), length($dt));