Index: head/net-mgmt/rancid3/Makefile =================================================================== --- head/net-mgmt/rancid3/Makefile (revision 425091) +++ head/net-mgmt/rancid3/Makefile (revision 425092) @@ -1,114 +1,116 @@ # Created by: Janos.Mohacsi@bsd.hu # $FreeBSD$ PORTNAME= rancid PORTVERSION= 3.5.1 -PORTREVISION= 0 +PORTREVISION= 1 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 +SUB_FILES= pkg-message 200.rancid GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/var/${PORTNAME}/ \ - --bindir=${PREFIX}/libexec/${PORTNAME}/ \ - --sysconfdir=${PREFIX}/etc/${PORTNAME}/ +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_FILES1= etc/rancid.conf NEWERCONFIG_FILES2= 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 CONFLICTS= rancid-[0-9]* .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 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 RUN_DEPENDS+= cvs>0:devel/cvs .endif .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 .endif ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 post-install: - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${PREFIX}/bin - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${PREFIX}/bin + ${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} ${FILESDIR}/cmw.pm ${STAGEDIR}/${PREFIX}/lib/rancid - ${INSTALL_SCRIPT} ${FILESDIR}/cmwlogin ${STAGEDIR}/${PREFIX}/libexec/rancid + ${INSTALL_DATA} ${FILESDIR}/cmw.pm ${STAGEDIR}/${LOCALBASE}/lib/rancid + ${INSTALL_SCRIPT} ${FILESDIR}/cmwlogin ${STAGEDIR}/${LOCALBASE}/libexec/rancid .endif .for file in ${NEWCONFIG_FILES} - @ if [ -f ${PREFIX}/etc/${PORTNAME}/${file} ] ; then \ - ${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \ + @ 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 ${PREFIX}/rancid/${NEWERCONFIG_FILE1} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE1} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ + @ 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 ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE2} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ + @ 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 ${PREFIX}/rancid/${NEWERCONFIG_FILE1} -o \ - -f ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/var/${PORTNAME}/ "; \ + @ 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 ${PREFIX}/rancid/${OLDCONFIG_FILE1} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ + @ 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 ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ + @ 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 ${PREFIX}/rancid/${OLDCONFIG_FILE1} -o \ - -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/rancid/var "; \ + @ 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 Index: head/net-mgmt/rancid3/files/200.rancid.in =================================================================== --- head/net-mgmt/rancid3/files/200.rancid.in (nonexistent) +++ head/net-mgmt/rancid3/files/200.rancid.in (revision 425092) @@ -0,0 +1,20 @@ +#!/bin/sh + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ]; then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +# hourly_rancid_enable - Enable hourly rancid run (values: YES | NO) + +case "${hourly_rancid_enable-"NO"}" in + [Yy][Ee][Ss]) + /usr/bin/su -f rancid %%LOCALBASE%%/libexec/rancid/rancid-run + ;; + + *) + exit 0 + ;; +esac Property changes on: head/net-mgmt/rancid3/files/200.rancid.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/rancid3/files/pkg-message.in =================================================================== --- head/net-mgmt/rancid3/files/pkg-message.in (revision 425091) +++ head/net-mgmt/rancid3/files/pkg-message.in (revision 425092) @@ -1,11 +1,15 @@ For further configuration information please look at %%PREFIX%%/share/rancid/README. If you are upgrading from the previous version of rancid look at %%PREFIX%%/share/rancid/UPGRADING. If you would like to set up Rancid to be browseable from Web, you need to install devel/cvsweb or devel/viewvc. For rancid looking-glass copy the actual CGIs (located at %%PREFIX%%/libexec/rancid/{lg.cgi lgform.cgi}) to your cgi-bin. + +Schedule rancid-run with cron at your desired interval or add +hourly_rancid_enable="YES" to /etc/periodic.conf for automatic hourly +runs. Index: head/net-mgmt/rancid3/pkg-plist =================================================================== --- head/net-mgmt/rancid3/pkg-plist (revision 425091) +++ head/net-mgmt/rancid3/pkg-plist (revision 425092) @@ -1,173 +1,174 @@ bin/rancid-cvs bin/rancid-run +etc/periodic/hourly/200.rancid lib/rancid/acos.pm lib/rancid/arbor.pm lib/rancid/ciscowlc.pm %%COMWARE%%lib/rancid/cmw.pm lib/rancid/aeos.pm lib/rancid/bigip.pm lib/rancid/dell.pm lib/rancid/edgemax.pm lib/rancid/edgerouter.pm lib/rancid/eos.pm lib/rancid/exos.pm lib/rancid/foundry.pm lib/rancid/ios.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/wavesvros.pm libexec/rancid/a10login 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/complogin libexec/rancid/control_rancid libexec/rancid/cssrancid %%COMWARE%%libexec/rancid/cmwlogin libexec/rancid/dllogin libexec/rancid/elogin libexec/rancid/erancid libexec/rancid/f10rancid libexec/rancid/f5rancid libexec/rancid/flogin libexec/rancid/fnrancid libexec/rancid/fnlogin 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/nrancid libexec/rancid/nslogin libexec/rancid/nsrancid libexec/rancid/par libexec/rancid/panlogin 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/complogin.1.gz man/man1/control_rancid.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/fnrancid.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/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%%/rtrfilter @dir(rancid,rancid,755) var/rancid