From owner-dev-commits-ports-all@freebsd.org Sun Jul 18 22:07:37 2021 Return-Path: Delivered-To: dev-commits-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 DF0D567275B; Sun, 18 Jul 2021 22:07:37 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GSfGx5PZgz3JFh; Sun, 18 Jul 2021 22:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 784BE398C; Sun, 18 Jul 2021 22:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16IM7blg074025; Sun, 18 Jul 2021 22:07:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16IM7blS074024; Sun, 18 Jul 2021 22:07:37 GMT (envelope-from git) Date: Sun, 18 Jul 2021 22:07:37 GMT Message-Id: <202107182207.16IM7blS074024@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: cec2f8e77051 - main - graphics/gdal: Update to 3.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cec2f8e77051784d266d6d6389ac58214e6f86cd Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 22:07:38 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=cec2f8e77051784d266d6d6389ac58214e6f86cd commit cec2f8e77051784d266d6d6389ac58214e6f86cd Author: Po-Chuan Hsieh AuthorDate: 2021-07-18 21:43:50 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-07-18 22:07:00 +0000 graphics/gdal: Update to 3.3.1 Changes: https://github.com/OSGeo/gdal/releases https://github.com/OSGeo/gdal/blob/master/gdal/NEWS --- graphics/gdal/Makefile | 3 +- graphics/gdal/distinfo | 6 +-- graphics/gdal/files/patch-configure | 94 ++-------------------------------- graphics/gdal/files/patch-m4-geos.m4 | 21 -------- graphics/gdal/files/patch-m4-sfcgal.m4 | 21 -------- 5 files changed, 8 insertions(+), 137 deletions(-) diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index d0864d714011..b91572a9b9b4 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -1,8 +1,7 @@ # Created by: Randall Hopper PORTNAME= gdal -PORTVERSION= 3.3.0 -PORTREVISION= 2 +PORTVERSION= 3.3.1 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo index 9673618a1445..0a04109b4afe 100644 --- a/graphics/gdal/distinfo +++ b/graphics/gdal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624630042 -SHA256 (gdal-3.3.0.tar.xz) = 190c8f4b56afc767f43836b2a5cd53cc52ee7fdc25eb78c6079c5a244e28efa7 -SIZE (gdal-3.3.0.tar.xz) = 12923948 +TIMESTAMP = 1626460018 +SHA256 (gdal-3.3.1.tar.xz) = 48ab00b77d49f08cf66c60ccce55abb6455c3079f545e60c90ee7ce857bccb70 +SIZE (gdal-3.3.1.tar.xz) = 12933888 diff --git a/graphics/gdal/files/patch-configure b/graphics/gdal/files/patch-configure index 6aebd59759a9..8d4eede12444 100644 --- a/graphics/gdal/files/patch-configure +++ b/graphics/gdal/files/patch-configure @@ -1,8 +1,6 @@ -Obtained from: https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6 +% sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure -sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure - ---- configure.orig 2021-04-26 12:29:56 UTC +--- configure.orig 2021-06-28 10:57:58 UTC +++ configure @@ -36537,9 +36537,9 @@ $as_echo "$LIBKML_VERSION" >&6; } libkml_include_dir2="$libkml_prefix/include/kml" @@ -16,73 +14,7 @@ sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure fi run_libkml_test="yes" elif test "$libkml_requested" = "yes"; then -@@ -38323,6 +38323,7 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: GEOS support disabled" >&5 - $as_echo "GEOS support disabled" >&6; } - GEOS_CONFIG=no -+ HAVE_GEOS=no - - elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then - -@@ -38580,15 +38581,13 @@ $as_echo "$as_me: WARNING: GEOS was found on your syst - - else - -- if test $ac_geos_config_auto = "no" ; then -+ if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then - as_fn_error $? "GEOS support explicitly enabled, but geos-config could not be found" "$LINENO" 5 - fi - - fi - --HAVE_GEOS_RESULT="no" - if test "${HAVE_GEOS}" = "yes" ; then -- - { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from GEOS $GEOS_VERSION" >&5 - $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;} - -@@ -38602,7 +38601,6 @@ $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" - - GEOS_LIBS="$STRIPPED_LIBRARY_NAME" - LIBS="${GEOS_LIBS} ${LIBS}" -- HAVE_GEOS_RESULT="yes" - fi - - -@@ -38625,6 +38623,7 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: SFCGAL support disabled" >&5 - $as_echo "SFCGAL support disabled" >&6; } -+ HAVE_SFCGAL=no - SFCGAL_CONFIG=no - - elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then -@@ -38883,15 +38882,13 @@ $as_echo "$as_me: WARNING: SFCGAL was found on your sy - - else - -- if test $ac_sfcgal_config_auto = "no" ; then -+ if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then - as_fn_error $? "SFCGAL support explicitly enabled, but sfcgal-config could not be found" "$LINENO" 5 - fi - - fi - --HAVE_SFCGAL_RESULT="no" - if test "${HAVE_SFCGAL}" = "yes" ; then -- - { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from SFCGAL $SFCGAL_VERSION" >&5 - $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;} - -@@ -38905,7 +38902,6 @@ $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERS - - SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME" - LIBS="${SFCGAL_LIBS} ${LIBS}" -- HAVE_SFCGAL_RESULT="yes" - fi - - -@@ -42250,13 +42246,13 @@ fi +@@ -42246,13 +42246,13 @@ fi # Test that the package found is for the right architecture saved_LIBS="$LIBS" LIBS="$EXR_LIBS" @@ -100,7 +32,7 @@ sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -42276,17 +42272,17 @@ return ImfTiledInputReadTile (); +@@ -42272,17 +42272,17 @@ return ImfTiledInputReadTile (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -123,21 +55,3 @@ sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure HAVE_EXR=yes else HAVE_EXR=no -@@ -44998,7 +44994,7 @@ echo " FreeXL support: ${HAVE_FREEXL}" - echo " GEORASTER support: ${HAVE_GEORASTER}" - - --echo " GEOS support: ${HAVE_GEOS_RESULT}" -+echo " GEOS support: ${HAVE_GEOS}" - - - echo " Google libkml support: ${HAVE_LIBKML}" -@@ -45162,7 +45158,7 @@ echo " RasterLite2 support: ${HAVE_RASTERLITE2} - echo " RDB support: ${RDB_SETTING}" - - --echo " SFCGAL support: ${HAVE_SFCGAL_RESULT}" -+echo " SFCGAL support: ${HAVE_SFCGAL}" - - - echo " SOSI support: ${SOSI_ENABLED}" diff --git a/graphics/gdal/files/patch-m4-geos.m4 b/graphics/gdal/files/patch-m4-geos.m4 deleted file mode 100644 index b44b0079f277..000000000000 --- a/graphics/gdal/files/patch-m4-geos.m4 +++ /dev/null @@ -1,21 +0,0 @@ -Obtained from: https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6 - ---- m4/geos.m4.orig 2021-04-26 12:31:16 UTC -+++ m4/geos.m4 -@@ -55,6 +55,7 @@ AC_DEFUN([GEOS_INIT],[ - - AC_MSG_RESULT([GEOS support disabled]) - GEOS_CONFIG=no -+ HAVE_GEOS=no - - elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then - -@@ -160,7 +161,7 @@ AC_DEFUN([GEOS_INIT],[ - - else - -- if test $ac_geos_config_auto = "no" ; then -+ if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then - AC_MSG_ERROR([GEOS support explicitly enabled, but geos-config could not be found]) - fi - diff --git a/graphics/gdal/files/patch-m4-sfcgal.m4 b/graphics/gdal/files/patch-m4-sfcgal.m4 deleted file mode 100644 index 448bea3cbf09..000000000000 --- a/graphics/gdal/files/patch-m4-sfcgal.m4 +++ /dev/null @@ -1,21 +0,0 @@ -Obtained from: https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6 - ---- m4/sfcgal.m4.orig 2021-04-26 12:31:13 UTC -+++ m4/sfcgal.m4 -@@ -53,6 +53,7 @@ AC_DEFUN([SFCGAL_INIT],[ - if test x"$with_sfcgal" = x"no" ; then - - AC_MSG_RESULT([SFCGAL support disabled]) -+ HAVE_SFCGAL=no - SFCGAL_CONFIG=no - - elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then -@@ -159,7 +160,7 @@ AC_DEFUN([SFCGAL_INIT],[ - - else - -- if test $ac_sfcgal_config_auto = "no" ; then -+ if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then - AC_MSG_ERROR([SFCGAL support explicitly enabled, but sfcgal-config could not be found]) - fi -