Index: head/net-mgmt/rancid3/Makefile =================================================================== --- head/net-mgmt/rancid3/Makefile (revision 525389) +++ head/net-mgmt/rancid3/Makefile (revision 525390) @@ -1,115 +1,124 @@ # Created by: Janos.Mohacsi@bsd.hu # $FreeBSD$ PORTNAME= rancid -PORTVERSION= 3.9 +PORTVERSION= 3.11 PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ PKGNAMESUFFIX= 3 -MAINTAINER= feld@FreeBSD.org +MAINTAINER= marcus@FreeBSD.org COMMENT= Really Awesome New Cisco confIg Differ +LICENSE= BSD3CLAUSE + 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= +OPTIONS_SINGLE= SCM +OPTIONS_SINGLE_SCM= CVS SVN GIT + +OPTIONS_DEFINE= COMWARE +OPTIONS_DEFAULT= CVS + COMWARE_DESC= Add experimental support for Comware devices -SVN_DESC= Use Subversion instead of CVS +CVS_DESC= Use CVS as the means of version control +SVN_DESC= Use Subversion as the means of version control +GIT_DESC= Use Git as the means of version control +CVS_RUN_DEPENDS= cvs:devel/cvs +CVS_CONFIGURE_ON= --without-svn + +SVN_RUN_DEPENDS= svn:devel/subversion +SVN_CONFIGURE_ON= --with-svn + +GIT_RUN_DEPENDS= git:devel/git +GIT_CONFIGURE_ON= --with-git + .include .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} "WARNING: *** New VCS Repository will be stored ${LOCALBASE}/rancid/var "; \ ${ECHO} " : *** Copy the repository if you want to keep the history "; \ fi .include Index: head/net-mgmt/rancid3/distinfo =================================================================== --- head/net-mgmt/rancid3/distinfo (revision 525389) +++ head/net-mgmt/rancid3/distinfo (revision 525390) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550643496 -SHA256 (rancid-3.9.tar.gz) = 9db9ba5026c2acae99713c6ee00f8186ea9d14eb2b902dabf40525025e0b1188 -SIZE (rancid-3.9.tar.gz) = 515946 +TIMESTAMP = 1581007295 +SHA256 (rancid-3.11.tar.gz) = 0678a1bad101d48d30308a8df7140eef02698b3a72b5368ff3318bd10394d21a +SIZE (rancid-3.11.tar.gz) = 529473 Index: head/net-mgmt/rancid3/pkg-plist =================================================================== --- head/net-mgmt/rancid3/pkg-plist (revision 525389) +++ head/net-mgmt/rancid3/pkg-plist (revision 525390) @@ -1,183 +1,178 @@ bin/rancid-cvs bin/rancid-run etc/periodic/hourly/200.rancid +@sample %%ETCDIR%%/lg.conf.sample +@sample %%ETCDIR%%/rancid.conf.sample +%%ETCDIR%%/rancid.types.base lib/rancid/acos.pm lib/rancid/aeos.pm lib/rancid/arbor.pm lib/rancid/arcos.pm +lib/rancid/bigip.pm lib/rancid/ciscowlc.pm %%COMWARE%%lib/rancid/cmw.pm -lib/rancid/bigip.pm lib/rancid/dell.pm +lib/rancid/dnos10.pm +lib/rancid/dnos9.pm lib/rancid/edgemax.pm lib/rancid/edgerouter.pm lib/rancid/exos.pm -lib/rancid/foundry.pm lib/rancid/fortigate.pm +lib/rancid/foundry.pm lib/rancid/fss2.pm lib/rancid/fxos.pm lib/rancid/ios.pm lib/rancid/iossb.pm lib/rancid/iosshtech.pm lib/rancid/iosxr.pm lib/rancid/junos.pm lib/rancid/mrv.pm lib/rancid/nxos.pm lib/rancid/panos.pm -lib/rancid/rbt.pm lib/rancid/rancid.pm +lib/rancid/rbt.pm +lib/rancid/smc.pm lib/rancid/sros.pm lib/rancid/vrp.pm lib/rancid/wavesvros.pm libexec/rancid/a10login +libexec/rancid/agmrancid libexec/rancid/alogin libexec/rancid/anlogin libexec/rancid/arancid libexec/rancid/avologin libexec/rancid/avorancid -libexec/rancid/agmrancid libexec/rancid/blogin libexec/rancid/brancid libexec/rancid/brlogin libexec/rancid/cat5rancid libexec/rancid/clogin -libexec/rancid/control_rancid %%COMWARE%%libexec/rancid/cmwlogin +libexec/rancid/control_rancid libexec/rancid/csblogin libexec/rancid/cssrancid libexec/rancid/dllogin libexec/rancid/elogin libexec/rancid/erancid -libexec/rancid/f10rancid libexec/rancid/f5rancid libexec/rancid/flogin libexec/rancid/fnlogin libexec/rancid/fxlogin libexec/rancid/hlogin libexec/rancid/hpuifilter libexec/rancid/hrancid libexec/rancid/htlogin libexec/rancid/htrancid libexec/rancid/jerancid libexec/rancid/jlogin libexec/rancid/lg.cgi libexec/rancid/lgform.cgi libexec/rancid/mrancid libexec/rancid/mrvlogin libexec/rancid/mtlogin libexec/rancid/mtrancid libexec/rancid/nlogin libexec/rancid/noklogin libexec/rancid/nrancid libexec/rancid/nslogin libexec/rancid/nsrancid -libexec/rancid/par libexec/rancid/panlogin +libexec/rancid/par libexec/rancid/plogin libexec/rancid/rancid libexec/rancid/rancid-cvs libexec/rancid/rancid-fe libexec/rancid/rancid-run libexec/rancid/rblogin libexec/rancid/rivlogin libexec/rancid/rivrancid libexec/rancid/rrancid libexec/rancid/rtftpcopy -libexec/rancid/srancid libexec/rancid/tlogin libexec/rancid/trancid libexec/rancid/ulogin libexec/rancid/wlogin libexec/rancid/xilogin libexec/rancid/xirancid libexec/rancid/xlogin libexec/rancid/zrancid man/man1/agmrancid.1.gz man/man1/alogin.1.gz man/man1/anlogin.1.gz -man/man1/anrancid.1.gz man/man1/arancid.1.gz -man/man1/arrancid.1.gz man/man1/avologin.1.gz man/man1/avorancid.1.gz man/man1/blogin.1.gz man/man1/brancid.1.gz man/man1/cat5rancid.1.gz man/man1/clogin.1.gz man/man1/control_rancid.1.gz man/man1/csblogin.1.gz man/man1/cssrancid.1.gz man/man1/dllogin.1.gz man/man1/elogin.1.gz man/man1/erancid.1.gz -man/man1/f10rancid.1.gz man/man1/f5rancid.1.gz man/man1/flogin.1.gz man/man1/fnlogin.1.gz man/man1/hlogin.1.gz man/man1/hrancid.1.gz man/man1/htlogin.1.gz man/man1/htrancid.1.gz man/man1/jerancid.1.gz man/man1/jlogin.1.gz man/man1/lg_intro.1.gz man/man1/mrancid.1.gz man/man1/mrvlogin.1.gz man/man1/mtlogin.1.gz man/man1/mtrancid.1.gz man/man1/nlogin.1.gz man/man1/noklogin.1.gz man/man1/nrancid.1.gz man/man1/nslogin.1.gz man/man1/nsrancid.1.gz -man/man1/nxrancid.1.gz man/man1/panlogin.1.gz man/man1/plogin.1.gz -man/man1/prancid.1.gz man/man1/rancid-cvs.1.gz man/man1/rancid-par.1.gz man/man1/rancid-run.1.gz man/man1/rancid.1.gz man/man1/rancid_intro.1.gz man/man1/rivlogin.1.gz man/man1/rivrancid.1.gz man/man1/rrancid.1.gz -man/man1/srancid.1.gz man/man1/tlogin.1.gz man/man1/trancid.1.gz man/man1/ulogin.1.gz man/man1/wlogin.1.gz man/man1/xilogin.1.gz man/man1/xirancid.1.gz man/man1/xlogin.1.gz man/man1/zrancid.1.gz man/man3/rancid.3.gz man/man5/cloginrc.5.gz man/man5/lg.conf.5.gz man/man5/rancid.conf.5.gz man/man5/rancid.types.base.5.gz man/man5/rancid.types.conf.5.gz man/man5/router.db.5.gz -%%ETCDIR%%/rancid.types.base -@sample %%ETCDIR%%/lg.conf.sample -@sample %%ETCDIR%%/rancid.conf.sample %%DATADIR%%/CHANGES %%DATADIR%%/COPYING %%DATADIR%%/FAQ %%DATADIR%%/README %%DATADIR%%/README.lg %%DATADIR%%/README.misc %%DATADIR%%/UPGRADING %%DATADIR%%/cisco-load.exp %%DATADIR%%/cisco-reload.exp %%DATADIR%%/cloginrc.sample %%DATADIR%%/downreport %%DATADIR%%/getipacctg %%DATADIR%%/index.html %%DATADIR%%/lg.conf.sample %%DATADIR%%/lgnotes.html %%DATADIR%%/rancid-cvspurge %%DATADIR%%/rancid.conf.sample %%DATADIR%%/rancid.types.conf %%DATADIR%%/rtrfilter @dir(rancid,rancid,755) var/rancid