From owner-freebsd-ports Sun Nov 24 9:40:10 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 7A6AC37B401 for ; Sun, 24 Nov 2002 09:40:07 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDA3643EC2 for ; Sun, 24 Nov 2002 09:40:01 -0800 (PST) (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 gAOHe1x3051831 for ; Sun, 24 Nov 2002 09:40:01 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gAOHe1uB051830; Sun, 24 Nov 2002 09:40:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1AB237B401 for ; Sun, 24 Nov 2002 09:34:49 -0800 (PST) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3757043E3B for ; Sun, 24 Nov 2002 09:34:48 -0800 (PST) (envelope-from root@cultdeadsheep.org) Received: (qmail 20250 invoked by uid 0); 24 Nov 2002 17:34:44 -0000 Message-Id: <20021124173444.20249.qmail@cultdeadsheep.org> Date: 24 Nov 2002 17:34:44 -0000 From: Clement Laforet Reply-To: Clement Laforet To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/45683: [bento-fix]/[install-fix] : misc/cave 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: 45683 >Category: ports >Synopsis: [bento-fix]/[install-fix] : misc/cave >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 24 09:40:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 4.6-STABLE i386 >Organization: cotds.org >Environment: System: FreeBSD goofy.cultdeadsheep.org 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Jul 4 10:05:12 CEST 2002 root@goofy.cultdeadsheep.org:/usr/obj/usr/src/sys/GOOFY i386 >Description: Fix installation problems for misc/cave >How-To-Repeat: N/A. >Fix: --- cave.diff begins here --- diff -Nru cave.old/Makefile cave/Makefile --- cave.old/Makefile Sun Nov 24 18:15:14 2002 +++ cave/Makefile Sun Nov 24 18:04:00 2002 @@ -17,7 +17,6 @@ GNU_CONFIGURE= yes -MANCOMPRESSED= yes MAN1= cave.1 pre-build: diff -Nru cave.old/files/patch-doc-Makefile.in cave/files/patch-doc-Makefile.in --- cave.old/files/patch-doc-Makefile.in Sun Nov 24 18:15:14 2002 +++ cave/files/patch-doc-Makefile.in Sun Nov 24 18:29:31 2002 @@ -1,5 +1,5 @@ ---- doc/Makefile.in.orig Sat Oct 26 09:26:04 2002 -+++ doc/Makefile.in Wed Nov 6 09:41:34 2002 +--- doc/Makefile.in.orig Sat Oct 26 13:26:04 2002 ++++ doc/Makefile.in Sun Nov 24 17:29:26 2002 @@ -114,7 +114,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ @@ -9,3 +9,21 @@ subdir = doc mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h +@@ -155,7 +155,7 @@ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ++ inst=`echo $$inst.$$ext`; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done +@@ -172,7 +172,7 @@ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ++ inst=`echo $$inst`; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done diff -Nru cave.old/files/patch-src-Makefile.in cave/files/patch-src-Makefile.in --- cave.old/files/patch-src-Makefile.in Thu Jan 1 01:00:00 1970 +++ cave/files/patch-src-Makefile.in Sun Nov 24 18:03:09 2002 @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig Sun Nov 24 18:02:04 2002 ++++ src/Makefile.in Sun Nov 24 18:02:33 2002 +@@ -163,7 +163,7 @@ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ++ f=`echo "$$p1"`; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ + else :; fi; \ --- cave.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message