From owner-svn-src-all@FreeBSD.ORG  Fri Oct  7 23:43:51 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D5F891065670;
	Fri,  7 Oct 2011 23:43:51 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C6AA38FC17;
	Fri,  7 Oct 2011 23:43:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p97NhpEW032808;
	Fri, 7 Oct 2011 23:43:51 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p97NhpFK032806;
	Fri, 7 Oct 2011 23:43:51 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <201110072343.p97NhpFK032806@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Fri, 7 Oct 2011 23:43:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226122 - head/share/mk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Oct 2011 23:43:51 -0000

Author: stas
Date: Fri Oct  7 23:43:51 2011
New Revision: 226122
URL: http://svn.freebsd.org/changeset/base/226122

Log:
  - ${WRKSRC} might be missing when the autotools fixup is running.
    Account for this.
  
  Reported by:	Mykola Dzham <i@levsha.me>

Modified:
  head/share/mk/bsd.port.mk

Modified: head/share/mk/bsd.port.mk
==============================================================================
--- head/share/mk/bsd.port.mk	Fri Oct  7 23:12:33 2011	(r226121)
+++ head/share/mk/bsd.port.mk	Fri Oct  7 23:43:51 2011	(r226122)
@@ -18,10 +18,10 @@ _WITHOUT_SRCCONF=
 .if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK)
 # Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x.
 run-autotools-fixup:
-	find ${WRKSRC} -type f \( -name config.libpath -o \
+	test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \
 		-name config.rpath -o -name configure -o -name libtool.m4 \) \
 		-exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \
-		-e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} +
+		-e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + || /usr/bin/true
 
 .ORDER: run-autotools run-autotools-fixup do-configure
 do-configure: run-autotools-fixup