5 files changed, 52 insertions, 49 deletions

diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile
index 15b909a4c676..85785e8b773b 100644
--- a/net-mgmt/rancid-devel/Makefile
+++ b/net-mgmt/rancid-devel/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for:	rancid
-# Date created:		3 June 2002
-# Whom:			Janos.Mohacsi@bsd.hu
+# New ports collection makefile for:	rancid-devel
+# Date created:		20 March 2007 (based on net-mgmt/rancid)
+# Whom:			janos.mohacsi@bsd.hu
 #
 # $FreeBSD$
 #
 
 PORTNAME=	rancid
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.3.2a6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Really Awesome New Cisco confIg Differ
@@ -27,7 +27,8 @@ CONFIGURE_ARGS=			\
 		--prefix=${PREFIX}/ \
 		--localstatedir=${PREFIX}/var/${PORTNAME}/ \
 		--bindir=${PREFIX}/libexec/${PORTNAME}/ \
-		--sysconfdir=${PREFIX}/etc/${PORTNAME}/
+		--sysconfdir=${PREFIX}/etc/${PORTNAME}/ \
+		--mandir=${PREFIX}/man
 
 MAN1=		alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \
 		cssrancid.1 elogin.1 erancid.1 f10rancid.1 flogin.1 fnrancid.1 \
@@ -35,7 +36,8 @@ MAN1=		alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \
 		jlogin.1 jrancid.1 lg_intro.1 mrancid.1 nlogin.1 nrancid.1 \
 		nslogin.1 nsrancid.1 par.1 prancid.1 rancid-cvs.1 rancid-run.1 \
 		rancid.1 rancid_intro.1 rivlogin.1 rivrancid.1 tntlogin.1 \
-		tntrancid.1 xrancid.1 zrancid.1
+		tntrancid.1 xrancid.1 zrancid.1 arancid.1 brancid.1 \
+		drancid.1
 
 MAN5=		lg.conf.5 cloginrc.5 rancid.conf.5 router.db.5
 
diff --git a/net-mgmt/rancid-devel/distinfo b/net-mgmt/rancid-devel/distinfo
index fed6b2420ee6..5763df48da55 100644
--- a/net-mgmt/rancid-devel/distinfo
+++ b/net-mgmt/rancid-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (rancid-2.3.1.tar.gz) = b188595e528515b4f87078f63936d355
-SHA256 (rancid-2.3.1.tar.gz) = 32ceca2bbedf92577fbe780dd2b6c7d7a012974728e4932ce6a19897907dc2fa
-SIZE (rancid-2.3.1.tar.gz) = 276562
+MD5 (rancid-2.3.2a6.tar.gz) = 54a91c7e00c201a8f88ec44b83c0a1e4
+SHA256 (rancid-2.3.2a6.tar.gz) = 2f916ab1ab89215c72e45f8276a54fdb233c8396c6b48f906e1aad308f02c603
+SIZE (rancid-2.3.2a6.tar.gz) = 298821
diff --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am b/net-mgmt/rancid-devel/files/patch-etc::Makefile.am
index 67a61d8b98e0..6a967375cf8d 100644
--- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am
+++ b/net-mgmt/rancid-devel/files/patch-etc::Makefile.am
@@ -1,34 +1,34 @@
 
 $FreeBSD$
 
---- etc/Makefile.am.orig	Tue Jan 13 19:02:00 2004
-+++ etc/Makefile.am	Wed May  5 16:36:40 2004
+--- etc/Makefile.am.orig
++++ etc/Makefile.am
 @@ -33,26 +33,8 @@
  endif
  
  install-data-local: all
 -	@if test "$(DO_CONF_INSTALL)" = "yes"; then \
--	if test -f $(sysconfdir)/rancid.conf ; then \
+-	if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \
 -	    echo ""; \
--	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
 -	    echo "         *** examples."; \
 -	    echo ""; \
 -	else \
--	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	    $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \
 -	fi; \
--	if test -f $(sysconfdir)/lg.conf ; then \
+-	if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \
 -	    echo ""; \
--	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
 -	    echo "         *** examples."; \
 -	    echo ""; \
 -	else \
--	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	    $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \
 -	fi; \
 -	fi
-+	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ 
-+	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
++	$(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(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 f5c70a4d9d68..66e8a0709bb2 100644
--- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.in
+++ b/net-mgmt/rancid-devel/files/patch-etc::Makefile.in
@@ -1,34 +1,34 @@
 
 $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 @@
+--- etc/Makefile.in.orig
++++ etc/Makefile.in
+@@ -375,26 +375,8 @@
  
  
  install-data-local: all
 -	@if test "$(DO_CONF_INSTALL)" = "yes"; then \
--	if test -f $(sysconfdir)/rancid.conf ; then \
+-	if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \
 -	    echo ""; \
--	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
 -	    echo "         *** examples."; \
 -	    echo ""; \
 -	else \
--	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	    $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \
 -	fi; \
--	if test -f $(sysconfdir)/lg.conf ; then \
+-	if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \
 -	    echo ""; \
--	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
 -	    echo "         *** examples."; \
 -	    echo ""; \
 -	else \
--	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	    $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \
 -	fi; \
 -	fi
-+	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/
-+	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
++	$(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)
  
  lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
  	rm -f lg.conf.sample lg.conf.sample.tmp; \
diff --git a/net-mgmt/rancid-devel/pkg-plist b/net-mgmt/rancid-devel/pkg-plist
index 30e9fdf886e2..c3ef59b17a78 100644
--- a/net-mgmt/rancid-devel/pkg-plist
+++ b/net-mgmt/rancid-devel/pkg-plist
@@ -5,6 +5,7 @@ bin/rancid-cvs
 bin/rancid-run
 libexec/rancid/alogin
 libexec/rancid/arancid
+libexec/rancid/agmrancid
 libexec/rancid/blogin
 libexec/rancid/brancid
 libexec/rancid/cat5rancid
@@ -47,24 +48,24 @@ libexec/rancid/xrancid
 libexec/rancid/zrancid
 etc/rancid/lg.conf.sample
 etc/rancid/rancid.conf.sample
-share/rancid/CHANGES
-share/rancid/COPYING
-share/rancid/FAQ
-share/rancid/README
-share/rancid/README.lg
-share/rancid/README.misc
-share/rancid/UPGRADING
-share/rancid/cisco-load.exp
-share/rancid/cisco-reload.exp
-share/rancid/cloginrc.sample
-share/rancid/downreport
-share/rancid/getipacctg
-share/rancid/index.html
-share/rancid/lg.conf.sample
-share/rancid/lgnotes.html
-share/rancid/rancid.conf.sample
-share/rancid/rtrfilter
-@dirrm share/rancid
+%%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.conf.sample
+%%DATADIR%%/rtrfilter
+@dirrm %%DATADIR%%
 @dirrm var/rancid
 @dirrm etc/rancid
 @dirrm libexec/rancid