From owner-svn-ports-all@freebsd.org Sun Dec 9 21:49:41 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1CA513321CF; Sun, 9 Dec 2018 21:49:40 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7519D7E4D8; Sun, 9 Dec 2018 21:49:40 +0000 (UTC) (envelope-from yuri@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36CFB16FA1; Sun, 9 Dec 2018 21:49:40 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB9LndPp032423; Sun, 9 Dec 2018 21:49:39 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB9LndRe032418; Sun, 9 Dec 2018 21:49:39 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201812092149.wB9LndRe032418@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 9 Dec 2018 21:49:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487093 - in head/math/geogram: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/math/geogram: . files X-SVN-Commit-Revision: 487093 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7519D7E4D8 X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; NEURAL_HAM_LONG(-0.99)[-0.991,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 09 Dec 2018 21:49:41 -0000 Author: yuri Date: Sun Dec 9 21:49:39 2018 New Revision: 487093 URL: https://svnweb.freebsd.org/changeset/ports/487093 Log: math/geogram: Change to shared libraries Added: head/math/geogram/files/patch-src_lib_geogram_NL_nl__private.h (contents, props changed) Modified: head/math/geogram/Makefile head/math/geogram/pkg-plist Modified: head/math/geogram/Makefile ============================================================================== --- head/math/geogram/Makefile Sun Dec 9 21:37:20 2018 (r487092) +++ head/math/geogram/Makefile Sun Dec 9 21:49:39 2018 (r487093) @@ -2,6 +2,7 @@ PORTNAME= geogram DISTVERSION= 1.6.9 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://gforge.inria.fr/frs/download.php/file/37779/ DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -17,14 +18,13 @@ LIB_DEPENDS= libglfw.so:graphics/glfw USES= cmake:outsource gl localbase:ldflags USE_XORG= x11 xcursor xi xinerama xrandr xxf86vm USE_GL= gl glu +USE_LDCONFIG= yes -CMAKE_ON= GEOGRAM_USE_SYSTEM_GLFW3 +CMAKE_ON= GEOGRAM_USE_SYSTEM_GLFW3 VORPALINE_BUILD_DYNAMIC CMAKE_ARGS= -DVORPALINE_PLATFORM:STRING=FreeBSD LDFLAGS+= -pthread post-stage: @${RMDIR} ${STAGEDIR}${PREFIX}/include/geogram1/geogram_gfx/glup_viewer/colormaps - -# geogram installs static libraries. I couldn't make it build with shared libraries due to link errors. I asked Bruno.Levy@inria.fr to fix this (via e-mail). .include Added: head/math/geogram/files/patch-src_lib_geogram_NL_nl__private.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/geogram/files/patch-src_lib_geogram_NL_nl__private.h Sun Dec 9 21:49:39 2018 (r487093) @@ -0,0 +1,11 @@ +--- src/lib/geogram/NL/nl_private.h.orig 2018-12-09 21:38:58 UTC ++++ src/lib/geogram/NL/nl_private.h +@@ -67,7 +67,7 @@ + #define NL_OS_APPLE + #endif + +-#if defined(__linux__) || defined(__ANDROID__) || defined(NL_OS_APPLE) ++#if defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(NL_OS_APPLE) + /** + * \brief Defined if compiled on a Unix-like platform. + */ Modified: head/math/geogram/pkg-plist ============================================================================== --- head/math/geogram/pkg-plist Sun Dec 9 21:37:20 2018 (r487092) +++ head/math/geogram/pkg-plist Sun Dec 9 21:49:39 2018 (r487093) @@ -305,7 +305,11 @@ include/geogram1/geogram_gfx/third_party/imgui_fonts/r include/geogram1/geogram_gfx/third_party/imgui_lua_bindings/imgui_iterator.h include/geogram1/geogram_gfx/third_party/quicktext/glQuickText.h lib/cmake/modules/FindGeogram.cmake -lib/libgeogram.a -lib/libgeogram_gfx.a +lib/libgeogram.so +lib/libgeogram.so.1 +lib/libgeogram.so.1.6.9 +lib/libgeogram_gfx.so +lib/libgeogram_gfx.so.1 +lib/libgeogram_gfx.so.1.6.9 libdata/pkgconfig/geogram1.pc libdata/pkgconfig/geogram_gfx1.pc