From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 20 13:40:18 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2771C16A4CE for ; Sat, 20 Mar 2004 13:40:18 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AB9B43D2F for ; Sat, 20 Mar 2004 13:40:18 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i2KLeHbv080172 for ; Sat, 20 Mar 2004 13:40:17 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i2KLeHme080171; Sat, 20 Mar 2004 13:40:17 -0800 (PST) (envelope-from gnats) Resent-Date: Sat, 20 Mar 2004 13:40:17 -0800 (PST) Resent-Message-Id: <200403202140.i2KLeHme080171@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joe Marcus Clarke Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C696C16A4CE for ; Sat, 20 Mar 2004 13:38:56 -0800 (PST) Received: from shumai.marcuscom.com (rrcs-midsouth-24-172-16-118.biz.rr.com [24.172.16.118]) by mx1.FreeBSD.org (Postfix) with ESMTP id 318E643D2D for ; Sat, 20 Mar 2004 13:38:56 -0800 (PST) (envelope-from marcus@shumai.marcuscom.com) Received: from shumai.marcuscom.com (localhost.marcuscom.com [127.0.0.1]) i2KLd2eL080776 for ; Sat, 20 Mar 2004 16:39:02 -0500 (EST) (envelope-from marcus@shumai.marcuscom.com) Received: (from marcus@localhost) by shumai.marcuscom.com (8.12.11/8.12.11/Submit) id i2KLd24I080775; Sat, 20 Mar 2004 16:39:02 -0500 (EST) (envelope-from marcus) Message-Id: <200403202139.i2KLd24I080775@shumai.marcuscom.com> Date: Sat, 20 Mar 2004 16:39:02 -0500 (EST) From: Joe Marcus Clarke To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/64519: [PATCH] Check to see if NONEXISTENT exists, and error out if it does X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Joe Marcus Clarke List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 21:40:18 -0000 >Number: 64519 >Category: ports >Synopsis: [PATCH] Check to see if NONEXISTENT exists, and error out if it does >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Mar 20 13:40:17 PST 2004 >Closed-Date: >Last-Modified: >Originator: Joe Marcus Clarke >Release: FreeBSD 4.9-STABLE i386 >Organization: MarcusCom, Inc. >Environment: System: FreeBSD shumai.marcuscom.com 4.9-STABLE FreeBSD 4.9-STABLE #41: Fri Mar 19 01:53:37 EST 2004 marcus@shumai.marcuscom.com:/usr/obj/usr/src/sys/SHUMAI i386 >Description: Certain ports require a dependency to be extracted/compiled everytime. To do this, they check for a bug dependency file (usually /nonexistent). If this bogus file/directory actually exists, however, the port build will fail. The attached patch corrects that by checkig for ${NONEXISTENT}, and erroring out if it exists. >How-To-Repeat: # touch -f /nonexistent # cd /usr/ports/mail/mutt # make -DWITH_MUTT_XFACE >Fix: With this patch, the above procedure will produce: ===> Extracting for mutt-1.4.2.1 >Release-Note: >Audit-Trail: >Unformatted: >> Checksum OK for mutt/mutt-1.4.2.1i.tar.gz. >> Checksum OK for mutt/patch-1.4.2.1.rr.compressed.gz. >> Checksum OK for mutt/patch-1.4.2.1.vvv.initials.gz. ===> Patching for mutt-1.4.2.1 Error: /nonexistent exists. Please remove it, and restart the build. *** Error code 1 Stop in /usr/ports/mail/mutt. --- bsd.port.mk.diff begins here --- --- bsd.port.mk.orig Sat Mar 20 16:29:57 2004 +++ bsd.port.mk Sat Mar 20 16:29:48 2004 @@ -4347,12 +4347,17 @@ fi; \ if ${EXPR} "$$prog" : \\/ >/dev/null; then \ if [ -e "$$prog" ]; then \ - ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - found"; \ - if [ ${_DEPEND_ALWAYS} = 1 ]; then \ - ${ECHO_MSG} " (but building it anyway)"; \ - notfound=1; \ + if [ "$$prog" = "${NONEXISTENT}" ]; then \ + ${ECHO_MSG} "Error: ${NONEXISTENT} exists. Please remove it, and restart the build."; \ + ${FALSE}; \ else \ - notfound=0; \ + ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - found"; \ + if [ ${_DEPEND_ALWAYS} = 1 ]; then \ + ${ECHO_MSG} " (but building it anyway)"; \ + notfound=1; \ + else \ + notfound=0; \ + fi; \ fi; \ else \ ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - not found"; \ --- bsd.port.mk.diff ends here ---