From owner-svn-ports-head@freebsd.org Sat Nov 14 16:26:23 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCBB8A2F22A; Sat, 14 Nov 2015 16:26:23 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8D1B9161E; Sat, 14 Nov 2015 16:26:23 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAEGQMJx068218; Sat, 14 Nov 2015 16:26:22 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAEGQMgV068217; Sat, 14 Nov 2015 16:26:22 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201511141626.tAEGQMgV068217@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 14 Nov 2015 16:26:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401578 - head/lang/dmd2/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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2015 16:26:24 -0000 Author: cy Date: Sat Nov 14 16:26:22 2015 New Revision: 401578 URL: https://svnweb.freebsd.org/changeset/ports/401578 Log: Fix build. Modified: head/lang/dmd2/files/patch-src__dmd__posix.mak Modified: head/lang/dmd2/files/patch-src__dmd__posix.mak ============================================================================== --- head/lang/dmd2/files/patch-src__dmd__posix.mak Sat Nov 14 16:00:03 2015 (r401577) +++ head/lang/dmd2/files/patch-src__dmd__posix.mak Sat Nov 14 16:26:22 2015 (r401578) @@ -1,11 +1,68 @@ ---- ../../src/dmd/posix.mak.orig 2014-08-17 22:37:03.394883855 -0700 -+++ ../../src/dmd/posix.mak 2014-08-17 22:37:43.775123006 -0700 -@@ -373,7 +373,7 @@ +--- ../../src/dmd/posix.mak.orig 2015-11-11 02:36:12.000000000 -0800 ++++ ../../src/dmd/posix.mak 2015-11-14 08:20:14.138530978 -0800 +@@ -31,9 +31,9 @@ + endif + + #ifeq (osx,$(OS)) +-# HOST_CC=clang++ ++# HOST_CC=clanc++ + #else +- HOST_CC=g++ ++ HOST_CC=c++ + #endif + CC=$(HOST_CC) + AR=ar +@@ -92,7 +92,7 @@ + -Wno-unused-value \ + -Wno-unused-variable + # GCC Specific +-ifeq ($(HOST_CC), g++) ++ifeq ($(HOST_CC), c++) + WARNINGS := $(WARNINGS) \ + -Wno-logical-op \ + -Wno-narrowing \ +@@ -100,7 +100,7 @@ + -Wno-uninitialized + endif + # Clang Specific +-ifeq ($(HOST_CC), clang++) ++ifeq ($(HOST_CC), clanc++) + WARNINGS := $(WARNINGS) \ + -Wno-tautological-constant-out-of-range-compare \ + -Wno-tautological-compare \ +@@ -112,7 +112,7 @@ + # Default Warnings + WARNINGS := -Wno-deprecated -Wstrict-aliasing + # Clang Specific +-ifeq ($(HOST_CC), clang++) ++ifeq ($(HOST_CC), clanc++) + WARNINGS := $(WARNINGS) \ + -Wno-logical-op-parentheses \ + -Wno-dynamic-class-memaccess \ +@@ -130,7 +130,7 @@ + -D__pascal= -DMARS=1 -DTARGET_$(OS_UPCASE)=1 -DDM_TARGET_CPU_$(TARGET_CPU)=1 \ + $(MODEL_FLAG) + # GCC Specific +-ifeq ($(HOST_CC), g++) ++ifeq ($(HOST_CC), c++) + CFLAGS := $(CFLAGS) \ + -std=gnu++98 + endif +@@ -312,7 +312,7 @@ + + ifneq (,$(AUTO_BOOTSTRAP)) + $(HOST_DMD_PATH): +- mkdir -p ${HOST_DMD_ROOT} ++ # mkdir -p ${HOST_DMD_ROOT} + TMPFILE=$$(mktemp deleteme.XXXXXXXX) && curl -fsSL ${HOST_DMD_URL} > $${TMPFILE}.zip && \ + unzip -qd ${HOST_DMD_ROOT} $${TMPFILE}.zip && rm $${TMPFILE}.zip + endif +@@ -423,7 +423,7 @@ $(eval bin_dir=$(if $(filter $(OS),osx), bin, bin$(MODEL))) mkdir -p $(INSTALL_DIR)/$(OS)/$(bin_dir) cp dmd $(INSTALL_DIR)/$(OS)/$(bin_dir)/dmd - cp ../ini/$(OS)/$(bin_dir)/dmd.conf $(INSTALL_DIR)/$(OS)/$(bin_dir)/dmd.conf + cp ../../$(OS)/$(bin_dir)/dmd.conf $(INSTALL_DIR)/$(OS)/$(bin_dir)/dmd.conf cp backendlicense.txt $(INSTALL_DIR)/dmd-backendlicense.txt - cp artistic.txt $(INSTALL_DIR)/dmd-artistic.txt + cp boostlicense.txt $(INSTALL_DIR)/dmd-boostlicense.txt