4 files changed, 28 insertions, 19 deletions

diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile
index 43b88ca57085..3c834ec446f0 100644
--- a/net-mgmt/rancid-devel/Makefile
+++ b/net-mgmt/rancid-devel/Makefile
@@ -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@bsd.hu
 COMMENT=	Really Awesome New Cisco confIg Differ
diff --git a/net-mgmt/rancid-devel/distinfo b/net-mgmt/rancid-devel/distinfo
index 5f9b756bd5b4..b5fb278d4f0c 100644
--- a/net-mgmt/rancid-devel/distinfo
+++ b/net-mgmt/rancid-devel/distinfo
@@ -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 --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am b/net-mgmt/rancid-devel/files/patch-etc::Makefile.am
index e4805556c2c8..67a61d8b98e0 100644
--- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am
+++ b/net-mgmt/rancid-devel/files/patch-etc::Makefile.am
@@ -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 --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.in b/net-mgmt/rancid-devel/files/patch-etc::Makefile.in
index 1f78dfe1b6d5..f5c70a4d9d68 100644
--- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.in
+++ b/net-mgmt/rancid-devel/files/patch-etc::Makefile.in
@@ -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