From owner-svn-ports-head@freebsd.org Thu Feb 6 16:49:45 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8B08C2304A2; Thu, 6 Feb 2020 16:49:45 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48D4Cs39yDz4Fpl; Thu, 6 Feb 2020 16:49:45 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5018E1EA62; Thu, 6 Feb 2020 16:49:45 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 016GnjvL041509; Thu, 6 Feb 2020 16:49:45 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 016Gniv8041506; Thu, 6 Feb 2020 16:49:44 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <202002061649.016Gniv8041506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Thu, 6 Feb 2020 16:49:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525390 - head/net-mgmt/rancid3 X-SVN-Group: ports-head X-SVN-Commit-Author: marcus X-SVN-Commit-Paths: head/net-mgmt/rancid3 X-SVN-Commit-Revision: 525390 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Feb 2020 16:49:45 -0000 Author: marcus Date: Thu Feb 6 16:49:44 2020 New Revision: 525390 URL: https://svnweb.freebsd.org/changeset/ports/525390 Log: Update to 3.11. See https://www.shrubbery.net/rancid/CHANGES for a list of changes. Additionally: * Add BSD3CLAUSE licence * Add support for archiving to a git VCS * Switch maintainer to myself. PR: 243130 Approved by: feld (previous maintainer) Modified: head/net-mgmt/rancid3/Makefile head/net-mgmt/rancid3/distinfo head/net-mgmt/rancid3/pkg-plist Modified: head/net-mgmt/rancid3/Makefile ============================================================================== --- head/net-mgmt/rancid3/Makefile Thu Feb 6 16:48:05 2020 (r525389) +++ head/net-mgmt/rancid3/Makefile Thu Feb 6 16:49:44 2020 (r525390) @@ -2,15 +2,17 @@ # $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 @@ -34,12 +36,27 @@ 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} @@ -48,14 +65,6 @@ PLIST_SUB+= COMWARE="" 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" @@ -108,7 +117,7 @@ post-install: 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 Modified: head/net-mgmt/rancid3/distinfo ============================================================================== --- head/net-mgmt/rancid3/distinfo Thu Feb 6 16:48:05 2020 (r525389) +++ head/net-mgmt/rancid3/distinfo Thu Feb 6 16:49:44 2020 (r525390) @@ -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 Modified: head/net-mgmt/rancid3/pkg-plist ============================================================================== --- head/net-mgmt/rancid3/pkg-plist Thu Feb 6 16:48:05 2020 (r525389) +++ head/net-mgmt/rancid3/pkg-plist Thu Feb 6 16:49:44 2020 (r525390) @@ -1,19 +1,24 @@ 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 @@ -24,31 +29,31 @@ 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 @@ -71,8 +76,8 @@ 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 @@ -83,7 +88,6 @@ libexec/rancid/rivlogin libexec/rancid/rivrancid libexec/rancid/rrancid libexec/rancid/rtftpcopy -libexec/rancid/srancid libexec/rancid/tlogin libexec/rancid/trancid libexec/rancid/ulogin @@ -95,9 +99,7 @@ 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 @@ -110,7 +112,6 @@ 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 @@ -130,10 +131,8 @@ 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 @@ -142,7 +141,6 @@ 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 @@ -158,9 +156,6 @@ 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