8 files changed, 58 insertions, 117 deletions

diff --git a/net-mgmt/rancid/files/patch-Makefile.am b/net-mgmt/rancid/files/patch-Makefile.am
deleted file mode 100644
index 246e638fd59d..000000000000
--- a/net-mgmt/rancid/files/patch-Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.am.orig	Mon Jun  3 14:01:32 2002
---- Makefile.am	Mon Jun  3 14:02:03 2002
-***************
-*** 22,28 ****
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
---- 22,28 ----
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES FAQ README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
diff --git a/net-mgmt/rancid/files/patch-Makefile.in b/net-mgmt/rancid/files/patch-Makefile.in
deleted file mode 100644
index eabf76568439..000000000000
--- a/net-mgmt/rancid/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.in.orig	Mon Jun  3 14:01:40 2002
---- Makefile.in	Mon Jun  3 14:02:40 2002
-***************
-*** 354,360 ****
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
---- 354,360 ----
-  	$(mkinstalldirs) $(prefix)/util $(prefix)/util/lg
-  
-  install:
-! 	for file in CHANGES FAQ README cloginrc.sample ; do \
-  	    $(INSTALL_DATA) $$file $(prefix); \
-  	done
-  
diff --git a/net-mgmt/rancid/files/patch-bin::Makefile.in b/net-mgmt/rancid/files/patch-bin::Makefile.in
deleted file mode 100644
index 623a67fbfd79..000000000000
--- a/net-mgmt/rancid/files/patch-bin::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- bin/Makefile.in.orig	Fri Aug  9 23:59:06 2002
-+++ bin/Makefile.in	Mon Mar 17 15:46:42 2003
-@@ -375,13 +375,7 @@
- 	for prog in $(BIN_PROGS) ; do \
- 	    $(INSTALL) $$prog $(bindir); \
- 	done; \
--	if test -f $(bindir)/env ; then \
--	    echo "WARNING: *** $(bindir)/env exists: installing as env.new."; \
--	    echo "         *** review env.new for new/deprecated switches"; \
--	    $(INSTALL_DATA) env $(bindir)/env.new; \
--	else \
--	    $(INSTALL_DATA) env $(bindir); \
--	fi
-+	    $(INSTALL_DATA) env $(bindir)/env.dist
- # BIN_DATAS are empty at the moment.
- #       for prog in $(BIN_DATAS) ; do \
- #           $(INSTALL_DATA) $$prog $(PREFIX)/bin; \
diff --git a/net-mgmt/rancid/files/patch-bin::hpfilter.c b/net-mgmt/rancid/files/patch-bin::hpfilter.c
deleted file mode 100644
index fd749ebde788..000000000000
--- a/net-mgmt/rancid/files/patch-bin::hpfilter.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/hpfilter.c.orig	Wed Oct 15 15:52:48 2003
-+++ bin/hpfilter.c	Wed Oct 15 15:53:08 2003
-@@ -382,7 +382,7 @@
- usage(void)
- {
-     fprintf(stderr,
--"usage: %s [-hv] <telnet|ssh> <hostname>
-+"usage: %s [-hv] <telnet|ssh> <hostname>\n\
- ", progname);
-     return;
- }
-@@ -391,7 +391,7 @@
- vers(void)
- {
-     fprintf(stderr,
--"%s: %s version %s
-+"%s: %s version %s\n\
- ", progname, package, version);
-     return;
- }
diff --git a/net-mgmt/rancid/files/patch-etc::Makefile.am b/net-mgmt/rancid/files/patch-etc::Makefile.am
new file mode 100644
index 000000000000..e4805556c2c8
--- /dev/null
+++ b/net-mgmt/rancid/files/patch-etc::Makefile.am
@@ -0,0 +1,29 @@
+--- 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)
+ 
+ install-data-local: all
+-	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	fi; \
+-	if test -f $(sysconfdir)/lg.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	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/files/patch-etc::Makefile.in b/net-mgmt/rancid/files/patch-etc::Makefile.in
new file mode 100644
index 000000000000..1f78dfe1b6d5
--- /dev/null
+++ b/net-mgmt/rancid/files/patch-etc::Makefile.in
@@ -0,0 +1,29 @@
+--- 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 @@
+ 
+ 
+ install-data-local: all
+-	@if test -f $(sysconfdir)/rancid.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	fi; \
+-	if test -f $(sysconfdir)/lg.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	fi;
++	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/; \
++	    $(INSTALL_DATA) lg.conf.sample $(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/files/patch-util::Makefile.in b/net-mgmt/rancid/files/patch-util::Makefile.in
deleted file mode 100644
index 833b917fc36e..000000000000
--- a/net-mgmt/rancid/files/patch-util::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-*** util/Makefile.in.orig	Mon Jun  3 14:21:54 2002
---- util/Makefile.in	Mon Jun  3 14:23:55 2002
-***************
-*** 1,6 ****
-  PREFIX = @prefix@
-  
-! INSTALL = @INSTALL@
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  UTIL_PROGS = @RD_UTIL_PROGS@
---- 1,6 ----
-  PREFIX = @prefix@
-  
-! INSTALL = @INSTALL_SCRIPT@
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  UTIL_PROGS = @RD_UTIL_PROGS@
diff --git a/net-mgmt/rancid/files/patch-util::lg::Makefile.in b/net-mgmt/rancid/files/patch-util::lg::Makefile.in
deleted file mode 100644
index 54d62727828b..000000000000
--- a/net-mgmt/rancid/files/patch-util::lg::Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- util/lg/Makefile.in.orig	Fri Aug  9 23:59:06 2002
-+++ util//lg/Makefile.in	Mon Mar 17 15:48:24 2003
-@@ -1,6 +1,6 @@
- PREFIX = @prefix@
- 
--INSTALL = @INSTALL@
-+INSTALL = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
-@@ -13,13 +13,7 @@
- 	for file in $(UTIL_LG_PROGS) ; do \
- 	    $(INSTALL) $$file $(PREFIX)/util/lg; \
- 	done; \
--	if test -f $(PREFIX)/util/lg/lg.conf ; then \
--	    echo "WARNING: *** $(PREFIX)/util/lg/lg.conf exists: installing as lg.conf.new."; \
--	    echo "         *** review lg.conf.new for new/deprecated switches"; \
--	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.new; \
--	else \
--	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg; \
--	fi; \
-+	    $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.dist; \
- 	for file in *README* *.html; do \
- 	    $(INSTALL_DATA) $$file $(PREFIX)/util/lg; \
- 	done