From owner-svn-ports-head@FreeBSD.ORG  Sun Jan 19 13:45:40 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 81B4A77C;
 Sun, 19 Jan 2014 13:45:40 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5523D1E39;
 Sun, 19 Jan 2014 13:45:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0JDjeaI027653;
 Sun, 19 Jan 2014 13:45:40 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0JDjdEa027651;
 Sun, 19 Jan 2014 13:45:39 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201401191345.s0JDjdEa027651@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sun, 19 Jan 2014 13:45:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340290 - in head/emulators/cpmemu: . 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jan 2014 13:45:40 -0000

Author: miwi
Date: Sun Jan 19 13:45:39 2014
New Revision: 340290
URL: http://svnweb.freebsd.org/changeset/ports/340290
QAT: https://qat.redports.org/buildarchive/r340290/

Log:
  - Fix build with clang
  
  PR:		185322
  Submitted by:	ports fury

Modified:
  head/emulators/cpmemu/Makefile   (contents, props changed)
  head/emulators/cpmemu/files/patch-ab   (contents, props changed)

Modified: head/emulators/cpmemu/Makefile
==============================================================================
--- head/emulators/cpmemu/Makefile	Sun Jan 19 13:44:36 2014	(r340289)
+++ head/emulators/cpmemu/Makefile	Sun Jan 19 13:45:39 2014	(r340290)
@@ -18,5 +18,13 @@ COMMENT=	Cpm emulator
 
 ONLY_FOR_ARCHS=	i386
 
-NO_STAGE=	yes
-.include <bsd.port.mk>
+USES=		compiler
+
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == "clang"
+USE_BINUTILS=	yes
+CPPFLAGS+=	-no-integrated-as
+.endif
+
+.include <bsd.port.post.mk>

Modified: head/emulators/cpmemu/files/patch-ab
==============================================================================
--- head/emulators/cpmemu/files/patch-ab	Sun Jan 19 13:44:36 2014	(r340289)
+++ head/emulators/cpmemu/files/patch-ab	Sun Jan 19 13:45:39 2014	(r340290)
@@ -21,14 +21,14 @@
 +CC ?= gcc
  
 -CFLAGS = -O2 -pipe -ansi -Wall \
-+CFLAGS += -ansi -Wall \
++CFLAGS += $(CPPFLAGS) -ansi -Wall \
  	-Wshadow -Wpointer-arith -Wcast-qual -Wcast-align \
  	-Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \
  	-Wnested-externs -Wwrite-strings \
  	-DCPMLIBDIR=\"$(CPMLIBDIR)\"
  
 -LDFLAGS = -s
-+LDFLAGS += -s
++#LDFLAGS = -s
  
  OBJS = single.o z80emu.o em.o io.o bios.o \
  	commands.o running.o main.o disneu.o disz80.o low.o
@@ -44,9 +44,10 @@
  
  install: all
 -	install -m 511 cpm $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} cpm $(BINDIR)/cpmemu
-+	${BSD_INSTALL_PROGRAM} format $(BINDIR)/cpmformat
- 	-mkdir $(CPMLIBDIR)
+-	-mkdir $(CPMLIBDIR)
 -	chmod 755 $(CPMLIBDIR)
 -	install -m 444 z80-binaries/* $(CPMLIBDIR)
-+	${BSD_INSTALL_DATA} z80-binaries/* $(CPMLIBDIR)
++	${BSD_INSTALL_PROGRAM} cpm $(DESTDIR)$(BINDIR)/cpmemu
++	${BSD_INSTALL_PROGRAM} format $(DESTDIR)$(BINDIR)/cpmformat
++	-mkdir $(DESTDIR)$(CPMLIBDIR)
++	${BSD_INSTALL_DATA} z80-binaries/* $(DESTDIR)$(CPMLIBDIR)