From owner-freebsd-ports  Thu Oct 12 18: 8: 1 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from mail.hiwaay.net (fly.HiWAAY.net [208.147.154.56])
	by hub.freebsd.org (Postfix) with ESMTP id 3F67837B66C
	for <ports@FreeBSD.ORG>; Thu, 12 Oct 2000 18:07:59 -0700 (PDT)
Received: from bonsai.knology.net (user-24-214-88-8.knology.net [24.214.88.8])
	by mail.hiwaay.net (8.11.0/8.11.0) with ESMTP id e9D17u702338;
	Thu, 12 Oct 2000 20:07:56 -0500 (CDT)
Received: (from steve@localhost)
	by bonsai.knology.net (8.11.0/8.9.3) id e9D17iA92274;
	Thu, 12 Oct 2000 20:07:44 -0500 (CDT)
	(envelope-from steve)
Date: Thu, 12 Oct 2000 20:07:39 -0500
From: Steve Price <sprice@hiwaay.net>
To: "Brandon D. Valentine" <bandix@looksharp.net>
Cc: ports@FreeBSD.ORG
Subject: Re: make distclean error
Message-ID: <20001012200739.D81676@bonsai.knology.net>
References: <Pine.BSF.4.21.0010121918050.44476-100000@turtle.looksharp.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2i
In-Reply-To: <Pine.BSF.4.21.0010121918050.44476-100000@turtle.looksharp.net>; from bandix@looksharp.net on Thu, Oct 12, 2000 at 07:22:04PM -0400
X-Operating-System: FreeBSD 5.0-CURRENT i386
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

On Thu, Oct 12, 2000 at 07:22:04PM -0400, Brandon D. Valentine wrote:
# [Not on -ports, Cc: accordingly.]
# 
# After installing ports/editors/vim6, I ran make distclean and received
# the following:
# 
# reef# make distclean
# ===>  Cleaning for vim-6.0h
# ===>  Deleting distfiles for vim-6.0h
# rmdir: /usr/ports/distfiles/vim: Directory not empty
# *** Error code 1 (ignored)

Something like the following patch should work.  The second part
is probably not necessary but makes it consistent with the rest
of the similar targets.

-steve

Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.355
diff -u -r1.355 bsd.port.mk
--- bsd.port.mk	2000/10/08 11:43:54	1.355
+++ bsd.port.mk	2000/10/13 00:59:27
@@ -2284,7 +2284,7 @@
 		done; \
 	fi)
 .if defined(DIST_SUBDIR)
-	-@${RMDIR} ${_DISTDIR}  
+	-@${RMDIR} ${_DISTDIR} >/dev/null 2>&1 || ${TRUE}
 .endif
 .endif
 
@@ -2301,7 +2301,7 @@
 		done; \
 	fi
 .if defined(DIST_SUBDIR)
-	@${ECHO} "${RMDIR} ${_DISTDIR} 2>/dev/null"
+	@${ECHO} "${RMDIR} ${_DISTDIR} 2>/dev/null || ${TRUE}"
 .endif
 .endif
 


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