From nobody Mon Jul 31 16:46:02 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RF3zr3qmwz4pGYj; Mon, 31 Jul 2023 16:46:47 +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 4RF3yy3ydLz3GM9; Mon, 31 Jul 2023 16:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690821962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpYSe4Z8ftRi7NuWGsLR1zB58l8q0qjkNi2GBq7i9Vs=; b=rxB6w0cBzfyvdqig5QMjLDLR5vsEcA3Gj98n7iD8qQrAjqkjadc2IDaVwz3zK5cuFQwOKl vs5XyVJ5uqtV/bVaVVChw3Z5T/tFQLtK8SPqOuppHtgI5ZESI4ZF7O91cVW+yZE2yg6KiW J/vaMPayPF7El6u/tbaUG4JQRkWYm1LrE5lQ8m/XG+fklu8HjItvXnNQfDx0TCamcmssbo thYiBphtZOSnimUz6I0/amIvAfNk3VBb87QpUo0VPXcX6I2GgWqNzf0xbpwfNr/zDED3AE isJlL0ik2FvDfEZvKmiEfVKc/Y2b6zirgkYsNIlXZJcnoTUE3hdLXxX+3D1Pow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690821962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpYSe4Z8ftRi7NuWGsLR1zB58l8q0qjkNi2GBq7i9Vs=; b=FQXS3dn9A/lS7tJOmyb9BbqgjTx4zXCCt5MsH3zfVjKhJay5X/q1rOiHPRuu0zP3anqo0Y OSkbQTe9kdQTrJUGnhPFvnyOHtZ70LRcHGv+KK8+OvhnrHCjfVcyH2dbOHrDimahOEnQHr mQ2ClTzsmno7bcWNqX7MJZEn5o8cDdKs675J242rU1BpmwbilV71XPwsKaDxV1bV3q08rq j65YAk0BE2J5ZjftUZXvlkLqoR6vahmkKklXreMrSfIJx3PeDXnXYcxyj6ibffTGMsxOip nALFlmIgYdzf5ysWejQ8gs5drprvXF2wy8yUldv8VQjdnaY8XAEJCbVvViXTFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690821962; a=rsa-sha256; cv=none; b=fXOd2rZkD3w+sKqv2gxnzYqGPYKDQCOs+QgjlGr+82l625fshkKPfOG7YInJpdgtUbdEDj UmzEgzfsY05/6A+Gy2PjTnVcjVU2Ai4+rdOV6nU/LhdNXLBsCFMsV18KtNPCaIr2Wrk1M2 dYgiIht1+keZtmo7yleJ514GD3ow6MpiJ6QKKrIOuGmwCHV9kka1y03VgpsChcphMQlElV icZV3oINqBLDq5DnbWBaNrk61f53nefxwEOHYVt8gn6nR9gRsyTMBFBVwuzHUB7l1Qw5rn Ci+RvGjtjbiCr8zSvstvjWQsg2KcD/gnj8g+xW36ZN5mKIfRj956PAQKWezRfw== 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 4RF3yy2Hz2z13SL; Mon, 31 Jul 2023 16:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VGk2cK079564; Mon, 31 Jul 2023 16:46:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VGk2DE079563; Mon, 31 Jul 2023 16:46:02 GMT (envelope-from git) Date: Mon, 31 Jul 2023 16:46:02 GMT Message-Id: <202307311646.36VGk2DE079563@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: 759b2fb3bb38 - main - graphics/p5-Geo-GDAL-FFI: Update to 0.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 759b2fb3bb384f1280fa8d4d12594e518af9b2d2 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=759b2fb3bb384f1280fa8d4d12594e518af9b2d2 commit 759b2fb3bb384f1280fa8d4d12594e518af9b2d2 Author: Po-Chuan Hsieh AuthorDate: 2023-07-31 16:30:54 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-07-31 16:39:54 +0000 graphics/p5-Geo-GDAL-FFI: Update to 0.1 Changes: https://metacpan.org/dist/Geo-GDAL-FFI/changes --- graphics/p5-Geo-GDAL-FFI/Makefile | 7 +++-- graphics/p5-Geo-GDAL-FFI/distinfo | 6 ++-- graphics/p5-Geo-GDAL-FFI/files/patch-Makefile.PL | 36 ++++++++++++---------- .../files/patch-lib-Geo-GDAL-FFI.pm | 19 ++++++------ graphics/p5-Geo-GDAL-FFI/pkg-plist | 1 + 5 files changed, 36 insertions(+), 33 deletions(-) diff --git a/graphics/p5-Geo-GDAL-FFI/Makefile b/graphics/p5-Geo-GDAL-FFI/Makefile index 3f2fb457a61c..884f2cc1bddb 100644 --- a/graphics/p5-Geo-GDAL-FFI/Makefile +++ b/graphics/p5-Geo-GDAL-FFI/Makefile @@ -1,9 +1,9 @@ PORTNAME= Geo-GDAL-FFI -PORTVERSION= 0.09 -PORTREVISION= 3 +PORTVERSION= 0.10 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- +DISTNAME= Geo-GDAL-FFI-${PORTVERSION:C|0$||} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Foreign function interface to GDAL @@ -17,6 +17,7 @@ LIB_DEPENDS= libgdal.so:graphics/gdal RUN_DEPENDS= p5-FFI-Platypus>=0:devel/p5-FFI-Platypus \ p5-FFI-Platypus-Declare>=0:devel/p5-FFI-Platypus-Declare \ p5-PkgConfig>=0.23026:devel/p5-PkgConfig \ + p5-Sort-Versions>=0:devel/p5-Sort-Versions \ PDL>=0:math/PDL TEST_DEPENDS= p5-JSON>=0:converters/p5-JSON \ p5-Test-Exception>=0:devel/p5-Test-Exception @@ -27,6 +28,6 @@ USE_PERL5= configure NO_ARCH= yes post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/lib/Geo/GDAL/FFI.pm + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile.PL .include diff --git a/graphics/p5-Geo-GDAL-FFI/distinfo b/graphics/p5-Geo-GDAL-FFI/distinfo index 991e2e72d607..840f66ea6e54 100644 --- a/graphics/p5-Geo-GDAL-FFI/distinfo +++ b/graphics/p5-Geo-GDAL-FFI/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622213914 -SHA256 (Geo-GDAL-FFI-0.09.tar.gz) = f194a22ec4723028283ab8d328cf3bdacc5f5ba2f81cb92dd0131cc776c97885 -SIZE (Geo-GDAL-FFI-0.09.tar.gz) = 48088 +TIMESTAMP = 1689398811 +SHA256 (Geo-GDAL-FFI-0.1.tar.gz) = b935ad61935d810b345b4dd7bb8239ad3418e30037a03b0a390f6902d80372f0 +SIZE (Geo-GDAL-FFI-0.1.tar.gz) = 51675 diff --git a/graphics/p5-Geo-GDAL-FFI/files/patch-Makefile.PL b/graphics/p5-Geo-GDAL-FFI/files/patch-Makefile.PL index 06a788318ba4..7796ec64ae94 100644 --- a/graphics/p5-Geo-GDAL-FFI/files/patch-Makefile.PL +++ b/graphics/p5-Geo-GDAL-FFI/files/patch-Makefile.PL @@ -1,25 +1,27 @@ ---- Makefile.PL.orig 2021-03-16 05:32:47 UTC +--- Makefile.PL.orig 2023-07-10 15:20:31 UTC +++ Makefile.PL -@@ -1,6 +1,4 @@ --use Alien::gdal; - use ExtUtils::MakeMaker; --use Alien::Base::Wrapper qw( Alien::gdal !export ); - use Config; - - WriteMakefile( -@@ -9,15 +7,12 @@ WriteMakefile( - ABSTRACT_FROM => "lib/Geo/GDAL/FFI.pm", +@@ -13,7 +13,7 @@ BEGIN { + if ($gdal ne 'Alien::gdal' or $@) { + if ($gdal eq 'Alien::gdal') { + print "I can't find Alien::gdal.\n"; +- $gdal = '/usr'; ++ $gdal = '%%LOCALBASE%%'; + } + print "Trying GDAL from '$gdal'.\n"; + $have_alien = 0; +@@ -61,7 +61,6 @@ use Config; VERSION_FROM => "lib/Geo/GDAL/FFI.pm", LICENSE => "artistic_2", -- Alien::Base::Wrapper->mm_args, CONFIGURE_REQUIRES => { -- 'Alien::gdal' => 0 +- Alien::gdal => 0, }, PREREQ_PM => { - 'PkgConfig' => 0.23026, - 'FFI::Platypus' => 0, - 'FFI::Platypus::Declare' => 0, -- 'Alien::gdal' => 0, - 'PDL' => 0 + PkgConfig => 0.23026, +@@ -69,7 +68,6 @@ use Config; + FFI::Platypus::Declare => 0, + PDL => 0, + Sort::Versions => 0, +- Alien::gdal => 0, }, TEST_REQUIRES => { + 'Test::More' => 0, diff --git a/graphics/p5-Geo-GDAL-FFI/files/patch-lib-Geo-GDAL-FFI.pm b/graphics/p5-Geo-GDAL-FFI/files/patch-lib-Geo-GDAL-FFI.pm index 0bac28d56c6b..c93a61f13d6c 100644 --- a/graphics/p5-Geo-GDAL-FFI/files/patch-lib-Geo-GDAL-FFI.pm +++ b/graphics/p5-Geo-GDAL-FFI/files/patch-lib-Geo-GDAL-FFI.pm @@ -1,11 +1,10 @@ ---- lib/Geo/GDAL/FFI.pm.orig 2021-03-16 05:39:02 UTC +--- lib/Geo/GDAL/FFI.pm.orig 2023-07-10 15:47:31 UTC +++ lib/Geo/GDAL/FFI.pm -@@ -433,7 +433,7 @@ sub new { - - my $ffi = FFI::Platypus->new; - $ffi->load_custom_type('::StringPointer' => 'string_pointer'); -- $ffi->lib(Alien::gdal->dynamic_libs); -+ $ffi->lib(['%%LOCALBASE%%/lib/libgdal.so']); - - $ffi->type('(pointer,size_t,size_t,opaque)->size_t' => 'VSIWriteFunction'); - $ffi->type('(int,int,string)->void' => 'CPLErrorHandler'); +@@ -1812,7 +1812,6 @@ BEGIN { + $gdal = Geo::GDAL::gdal->new(); + }; + if ($@) { +- require Alien::gdal; + no strict 'subs'; + $gdal = Alien::gdal; + } diff --git a/graphics/p5-Geo-GDAL-FFI/pkg-plist b/graphics/p5-Geo-GDAL-FFI/pkg-plist index 73e8e5ceecc6..300294b4a8f3 100644 --- a/graphics/p5-Geo-GDAL-FFI/pkg-plist +++ b/graphics/p5-Geo-GDAL-FFI/pkg-plist @@ -12,6 +12,7 @@ %%SITE_PERL%%/Geo/GDAL/FFI/SpatialReference.pm %%SITE_PERL%%/Geo/GDAL/FFI/VSI.pm %%SITE_PERL%%/Geo/GDAL/FFI/VSI/File.pm +%%SITE_PERL%%/Geo/GDAL/gdal.pm %%PERL5_MAN3%%/Geo::GDAL::FFI.3.gz %%PERL5_MAN3%%/Geo::GDAL::FFI::Band.3.gz %%PERL5_MAN3%%/Geo::GDAL::FFI::Dataset.3.gz