Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Mar 2003 16:04:21 +0100 (CET)
From:      Janos Mohacsi <mohacsi@niif.hu>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Kris Kennaway <kris@obsecurity.org>
Subject:   ports/50076: Maintainer Update: Rancid 2.2.2 portrevision 2
Message-ID:  <200303171504.h2HF4LAt023213@norfolk.ki.iif.hu>

next in thread | raw e-mail | index | archive | help

>Number:         50076
>Category:       ports
>Synopsis:       Maintainer Update: Rancid 2.2.2 portrevision 2
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 17 07:10:12 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Janos Mohacsi
>Release:        FreeBSD 4.8-PRERELEASE i386
>Organization:
NIIF
>Environment:
System: FreeBSD norfolk.ki.iif.hu 4.8-PRERELEASE FreeBSD 4.8-PRERELEASE #0: Wed Feb 26 09:52:28 CET 2003 root@norfolk.ki.iif.hu:/usr/obj/usr/src/sys/NORFOLK i386

>Description:

New revision of Rancid tool version 2.2.2.  It fixes PLIST error that
caused problem on bento package building. It also tries to be more conformant 
to FreeBSD config file naming. Revision bumped, since PLIST has changed.

>How-To-Repeat:

Apply this diff.

>Fix:

diff -ruN rancid.bak/Makefile rancid/Makefile
--- rancid.bak/Makefile	Mon Feb 24 13:14:00 2003
+++ rancid/Makefile	Mon Mar 17 15:51:01 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	rancid
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 
@@ -46,9 +46,9 @@
 	@ ${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 -ruN rancid.bak/files/patch-bin::Makefile.in rancid/files/patch-bin::Makefile.in
--- rancid.bak/files/patch-bin::Makefile.in	Sat Nov  9 03:19:36 2002
+++ rancid/files/patch-bin::Makefile.in	Mon Mar 17 15:47:46 2003
@@ -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 -ruN rancid.bak/files/patch-util::lg::Makefile.in rancid/files/patch-util::lg::Makefile.in
--- rancid.bak/files/patch-util::lg::Makefile.in	Mon Nov 11 17:42:54 2002
+++ rancid/files/patch-util::lg::Makefile.in	Mon Mar 17 15:49:56 2003
@@ -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 -ruN rancid.bak/pkg-plist rancid/pkg-plist
--- rancid.bak/pkg-plist	Mon Oct 28 09:16:36 2002
+++ rancid/pkg-plist	Mon Mar 17 15:52:13 2003
@@ -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/rename
 rancid/bin/rrancid
 rancid/bin/xrancid
-rancid/bin/env
+rancid/bin/env.dist
 rancid/CHANGES
 rancid/README
 rancid/FAQ


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303171504.h2HF4LAt023213>