From owner-svn-ports-all@FreeBSD.ORG  Sun Jan 25 11:45:46 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3BB45AB1;
 Sun, 25 Jan 2015 11:45:46 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2781EB06;
 Sun, 25 Jan 2015 11:45:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0PBjkhC020383;
 Sun, 25 Jan 2015 11:45:46 GMT (envelope-from rodrigo@FreeBSD.org)
Received: (from rodrigo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0PBjklZ020382;
 Sun, 25 Jan 2015 11:45:46 GMT (envelope-from rodrigo@FreeBSD.org)
Message-Id: <201501251145.t0PBjklZ020382@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rodrigo set sender to
 rodrigo@FreeBSD.org using -f
From: Rodrigo Osorio <rodrigo@FreeBSD.org>
Date: Sun, 25 Jan 2015 11:45:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377883 - head/sysutils/memtest86+/files
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.18-1
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: Sun, 25 Jan 2015 11:45:46 -0000

Author: rodrigo
Date: Sun Jan 25 11:45:45 2015
New Revision: 377883
URL: https://svnweb.freebsd.org/changeset/ports/377883
QAT: https://qat.redports.org/buildarchive/r377883/

Log:
  Fix build when ISO option is selected.
  
  PR:		188149
  Submitted by:	Lawrence Chen <beastie@tardisi.com>

Modified:
  head/sysutils/memtest86+/files/patch-Makefile

Modified: head/sysutils/memtest86+/files/patch-Makefile
==============================================================================
--- head/sysutils/memtest86+/files/patch-Makefile	Sun Jan 25 11:44:08 2015	(r377882)
+++ head/sysutils/memtest86+/files/patch-Makefile	Sun Jan 25 11:45:45 2015	(r377883)
@@ -1,6 +1,6 @@
---- Makefile	2008-11-16 02:30:50.000000000 +0200
-+++ Makefile	2009-02-18 09:03:07.000000000 +0200
-@@ -23,15 +23,15 @@ all: memtest.bin memtest
+--- Makefile.orig	2015-01-19 13:24:01.512893165 +0000
++++ Makefile	2015-01-19 13:24:23.844906601 +0000
+@@ -23,15 +23,15 @@
  # symbols and then link it dynamically so I have full
  # relocation information
  memtest_shared: $(OBJS) memtest_shared.lds Makefile
@@ -19,9 +19,13 @@
  
  head.s: head.S config.h defs.h test.h
  	$(CC) -E -traditional $< -o $@
-@@ -58,7 +58,6 @@ clean:
- iso:
- 	make all
+@@ -58,10 +58,8 @@
+ asm:
+ 	@./makedos.sh
+ 
+-iso:
+-	make all
++iso: all
  	./makeiso.sh
 -	rm -f *.o *.s memtest.bin memtest memtest_shared memtest_shared.bin