From owner-svn-ports-all@FreeBSD.ORG  Fri Jul 26 05:37:42 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5BFF649A;
 Fri, 26 Jul 2013 05:37:42 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 497D62552;
 Fri, 26 Jul 2013 05:37:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6Q5bg5e094121;
 Fri, 26 Jul 2013 05:37:42 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6Q5bgRF094120;
 Fri, 26 Jul 2013 05:37:42 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201307260537.r6Q5bgRF094120@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Fri, 26 Jul 2013 05:37:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323681 - head/devel/openvex
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jul 2013 05:37:42 -0000

Author: danfe
Date: Fri Jul 26 05:37:41 2013
New Revision: 323681
URL: http://svnweb.freebsd.org/changeset/ports/323681

Log:
  Fix parallel builds by sanitizing inner Makefiles and removing possible race
  due to having two targets in ALL_TARGET.  Instead, do the cleaning after the
  build.
  
  Reported by:	pointyhat-west

Modified:
  head/devel/openvex/Makefile

Modified: head/devel/openvex/Makefile
==============================================================================
--- head/devel/openvex/Makefile	Fri Jul 26 05:33:51 2013	(r323680)
+++ head/devel/openvex/Makefile	Fri Jul 26 05:37:41 2013	(r323681)
@@ -18,8 +18,22 @@ RUN_DEPENDS=	vexctl:${PORTSDIR}/devel/ro
 		sdcc:${PORTSDIR}/lang/sdcc \
 		gpasm:${PORTSDIR}/devel/gputils
 
+REINPLACE_ARGS=	-i ""
+
 MAN1=		openvex.1 openvex-new-project.1
 
-ALL_TARGET=	all clean
+post-patch:
+# Use make's -C option to descent into directories and fix parallel builds
+	@${REINPLACE_CMD} -e 's/^all:/& depend/ ; s/ make depend &&//' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -E 's/cd (.+)(;| &&) make/$$(MAKE) -C \1/' \
+		${WRKSRC}/Advanced/Makefile ${WRKSRC}/Beginner/Makefile \
+		${WRKSRC}/HiBob/Makefile ${WRKSRC}/Makefile
+# Apparently the work around for bug in pic18f8520.h is no longer needed and
+# breaks the build now; disable it for the time being
+	@${REINPLACE_CMD} -e 's/ifdef SDCC/if 0/' ${WRKSRC}/Lib/timer.h
+
+post-build:
+	$(MAKE) -C $(WRKSRC) clean
 
 .include <bsd.port.mk>