From owner-freebsd-ports Thu Sep 26 2:50: 7 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A65737B401 for ; Thu, 26 Sep 2002 02:50:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDC8743E77 for ; Thu, 26 Sep 2002 02:50:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8Q9o3Co072539 for ; Thu, 26 Sep 2002 02:50:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8Q9o30Q072538; Thu, 26 Sep 2002 02:50:03 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED7BF37B401 for ; Thu, 26 Sep 2002 02:43:57 -0700 (PDT) Received: from nws.iif.hu (nws.iif.hu [193.225.12.103]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4379C43E4A for ; Thu, 26 Sep 2002 02:43:57 -0700 (PDT) (envelope-from mohacsi@nws.iif.hu) Received: (from root@localhost) by nws.iif.hu (8.12.6/8.12.5) id g8Q9DqYM024099; Thu, 26 Sep 2002 11:13:52 +0200 (CEST) (envelope-from mohacsi) Message-Id: <200209260913.g8Q9DqYM024099@nws.iif.hu> Date: Thu, 26 Sep 2002 11:13:52 +0200 (CEST) From: mohacsi@niif.hu Reply-To: janos.mohacsi@bsd.hu To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/43385: Maintaner update: Rancid 2.2.2 - resolve failed build on FreeBSD5 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 43385 >Category: ports >Synopsis: Maintaner update: Rancid 2.2.2 - resolve failed build on FreeBSD5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Sep 26 02:50:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Janos Mohacsi >Release: FreeBSD 4.7-RC i386 >Organization: >Environment: System: FreeBSD nws.iif.hu 4.7-RC FreeBSD 4.7-RC #1: Fri Sep 20 08:56:56 CEST 2002 root@nws.iif.hu:/usr/src/sys/compile/NWS i386 >Description: There was a package building error in rancid 2.2.2: ===> Building package for rancid-2.2.2 tar: rancid/util/lg/lg.conf.new: Cannot stat: No such file or directory tar: rancid/bin/env.new: Cannot stat: No such file or directory tar: Error exit delayed from previous errors This patch is fixing this error and installing sample config files correctly. >How-To-Repeat: Apply this patch. >Fix: diff -ruN rancid.bak/Makefile rancid/Makefile --- rancid.bak/Makefile Thu Sep 19 14:15:15 2002 +++ rancid/Makefile Thu Sep 26 11:01:14 2002 @@ -7,6 +7,7 @@ PORTNAME= rancid PORTVERSION= 2.2.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ diff -ruN rancid.bak/files/patch-bin::Makefile.in rancid/files/patch-bin::Makefile.in --- rancid.bak/files/patch-bin::Makefile.in Thu Jan 1 01:00:00 1970 +++ rancid/files/patch-bin::Makefile.in Thu Sep 26 10:53:31 2002 @@ -0,0 +1,17 @@ +--- bin/Makefile.in.orig Thu Sep 26 10:46:33 2002 ++++ bin/Makefile.in Thu Sep 26 10:47:14 2002 +@@ -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.new + # 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 Sun Jun 23 10:17:32 2002 +++ rancid/files/patch-util::lg::Makefile.in Thu Sep 26 10:56:01 2002 @@ -1,17 +1,24 @@ -*** util/lg/Makefile.in.orig Mon Jun 3 14:14:33 2002 ---- util/lg/Makefile.in Mon Jun 3 14:14:51 2002 -*************** -*** 1,6 **** - PREFIX = @prefix@ - -! INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - - UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@ ---- 1,6 ---- - PREFIX = @prefix@ - -! INSTALL = @INSTALL_SCRIPT@ - INSTALL_DATA = @INSTALL_DATA@ - - UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@ +--- util/lg/Makefile.in.orig Fri Aug 9 23:59:06 2002 ++++ util/lg/Makefile.in Thu Sep 26 10:54:50 2002 +@@ -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; \ + for file in *README* *.html; do \ + $(INSTALL_DATA) $$file $(PREFIX)/util/lg; \ + done >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message