Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1504996858232980"
MIME-Version: 1.0
Date: Sat, 9 Sep 2017 22:40:58 +0000
From: "David A. Holland" <dholland@netbsd.org>
Subject: CVS commit: pkgsrc/emulators/mame
To: pkgsrc-changes@NetBSD.org
Reply-To: dholland@netbsd.org
Message-Id: <20170909224058.58911FA98@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1504996858232980
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	dholland
Date:		Sat Sep  9 22:40:58 UTC 2017

Modified Files:
	pkgsrc/emulators/mame: distinfo
	pkgsrc/emulators/mame/patches: patch-makefile

Log Message:
Add missing makefile rules for building with clang on NetBSD and FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/emulators/mame/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/emulators/mame/patches/patch-makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1504996858232980
Content-Disposition: inline
Content-Length: 4359
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/emulators/mame/distinfo
diff -u pkgsrc/emulators/mame/distinfo:1.64 pkgsrc/emulators/mame/distinfo:1.65
--- pkgsrc/emulators/mame/distinfo:1.64	Wed Apr 19 21:10:11 2017
+++ pkgsrc/emulators/mame/distinfo	Sat Sep  9 22:40:58 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2017/04/19 21:10:11 wiz Exp $
+$NetBSD: distinfo,v 1.65 2017/09/09 22:40:58 dholland Exp $
 
 SHA1 (mame-0.184.tar.gz) = bdda96458baff451511fbecb204b863af52b34da
 RMD160 (mame-0.184.tar.gz) = 3cca0ab3d7869da50c76730d1b07945e941739a7
@@ -6,5 +6,5 @@ SHA512 (mame-0.184.tar.gz) = a638ec2bf70
 Size (mame-0.184.tar.gz) = 121328139 bytes
 SHA1 (patch-3rdparty_asio_include_asio_detail_config.hpp) = 9b0d6139e853d8efb9d51270bbfa5382feac42a7
 SHA1 (patch-3rdparty_bgfx_examples_common_font_font__manager.cpp) = e39b2dff553505531adb5f0a31b0a22306b8e2e4
-SHA1 (patch-makefile) = c56dac362b89025d83078dbd1e3ae0a09df46a00
+SHA1 (patch-makefile) = c1766b434ea5d5e57179d9d9616eaa66af77206e
 SHA1 (patch-scripts_genie.lua) = 91940dbcf30e0abd25167a79b53deb43a18daf86

Index: pkgsrc/emulators/mame/patches/patch-makefile
diff -u pkgsrc/emulators/mame/patches/patch-makefile:1.19 pkgsrc/emulators/mame/patches/patch-makefile:1.20
--- pkgsrc/emulators/mame/patches/patch-makefile:1.19	Wed Jan  4 23:05:12 2017
+++ pkgsrc/emulators/mame/patches/patch-makefile	Sat Sep  9 22:40:58 2017
@@ -1,10 +1,11 @@
-$NetBSD: patch-makefile,v 1.19 2017/01/04 23:05:12 wiz Exp $
+$NetBSD: patch-makefile,v 1.20 2017/09/09 22:40:58 dholland Exp $
 
 Treat all BSDs the same.
+Add missing rules for building with clang on FreeBSD and NetBSD.
 
---- makefile.orig	2016-10-25 23:47:23.000000000 +0000
+--- makefile.orig	2017-03-29 03:12:20.000000000 +0000
 +++ makefile
-@@ -177,19 +177,19 @@ GENIEOS := solaris
+@@ -180,19 +180,19 @@ GENIEOS := solaris
  endif
  ifeq ($(firstword $(filter FreeBSD,$(UNAME))),FreeBSD)
  OS := freebsd
@@ -28,3 +29,51 @@ Treat all BSDs the same.
  endif
  ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
  OS := macosx
+@@ -1357,6 +1357,23 @@ freebsd_x86: generate $(PROJECTDIR)/$(MA
+ 	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd config=$(CONFIG)32
+ 
+ #-------------------------------------------------
++# gmake-freebsd-clang
++#-------------------------------------------------
++
++$(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
++	$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=freebsd-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
++
++.PHONY: freebsd_x64_clang
++freebsd_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile
++	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64 precompile
++	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64
++
++.PHONY: freebsd_x86_clang
++freebsd_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile
++	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)32 precompile
++	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)32
++
++#-------------------------------------------------
+ # gmake-netbsd
+ #-------------------------------------------------
+ 
+@@ -1377,6 +1394,23 @@ netbsd_x86: generate $(PROJECTDIR)/$(MAK
+ 	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-netbsd config=$(CONFIG)32
+ 
+ #-------------------------------------------------
++# gmake-netbsd-clang
++#-------------------------------------------------
++
++$(PROJECTDIR)/$(MAKETYPE)-netbsd-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
++	$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=netbsd-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
++
++.PHONY: netbsd_x64_clang
++netbsd_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-netbsd-clang/Makefile
++	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-netbsd-clang config=$(CONFIG)64 precompile
++	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-netbsd-clang config=$(CONFIG)64
++
++.PHONY: netbsd_x86_clang
++netbsd_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-netbsd-clang/Makefile
++	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-netbsd-clang config=$(CONFIG)32 precompile
++	$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-netbsd-clang config=$(CONFIG)32
++
++#-------------------------------------------------
+ # gmake-openbsd
+ #-------------------------------------------------
+ 


--_----------=_1504996858232980--