From owner-svn-ports-all@freebsd.org Thu Feb 6 19:17:34 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5FE45234849; Thu, 6 Feb 2020 19:17:34 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48D7VQ1sQ7z4SgH; Thu, 6 Feb 2020 19:17:34 +0000 (UTC) (envelope-from lbartoletti@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 3686E206BC; Thu, 6 Feb 2020 19:17:34 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 016JHYaT037119; Thu, 6 Feb 2020 19:17:34 GMT (envelope-from lbartoletti@FreeBSD.org) Received: (from lbartoletti@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 016JHWki037112; Thu, 6 Feb 2020 19:17:32 GMT (envelope-from lbartoletti@FreeBSD.org) Message-Id: <202002061917.016JHWki037112@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lbartoletti set sender to lbartoletti@FreeBSD.org using -f From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= Date: Thu, 6 Feb 2020 19:17:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525400 - in head: databases/grass7 databases/grass7/files graphics/qgis graphics/qgis-ltr graphics/qgis-ltr/files graphics/qgis/files X-SVN-Group: ports-head X-SVN-Commit-Author: lbartoletti X-SVN-Commit-Paths: in head: databases/grass7 databases/grass7/files graphics/qgis graphics/qgis-ltr graphics/qgis-ltr/files graphics/qgis/files X-SVN-Commit-Revision: 525400 X-SVN-Commit-Repository: ports 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.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: Thu, 06 Feb 2020 19:17:34 -0000 Author: lbartoletti Date: Thu Feb 6 19:17:32 2020 New Revision: 525400 URL: https://svnweb.freebsd.org/changeset/ports/525400 Log: databases/grass7: add SONAME and use new path for graphics/qgis* - Add SONAME (upstreamed) [1] - Remove the (bad) idea to keep a symlink to the old path logic (grass-M.m.b) - Fix FindGRASS.cmake for graphics/qgis and graphics/qgis-ltr (upstreamed) [2] [1] https://github.com/OSGeo/grass/pull/301 [2] https://github.com/qgis/QGIS/pull/34088 PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=243736 Approved by: Rainer Hurlin (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D23470 Added: head/databases/grass7/files/patch-aclocal.m4 (contents, props changed) head/databases/grass7/files/patch-configure (contents, props changed) head/graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake (contents, props changed) head/graphics/qgis/files/patch-cmake_FindGRASS.cmake (contents, props changed) Modified: head/databases/grass7/Makefile head/databases/grass7/pkg-plist head/graphics/qgis-ltr/Makefile head/graphics/qgis/Makefile Modified: head/databases/grass7/Makefile ============================================================================== --- head/databases/grass7/Makefile Thu Feb 6 18:43:40 2020 (r525399) +++ head/databases/grass7/Makefile Thu Feb 6 19:17:32 2020 (r525400) @@ -3,7 +3,7 @@ PORTNAME= grass PORTVERSION= 7.6.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= databases geography MASTER_SITES= https://grass.osgeo.org/%SUBDIR%/ \ http://grass.cict.fr/%SUBDIR%/ \ @@ -98,7 +98,7 @@ LAS_DESC= Enable LiDAR modules PDAL_DESC= Enable points cloud data modules DB_DESC= Database support NLS_CONFIGURE_WITH= nls -NLS_USES= gettext +NLS_USES= gettext LAS_CONFIGURE_ON= --with-liblas=yes LAS_LIB_DEPENDS= liblas.so:devel/liblas \ libboost_program_options.so:devel/boost-libs \ @@ -190,10 +190,7 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i} .endfor ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/lister/* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/libgrass_*.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo ${LN} -sf ${PORTNAME}${VER} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} - ${LN} -s ${PORTNAME}${VER} \ - ${STAGEDIR}${PREFIX}/${PORTNAME}-${PORTVERSION} .include Added: head/databases/grass7/files/patch-aclocal.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/grass7/files/patch-aclocal.m4 Thu Feb 6 19:17:32 2020 (r525400) @@ -0,0 +1,10 @@ +--- aclocal.m4.orig 2020-01-25 14:44:25 UTC ++++ aclocal.m4 +@@ -560,6 +560,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + # FreeBSD 3.* and greater have ELF. + SHLIB_CFLAGS="-fPIC" + #SHLIB_LD="ld -Bshareable -x" ++ SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$[@])" + SHLIB_LD="${CC} -shared" + SHLIB_SUFFIX=".so" + LDFLAGS="-export-dynamic" Added: head/databases/grass7/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/grass7/files/patch-configure Thu Feb 6 19:17:32 2020 (r525400) @@ -0,0 +1,10 @@ +--- configure.orig 2020-01-25 14:44:16 UTC ++++ configure +@@ -1591,6 +1591,7 @@ EOF + # FreeBSD 3.* and greater have ELF. + SHLIB_CFLAGS="-fPIC" + #SHLIB_LD="ld -Bshareable -x" ++ SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$@)" + SHLIB_LD="${CC} -shared" + SHLIB_SUFFIX=".so" + LDFLAGS="-export-dynamic" Modified: head/databases/grass7/pkg-plist ============================================================================== --- head/databases/grass7/pkg-plist Thu Feb 6 18:43:40 2020 (r525399) +++ head/databases/grass7/pkg-plist Thu Feb 6 19:17:32 2020 (r525400) @@ -1,4 +1,3 @@ -grass-%%VERSION%% bin/grass%%MAJVER%% bin/grass%%VER%% %%GRASS_INST_DIR%%/AUTHORS Modified: head/graphics/qgis-ltr/Makefile ============================================================================== --- head/graphics/qgis-ltr/Makefile Thu Feb 6 18:43:40 2020 (r525399) +++ head/graphics/qgis-ltr/Makefile Thu Feb 6 19:17:32 2020 (r525400) @@ -4,7 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_4_11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics geography PKGNAMESUFFIX= -ltr Added: head/graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake Thu Feb 6 19:17:32 2020 (r525400) @@ -0,0 +1,13 @@ +--- cmake/FindGRASS.cmake.orig 2020-01-30 11:41:47 UTC ++++ cmake/FindGRASS.cmake +@@ -161,9 +161,7 @@ IF (UNIX) + IF (GRASS_FIND_VERSION EQUAL 7) + IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + FOREACH (VERSION_MINOR 0 1 2 3 4 5 6) +- FOREACH (VERSION_BUILD 0 1 2 3 4 5 6) +- LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD}) +- ENDFOREACH (VERSION_BUILD) ++ LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR}) + ENDFOREACH(VERSION_MINOR) + ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + FOREACH (PATH /usr/lib64 /usr/lib) Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Thu Feb 6 18:43:40 2020 (r525399) +++ head/graphics/qgis/Makefile Thu Feb 6 19:17:32 2020 (r525400) @@ -4,7 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_10_1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de Added: head/graphics/qgis/files/patch-cmake_FindGRASS.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/qgis/files/patch-cmake_FindGRASS.cmake Thu Feb 6 19:17:32 2020 (r525400) @@ -0,0 +1,13 @@ +--- cmake/FindGRASS.cmake.orig 2020-01-25 06:32:41 UTC ++++ cmake/FindGRASS.cmake +@@ -161,9 +161,7 @@ IF (UNIX) + IF (GRASS_FIND_VERSION EQUAL 7) + IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0) +- FOREACH (VERSION_BUILD 9 8 7 6 5 4 3 2 1 0) +- LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD}) +- ENDFOREACH (VERSION_BUILD) ++ LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR}) + ENDFOREACH(VERSION_MINOR) + ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + FOREACH (PATH /usr/lib64 /usr/lib)