From owner-svn-ports-all@freebsd.org Tue Mar 22 14:47:00 2016 Return-Path: Delivered-To: svn-ports-all@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 CB862AD8255; Tue, 22 Mar 2016 14:47:00 +0000 (UTC) (envelope-from marino@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 9CA327A9; Tue, 22 Mar 2016 14:47:00 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2MEkxFb047694; Tue, 22 Mar 2016 14:46:59 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2MEkxMC047692; Tue, 22 Mar 2016 14:46:59 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201603221446.u2MEkxMC047692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 22 Mar 2016 14:46:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411664 - head/math/ogdf/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.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Mar 2016 14:47:00 -0000 Author: marino Date: Tue Mar 22 14:46:59 2016 New Revision: 411664 URL: https://svnweb.freebsd.org/changeset/ports/411664 Log: math/ogdf: Unbreak DragonFly DragonFly needs the same modifications as FreeBSD. They were carried in dports before, but the macros were moved to new files. Approved by: Restore DF functionality blanket Modified: head/math/ogdf/files/patch-include_ogdf_internal_basic_config.h head/math/ogdf/files/patch-test_gtest_gtest.h Modified: head/math/ogdf/files/patch-include_ogdf_internal_basic_config.h ============================================================================== --- head/math/ogdf/files/patch-include_ogdf_internal_basic_config.h Tue Mar 22 14:40:56 2016 (r411663) +++ head/math/ogdf/files/patch-include_ogdf_internal_basic_config.h Tue Mar 22 14:46:59 2016 (r411664) @@ -5,7 +5,7 @@ #endif +// Note: FreeBSD machines will be both OGDF_SYSTEM_UNIX and OGDF_SYSTEM_OSX -+#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) +#define OGDF_SYSTEM_FREEBSD +#endif + Modified: head/math/ogdf/files/patch-test_gtest_gtest.h ============================================================================== --- head/math/ogdf/files/patch-test_gtest_gtest.h Tue Mar 22 14:40:56 2016 (r411663) +++ head/math/ogdf/files/patch-test_gtest_gtest.h Tue Mar 22 14:46:59 2016 (r411664) @@ -12,7 +12,7 @@ # define GTEST_OS_HPUX 1 #elif defined __native_client__ # define GTEST_OS_NACL 1 -+#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) +# define GTEST_OS_FREEBSD 1 +# define GTEST_USE_OWN_TR1_TUPLE 1 #endif // __CYGWIN__