From nobody Sat Nov 05 21:37:30 2022 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 4N4W6z1KGTz4hFYQ; Sat, 5 Nov 2022 21:37:31 +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 4N4W6z0q4bz3wFH; Sat, 5 Nov 2022 21:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667684251; 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=Kp8Efgq0ssUTJxv3pm4KsXsEU3Lu/w+0IJbcuOTjyls=; b=qeDteTztnpDMmTeDnU+Im0JF5IRp6dRvcrwl+QbHgJtCpfgi+VihguIa4sBz8Scd7Amyud KDLcNppiXdUL0l+cOxxHO67dNcTG0UhQ8Zg3VJx5DAmlP3EWfMkQaHAoIEBd+NQhcAHLt1 WgZ7WrzlULrJbZD4fYbodsWIBoXNKmDszI97Wi44sldDcRtGa7H2j+RQwrsYRE97bPVJ1X 6jtwIgYto2DmaG4rHhrWNma/6JVR/Uvcdxw2R8NbE9rIE7gs0MFyA0LxGQd8XoHexjtlQb /Pq+YYVI9TZ5N2i913I62g6E57/G7rF7rkjeUqfZ7ByoY34MfpSVAR8cerjmnA== 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 4N4W6y6zXPzwpt; Sat, 5 Nov 2022 21:37:30 +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 2A5LbUD0055663; Sat, 5 Nov 2022 21:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A5LbUck055662; Sat, 5 Nov 2022 21:37:30 GMT (envelope-from git) Date: Sat, 5 Nov 2022 21:37:30 GMT Message-Id: <202211052137.2A5LbUck055662@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: f9b2b613c45c - main - math/octave-forge-base: Allow more complex portversions for packages. 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: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9b2b613c45cf8b0971dc8ddc4aea81da8ff3146 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667684251; 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=Kp8Efgq0ssUTJxv3pm4KsXsEU3Lu/w+0IJbcuOTjyls=; b=MHvobM7P8cyzJIupwXbPWaJ0puL2ZsrL6noNZ6jY1sKk9typZ+FN/xjldis3oy5OCH1nob v6zeYNrUFzTVcvZQth/xrSsWyIJhHXaywMmPhOjvyzpCerJw2RdGazcB3Jz0S0EUaK3ee6 IuQuEdDW6CouKYMEn8Vh8J8Ctj8LJhqMVtBF4EUBYH4xiNhhC6/CDE+M/hvQ84kjJ095da jCgubApPugImjlAoYeA4el4Fy1nErSEuhBwkO0yIHttETqmszfBNdEaqeUy5KEfBiTMmgW GkahdEAyJ/zkF1+trtYAUQgp+znVdEoTfGDmCAAf8/qmN3dVTgBEBMY0jpagqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667684251; a=rsa-sha256; cv=none; b=Z7qWUh6b6NeAtcAmR6GpG9Mrjfs5HpknnW/0BG4qZiYnzqLD1JTm7HFyDPIC6dDAHj4SNi MzDIfyjzvQsZPN7Aijh9K64c7Zd/7yk66Zs+aTmCGicHt2e3KPh6K88qz87ASKl5IAdaPi FwQS9EsQ2u3w7fvZmUN9qtr+GyMI7TSxhDULnGVvGLSTL0wmPQuGusIkYh2nFpD2QuYP+G YnN23W71Y37z6nrrV742mcdb2SaFrfGC9DH1KNvADXPxemyGcyXQICeLckCWQHc2VYMDd0 JeSrCc4AWpvk4/vnhetUwvEVAoePIg7NCQ69u5tu4gNvCihBtRNNJPc1F25M/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9b2b613c45cf8b0971dc8ddc4aea81da8ff3146 commit f9b2b613c45cf8b0971dc8ddc4aea81da8ff3146 Author: Stephen Montgomery-Smith AuthorDate: 2022-11-05 21:32:56 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2022-11-05 21:32:56 +0000 math/octave-forge-base: Allow more complex portversions for packages. Update to 1.8. --- math/octave-forge-base/Makefile | 2 +- math/octave-forge-base/files/load-octave-pkg.in | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/math/octave-forge-base/Makefile b/math/octave-forge-base/Makefile index ae95ac1c321a..e08bbfcc26f4 100644 --- a/math/octave-forge-base/Makefile +++ b/math/octave-forge-base/Makefile @@ -1,5 +1,5 @@ PORTNAME= octave-forge-base -PORTVERSION= 1.7 +PORTVERSION= 1.8 CATEGORIES= math MASTER_SITES= #none DISTFILES= #none diff --git a/math/octave-forge-base/files/load-octave-pkg.in b/math/octave-forge-base/files/load-octave-pkg.in index 343d0b418caa..fc0a9876b2f9 100644 --- a/math/octave-forge-base/files/load-octave-pkg.in +++ b/math/octave-forge-base/files/load-octave-pkg.in @@ -123,8 +123,8 @@ $nr_to_remove = 0; foreach my $p (keys %is_installed) { if (defined($is_installed{$p})) { my $altp = $p; # so that 3.5.0 and 3.5 are the same package numbers - $altp =~ s/(\-\d+\.\d+)\.0(\.tar\.gz)$/$1$2/ || - $altp =~ s/(\-\d+\.\d+)(\.tar\.gz)$/$1\.0$2/; + $altp =~ s/(\-\d+\.\d+[^\.]*)\.0(\.tar\.gz)$/$1$2/ || + $altp =~ s/(\-\d+\.\d+[^\.]*)(\.tar\.gz)$/$1\.0$2/; if (!defined($in_tarballs{$p}) && !defined($in_tarballs{$altp})) { $to_remove{$p} = $is_installed{$p}; $nr_to_remove++; @@ -158,7 +158,7 @@ if ($nr_to_remove>0) { foreach my $p (@ordered_list_to_remove) { print "load-octave-pkg: octave is uninstalling $p.\n"; - $p =~ s/\-[\d\.]+\.tar\.gz//; + $p =~ s/\-[^\-]+\.tar\.gz//; system "octave-cli -W -H -q --no-site-file --eval \"pkg('uninstall','$p')\" > /dev/null"; } } @@ -185,8 +185,8 @@ while (my $p = <$install_prefix/*>) { %to_install = (); foreach my $n (keys %in_tarballs) { my $altn = $n; # so that 3.5 and 3.5.0 are the same package numbers - $altn =~ s/(\-\d+\.\d+)(\.tar\.gz)$/$1\.0$2/ || - $altn =~ s/(\-\d+\.\d+)\.0(\.tar\.gz)$/$1$2/; + $altn =~ s/(\-\d+\.\d+[^\.]*)(\.tar\.gz)$/$1\.0$2/ || + $altn =~ s/(\-\d+\.\d+[^\.]*)\.0(\.tar\.gz)$/$1$2/; if (defined($in_tarballs{$n})) { if (!defined($is_installed{$n}) && !defined($is_installed{$altn})) { my $tar = Archive::Tar->new("$tardir/$n",COMPRESS_GZIP);