From owner-svn-ports-head@freebsd.org Fri Apr 8 15:13:55 2016 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 2F9CAB0841C; Fri, 8 Apr 2016 15:13:55 +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 D8F821EA8; Fri, 8 Apr 2016 15:13:54 +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 u38FDspe059314; Fri, 8 Apr 2016 15:13:54 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u38FDrkB059312; Fri, 8 Apr 2016 15:13:53 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201604081513.u38FDrkB059312@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 8 Apr 2016 15:13:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412748 - head/math/pdal/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.21 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: Fri, 08 Apr 2016 15:13:55 -0000 Author: marino Date: Fri Apr 8 15:13:53 2016 New Revision: 412748 URL: https://svnweb.freebsd.org/changeset/ports/412748 Log: math/pdal: Fix macro check and restore DragonFly support Add __DragonFly__ definition check in two places to restore the build on DF. While here, change __FreeBSD__ value check to existance check which was the intent I believe (although result is the same). Approved by: Restore DF functionality blanket Modified: head/math/pdal/files/patch-src_PluginManager.cpp head/math/pdal/files/patch-vendor_gtest-1.7.0_include_gtest_internal_gtest-port.h Modified: head/math/pdal/files/patch-src_PluginManager.cpp ============================================================================== --- head/math/pdal/files/patch-src_PluginManager.cpp Fri Apr 8 13:33:49 2016 (r412747) +++ head/math/pdal/files/patch-src_PluginManager.cpp Fri Apr 8 15:13:53 2016 (r412748) @@ -5,7 +5,7 @@ #if defined(__APPLE__) && defined(__MACH__) const std::string dynamicLibraryExtension(".dylib"); -#elif defined __linux__ -+#elif defined __linux__ || __FreeBSD__ ++#elif defined __linux__ || defined __FreeBSD__ || defined __DragonFly__ const std::string dynamicLibraryExtension(".so"); #elif defined _WIN32 const std::string dynamicLibraryExtension(".dll"); Modified: head/math/pdal/files/patch-vendor_gtest-1.7.0_include_gtest_internal_gtest-port.h ============================================================================== --- head/math/pdal/files/patch-vendor_gtest-1.7.0_include_gtest_internal_gtest-port.h Fri Apr 8 13:33:49 2016 (r412747) +++ head/math/pdal/files/patch-vendor_gtest-1.7.0_include_gtest_internal_gtest-port.h Fri Apr 8 15:13:53 2016 (r412748) @@ -12,7 +12,7 @@ # define GTEST_OS_OPENBSD 1 #elif defined __QNX__ # define GTEST_OS_QNX 1 -+#elif defined __FreeBSD__ ++#elif defined __FreeBSD__ || defined __DragonFly__ +# define GTEST_OS_FREEBSD 1 #endif // __CYGWIN__