ports/66316: Maintainer update: net-mgmt/rancid to version 2.3

[Janos Mohacsi]

>Number:         66316
>Category:       ports
>Synopsis:       Maintainer update: net-mgmt/rancid to version 2.3
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 06 00:20:21 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Janos Mohacsi
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
NIIF
>Environment:
System: FreeBSD norfolk.ki.iif.hu 5.2-CURRENT FreeBSD 5.2-CURRENT #10: Wed Mar 24 17:08:06 CET 2004 root at norfolk.ki.iif.hu:/usr/obj/usr/src/sys/NORFOLK i386

>Description:
	Maintainer update: net-mgmt/rancid to version 2.3
	changes: update of pacthes
>How-To-Repeat:
	Apply this diff.
>Fix:


diff -ruN rancid.bak/Makefile rancid/Makefile
--- rancid.bak/Makefile	Mon Feb 23 05:42:10 2004
+++ rancid/Makefile	Wed May  5 16:32:47 2004
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	rancid
-PORTVERSION=	2.3.r1
-PORTREVISION=	1
+PORTVERSION=	2.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
-DISTNAME=	${PORTNAME}-2.3.rc1
+#DISTNAME=	${PORTNAME}-2.3.rc1
 
 MAINTAINER=	janos.mohacsi at bsd.hu
 COMMENT=	Really Awesome New Cisco confIg Differ
diff -ruN rancid.bak/distinfo rancid/distinfo
--- rancid.bak/distinfo	Thu Apr  1 09:22:54 2004
+++ rancid/distinfo	Wed May  5 16:33:01 2004
@@ -1,2 +1,2 @@
-MD5 (rancid-2.3.rc1.tar.gz) = fb98161366fee76c879b4400805ec5bb
-SIZE (rancid-2.3.rc1.tar.gz) = 269732
+MD5 (rancid-2.3.tar.gz) = 0f0ee7f528adc571510067f89b190c2e
+SIZE (rancid-2.3.tar.gz) = 273383
diff -ruN rancid.bak/files/patch-etc::Makefile.am rancid/files/patch-etc::Makefile.am
--- rancid.bak/files/patch-etc::Makefile.am	Tue Jan 20 00:16:29 2004
+++ rancid/files/patch-etc::Makefile.am	Wed May  5 16:37:41 2004
@@ -1,10 +1,14 @@
---- etc/Makefile.am.orig	Sun Jan 18 02:30:29 2004
-+++ etc/Makefile.am	Sun Jan 18 02:32:16 2004
-@@ -29,24 +29,8 @@
- CLEANFILES= $(pkgdata_DATA)
+
+$FreeBSD$
+
+--- etc/Makefile.am.orig	Tue Jan 13 19:02:00 2004
++++ etc/Makefile.am	Wed May  5 16:36:40 2004
+@@ -33,26 +33,8 @@
+ endif
  
  install-data-local: all
--	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	@if test "$(DO_CONF_INSTALL)" = "yes"; then \
+-	if test -f $(sysconfdir)/rancid.conf ; then \
 -	    echo ""; \
 -	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
@@ -21,9 +25,10 @@
 -	    echo ""; \
 -	else \
 -	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
--	fi;
-+	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ \
-+	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/ 
+-	fi; \
+-	fi
++	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ 
++	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
  
  #clean:
  #	rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)
diff -ruN rancid.bak/files/patch-etc::Makefile.in rancid/files/patch-etc::Makefile.in
--- rancid.bak/files/patch-etc::Makefile.in	Tue Jan 20 00:16:29 2004
+++ rancid/files/patch-etc::Makefile.in	Wed May  5 16:40:21 2004
@@ -1,10 +1,14 @@
---- etc/Makefile.in.orig	Sun Jan 18 02:37:08 2004
-+++ etc/Makefile.in	Sun Jan 18 02:38:03 2004
-@@ -342,24 +342,8 @@
+
+$FreeBSD$
+
+--- etc/Makefile.in.orig	Fri Feb  6 16:56:50 2004
++++ etc/Makefile.in	Wed May  5 16:40:00 2004
+@@ -347,26 +347,8 @@
  
  
  install-data-local: all
--	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	@if test "$(DO_CONF_INSTALL)" = "yes"; then \
+-	if test -f $(sysconfdir)/rancid.conf ; then \
 -	    echo ""; \
 -	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
@@ -21,8 +25,9 @@
 -	    echo ""; \
 -	else \
 -	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
--	fi;
-+	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/; \
+-	fi; \
+-	fi
++	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/
 +	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
  
  lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
>Release-Note:
>Audit-Trail:
>Unformatted: