From 67b650d68bf17871790a1cb122c1991c888058af Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Wed, 7 May 2003 17:28:14 +0000 Subject: Unbork net/rancid. Fix PLIST error and be more conformant to config file naming. Revision bumped. PR: ports/50076 Submitted by: Janos Mohacsi Prodded by: Larry Rosenman --- net-mgmt/rancid/Makefile | 10 ++++------ net-mgmt/rancid/files/patch-bin::Makefile.in | 6 +++--- net-mgmt/rancid/files/patch-util::lg::Makefile.in | 5 +++-- net-mgmt/rancid/pkg-plist | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) (limited to 'net-mgmt/rancid') diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile index 346ced6a4e69..3ed851297999 100644 --- a/net-mgmt/rancid/Makefile +++ b/net-mgmt/rancid/Makefile @@ -7,15 +7,13 @@ PORTNAME= rancid PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Really Awesome New Cisco confIg Differ -BROKEN= "Bad pkg-plist" - BUILD_DEPENDS= expect:${PORTSDIR}/lang/expect RUN_DEPENDS= expect:${PORTSDIR}/lang/expect \ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ @@ -48,9 +46,9 @@ post-install: @ ${ECHO} .endif .for file in ${CONFIG_FILES} - @ if [ -f ${PREFIX}/rancid/${file}.new ] ; then \ - ${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.new"; \ - ${ECHO} " : *** review ${file} for new/deprecated switches"; \ + @ if [ -f ${PREFIX}/rancid/${file}.dist ] ; then \ + ${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.dist"; \ + ${ECHO} " : *** review ${file}.dist for new/deprecated switches or install in place ${file}"; \ fi .endfor diff --git a/net-mgmt/rancid/files/patch-bin::Makefile.in b/net-mgmt/rancid/files/patch-bin::Makefile.in index 33df59b9cf98..623a67fbfd79 100644 --- a/net-mgmt/rancid/files/patch-bin::Makefile.in +++ b/net-mgmt/rancid/files/patch-bin::Makefile.in @@ -1,5 +1,5 @@ ---- bin/Makefile.in.orig Thu Sep 26 10:46:33 2002 -+++ bin/Makefile.in Thu Sep 26 10:47:14 2002 +--- 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); \ @@ -11,7 +11,7 @@ - else \ - $(INSTALL_DATA) env $(bindir); \ - fi -+ $(INSTALL_DATA) env $(bindir)/env.new ++ $(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-util::lg::Makefile.in b/net-mgmt/rancid/files/patch-util::lg::Makefile.in index 45406eaf77f7..54d62727828b 100644 --- a/net-mgmt/rancid/files/patch-util::lg::Makefile.in +++ b/net-mgmt/rancid/files/patch-util::lg::Makefile.in @@ -1,5 +1,5 @@ --- util/lg/Makefile.in.orig Fri Aug 9 23:59:06 2002 -+++ util/lg/Makefile.in Thu Sep 26 10:54:50 2002 ++++ util//lg/Makefile.in Mon Mar 17 15:48:24 2003 @@ -1,6 +1,6 @@ PREFIX = @prefix@ @@ -15,10 +15,11 @@ - 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; \ +- $(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 diff --git a/net-mgmt/rancid/pkg-plist b/net-mgmt/rancid/pkg-plist index cbb157e70210..bde32fcd160e 100644 --- a/net-mgmt/rancid/pkg-plist +++ b/net-mgmt/rancid/pkg-plist @@ -1,6 +1,6 @@ rancid/util/lg/lg.cgi rancid/util/lg/lgform.cgi -rancid/util/lg/lg.conf +rancid/util/lg/lg.conf.dist rancid/util/lg/README rancid/util/lg/index.html rancid/util/lg/lgnotes.html @@ -37,7 +37,7 @@ rancid/bin/rancid rancid/bin/rename rancid/bin/rrancid rancid/bin/xrancid -rancid/bin/env +rancid/bin/env.dist rancid/CHANGES rancid/README rancid/FAQ -- cgit v1.2.3