svn commit: r431186 - in branches/2017Q1/net-mgmt/rancid3: . files

[Mark Felder]

Author: feld
Date: Wed Jan 11 15:06:22 2017
New Revision: 431186
URL: https://svnweb.freebsd.org/changeset/ports/431186

Log:
  MFH: r430723 r430728 r431184
  
  net-mgmt/rancid3: Port cleanup
  
  Fix some variables in post-install, make Comware support include a
  version number that matches PORTVERSION
  
  PR:		215832
  
  - add missing fix for rancid version
    s/3.1.99/@VERSION@/
  
  PR:		215832
  
  net-mgmt/rancid3: Update to 3.6.2
  
  Approved by:	ports-secteam (with hat)

Added:
  branches/2017Q1/net-mgmt/rancid3/files/cmw.pm.in
     - copied, changed from r430723, head/net-mgmt/rancid3/files/cmw.pm.in
  branches/2017Q1/net-mgmt/rancid3/files/cmwlogin.in
     - copied, changed from r430723, head/net-mgmt/rancid3/files/cmwlogin.in
Deleted:
  branches/2017Q1/net-mgmt/rancid3/files/cmw.pm
  branches/2017Q1/net-mgmt/rancid3/files/cmwlogin
Modified:
  branches/2017Q1/net-mgmt/rancid3/Makefile
  branches/2017Q1/net-mgmt/rancid3/distinfo
  branches/2017Q1/net-mgmt/rancid3/pkg-plist
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/net-mgmt/rancid3/Makefile
==============================================================================
--- branches/2017Q1/net-mgmt/rancid3/Makefile	Wed Jan 11 15:04:03 2017	(r431185)
+++ branches/2017Q1/net-mgmt/rancid3/Makefile	Wed Jan 11 15:06:22 2017	(r431186)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rancid
-PORTVERSION=	3.6.1
+PORTVERSION=	3.6.2
 PORTREVISION=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
@@ -30,8 +30,8 @@ CONFIGURE_ARGS=	--localstatedir=${LOCALB
 
 OLDCONFIG_FILE1=	bin/env
 OLDCONFIG_FILE2=	util/lg/lg.conf
-NEWERCONFIG_FILES1=	etc/rancid.conf
-NEWERCONFIG_FILES2=	etc/lg.conf
+NEWERCONFIG_FILE1=	etc/rancid.conf
+NEWERCONFIG_FILE2=	etc/lg.conf
 NEWCONFIG_FILES=	rancid.conf lg.conf
 
 OPTIONS_DEFINE=		COMWARE SVN
@@ -64,6 +64,8 @@ pre-everything::
 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
@@ -74,8 +76,8 @@ post-install:
 	${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}/${LOCALBASE}/lib/rancid
-	${INSTALL_SCRIPT} ${FILESDIR}/cmwlogin ${STAGEDIR}/${LOCALBASE}/libexec/rancid
+	${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 \

Modified: branches/2017Q1/net-mgmt/rancid3/distinfo
==============================================================================
--- branches/2017Q1/net-mgmt/rancid3/distinfo	Wed Jan 11 15:04:03 2017	(r431185)
+++ branches/2017Q1/net-mgmt/rancid3/distinfo	Wed Jan 11 15:06:22 2017	(r431186)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483462757
-SHA256 (rancid-3.6.1.tar.gz) = b7506b5e75eb324c41474b254e3b91ecd59bbeebd4b4155cd690ba1a6870a65a
-SIZE (rancid-3.6.1.tar.gz) = 494527
+TIMESTAMP = 1484146349
+SHA256 (rancid-3.6.2.tar.gz) = 23751829c9bacdd07f90512271265c0cac279ca2f36ac86be815dd21831c253d
+SIZE (rancid-3.6.2.tar.gz) = 511207

Copied and modified: branches/2017Q1/net-mgmt/rancid3/files/cmw.pm.in (from r430723, head/net-mgmt/rancid3/files/cmw.pm.in)
==============================================================================
--- head/net-mgmt/rancid3/files/cmw.pm.in	Fri Jan  6 18:23:38 2017	(r430723, copy source)
+++ branches/2017Q1/net-mgmt/rancid3/files/cmw.pm.in	Wed Jan 11 15:06:22 2017	(r431186)
@@ -2,7 +2,7 @@ package cmw;
 ##
 ## $Id: cmw.pm.in 3000 2015-01-06 18:47:49Z heas $
 ##
-## rancid 3.1.99
+## rancid @VERSION@
 ## Copyright (c) 1997-2015 by Terrapin Communications, Inc.
 ## All rights reserved.
 ##
@@ -53,7 +53,7 @@ no warnings 'uninitialized';
 require(Exporter);
 our @ISA = qw(Exporter);
 
-use rancid 3.1.99;
+use rancid @VERSION@;
 
 our $login;
 

Copied and modified: branches/2017Q1/net-mgmt/rancid3/files/cmwlogin.in (from r430723, head/net-mgmt/rancid3/files/cmwlogin.in)
==============================================================================
--- head/net-mgmt/rancid3/files/cmwlogin.in	Fri Jan  6 18:23:38 2017	(r430723, copy source)
+++ branches/2017Q1/net-mgmt/rancid3/files/cmwlogin.in	Wed Jan 11 15:06:22 2017	(r431186)
@@ -2,7 +2,7 @@
 ##
 ## $Id: cmwlogin 3022 2015-01-13 20:00:00Z heas $
 ##
-## rancid 3.1.99
+## rancid @VERSION@
 ## Copyright (c) 1997-2015 by Terrapin Communications, Inc.
 ## All rights reserved.
 ##
@@ -140,7 +140,7 @@ for {set i 0} {$i < $argc} {incr i} {
 	    set do_passwd 0
 	# Version string
 	} -V* {
-	    send_user "rancid 3.1.99\n"
+	    send_user "rancid @VERSION@\n"
 	    exit 0
 	# Enable Username
 	} -w* {

Modified: branches/2017Q1/net-mgmt/rancid3/pkg-plist
==============================================================================
--- branches/2017Q1/net-mgmt/rancid3/pkg-plist	Wed Jan 11 15:04:03 2017	(r431185)
+++ branches/2017Q1/net-mgmt/rancid3/pkg-plist	Wed Jan 11 15:06:22 2017	(r431186)
@@ -171,5 +171,6 @@ man/man5/router.db.5.gz
 %%DATADIR%%/lgnotes.html
 %%DATADIR%%/rancid-cvspurge
 %%DATADIR%%/rancid.conf.sample
+%%DATADIR%%/rancid.types.conf
 %%DATADIR%%/rtrfilter
 @dir(rancid,rancid,755) var/rancid