From owner-svn-ports-head@FreeBSD.ORG Sat Sep 28 05:50:52 2013 Return-Path: Delivered-To: svn-ports-head@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 DC00ED59; Sat, 28 Sep 2013 05:50:52 +0000 (UTC) (envelope-from cy@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 C8B8824D9; Sat, 28 Sep 2013 05:50:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8S5oqHt036469; Sat, 28 Sep 2013 05:50:52 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8S5oqru036465; Sat, 28 Sep 2013 05:50:52 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201309280550.r8S5oqru036465@svn.freebsd.org> From: Cy Schubert Date: Sat, 28 Sep 2013 05:50:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328549 - in head/lang: dmd/files 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.14 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, 28 Sep 2013 05:50:52 -0000 Author: cy Date: Sat Sep 28 05:50:51 2013 New Revision: 328549 URL: http://svnweb.freebsd.org/changeset/ports/328549 Log: Fix build under 10-CURRENT. Added: head/lang/dmd/files/patch-src-dmd-mars.c (contents, props changed) head/lang/dmd/files/patch-src-dmd-root-port.c (contents, props changed) head/lang/dmd2/files/patch-src-dmd-root-port.c (contents, props changed) Modified: head/lang/dmd/files/patch-src-dmd-posix.mak Added: head/lang/dmd/files/patch-src-dmd-mars.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/dmd/files/patch-src-dmd-mars.c Sat Sep 28 05:50:51 2013 (r328549) @@ -0,0 +1,29 @@ +--- ../../src/dmd/mars.c.orig 2012-12-31 12:16:46.000000000 -0800 ++++ ../../src/dmd/mars.c 2013-09-27 11:06:20.705469255 -0700 +@@ -387,7 +387,7 @@ + } + #endif + +-int main(size_t argc, char *argv[]) ++int main(int argc, char *argv[]) + { + mem.init(); // initialize storage allocator + mem.setStackBottom(&argv); +@@ -422,7 +422,7 @@ + goto Largs; + } + +- if (response_expand(&argc,&argv)) // expand response files ++ if (response_expand((size_t *) &argc,&argv)) // expand response files + error(0, "can't open response file"); + + files.reserve(argc - 1); +@@ -522,7 +522,7 @@ + + inifile(argv[0], inifilename, is64bit ? "Environment64" : "Environment32"); + +- getenv_setargv("DFLAGS", &argc, &argv); ++ getenv_setargv("DFLAGS", (size_t *) &argc, &argv); + + #if 0 + for (size_t i = 0; i < argc; i++) Modified: head/lang/dmd/files/patch-src-dmd-posix.mak ============================================================================== --- head/lang/dmd/files/patch-src-dmd-posix.mak Sat Sep 28 03:48:23 2013 (r328548) +++ head/lang/dmd/files/patch-src-dmd-posix.mak Sat Sep 28 05:50:51 2013 (r328549) @@ -1,5 +1,5 @@ --- ../../src/dmd/posix.mak.orig 2012-12-31 12:16:46.000000000 -0800 -+++ ../../src/dmd/posix.mak 2013-01-30 16:20:15.160587655 -0800 ++++ ../../src/dmd/posix.mak 2013-09-27 22:38:06.189546090 -0700 @@ -49,7 +49,6 @@ TK=tk ROOT=root @@ -8,3 +8,21 @@ ifneq (x,x$(MODEL)) MODEL_FLAG=-m$(MODEL) endif +@@ -73,7 +72,7 @@ + LDFLAGS=-lm -lstdc++ -lpthread + endif + +-HOST_CC=g++ ++HOST_CC=$(CXX) + CC=$(HOST_CC) $(MODEL_FLAG) $(TARGET_CFLAGS) + + #OPT=-g -g3 +@@ -572,7 +571,7 @@ + $(CC) -c $(GFLAGS) -I$(ROOT) $< + + strtold.o: $C/strtold.c +- gcc $(MODEL_FLAG) -I$(ROOT) -c $< ++ $(CC) $(MODEL_FLAG) -I$(ROOT) -c $< + + struct.o: struct.c + $(CC) -c $(CFLAGS) $< Added: head/lang/dmd/files/patch-src-dmd-root-port.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/dmd/files/patch-src-dmd-root-port.c Sat Sep 28 05:50:51 2013 (r328549) @@ -0,0 +1,29 @@ +--- ../../src/dmd/root/port.c.orig 2012-12-31 12:16:46.000000000 -0800 ++++ ../../src/dmd/root/port.c 2013-09-27 22:41:16.360128824 -0700 +@@ -386,7 +386,7 @@ + #else + return __inline_isnan(r); + #endif +-#elif __OpenBSD__ ++#elif __OpenBSD__ || __FreeBSD__ + return isnan(r); + #else + #undef isnan +@@ -402,7 +402,7 @@ + #else + return __inline_isnan(r); + #endif +-#elif __OpenBSD__ ++#elif __OpenBSD__ || __FreeBSD__ + return isnan(r); + #else + #undef isnan +@@ -436,7 +436,7 @@ + { + #if __APPLE__ + return fpclassify(r) == FP_INFINITE; +-#elif __OpenBSD__ ++#elif __OpenBSD__ || __FreeBSD__ + return isinf(r); + #else + #undef isinf Added: head/lang/dmd2/files/patch-src-dmd-root-port.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/dmd2/files/patch-src-dmd-root-port.c Sat Sep 28 05:50:51 2013 (r328549) @@ -0,0 +1,29 @@ +--- ../../src/dmd/root/port.c.orig 2013-06-12 22:42:08.000000000 -0700 ++++ ../../src/dmd/root/port.c 2013-09-27 17:56:26.292841909 -0700 +@@ -406,7 +406,7 @@ + #else + return __inline_isnan(r); + #endif +-#elif __OpenBSD__ ++#elif __OpenBSD__ || __FreeBSD__ + return isnan(r); + #else + #undef isnan +@@ -422,7 +422,7 @@ + #else + return __inline_isnan(r); + #endif +-#elif __OpenBSD__ ++#elif __OpenBSD__ || __FreeBSD__ + return isnan(r); + #else + #undef isnan +@@ -456,7 +456,7 @@ + { + #if __APPLE__ + return fpclassify(r) == FP_INFINITE; +-#elif __OpenBSD__ ++#elif __OpenBSD__ || __FreeBSD__ + return isinf(r); + #else + #undef isinf