sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-25 07:26:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

math/octave-forge-base: Allow more complex portversions for packages.

Browse source 
Update to 1.8.
This commit is contained in:
Stephen Montgomery-Smith 2022-11-05 16:32:56 -05:00
parent d34ed686aa
commit f9b2b613c4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
math/octave-forge-base/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= octave-forge-base PORTNAME= octave-forge-base
PORTVERSION= 1.7 PORTVERSION= 1.8
CATEGORIES= math CATEGORIES= math
MASTER_SITES= #none MASTER_SITES= #none
DISTFILES= #none DISTFILES= #none

10
math/octave-forge-base/files/load-octave-pkg.in
View file

@ -123,8 +123,8 @@ $nr_to_remove = 0;
foreach my $p (keys %is_installed) { foreach my $p (keys %is_installed) {
if (defined($is_installed{$p})) { if (defined($is_installed{$p})) {
my $altp = $p; # so that 3.5.0 and 3.5 are the same package numbers 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+[^\.]*)\.0(\.tar\.gz)$/$1$2/ ||
$altp =~ s/(\-\d+\.\d+)(\.tar\.gz)$/$1\.0$2/; $altp =~ s/(\-\d+\.\d+[^\.]*)(\.tar\.gz)$/$1\.0$2/;
if (!defined($in_tarballs{$p}) && !defined($in_tarballs{$altp})) { if (!defined($in_tarballs{$p}) && !defined($in_tarballs{$altp})) {
$to_remove{$p} = $is_installed{$p}; $to_remove{$p} = $is_installed{$p};
$nr_to_remove++; $nr_to_remove++;
@ -158,7 +158,7 @@ if ($nr_to_remove>0) {
foreach my $p (@ordered_list_to_remove) { foreach my $p (@ordered_list_to_remove) {
print "load-octave-pkg: octave is uninstalling $p.\n"; 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"; 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 = (); %to_install = ();
foreach my $n (keys %in_tarballs) { foreach my $n (keys %in_tarballs) {
my $altn = $n; # so that 3.5 and 3.5.0 are the same package numbers 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+[^\.]*)(\.tar\.gz)$/$1\.0$2/ ||
$altn =~ s/(\-\d+\.\d+)\.0(\.tar\.gz)$/$1$2/; $altn =~ s/(\-\d+\.\d+[^\.]*)\.0(\.tar\.gz)$/$1$2/;
if (defined($in_tarballs{$n})) { if (defined($in_tarballs{$n})) {
if (!defined($is_installed{$n}) && !defined($is_installed{$altn})) { if (!defined($is_installed{$n}) && !defined($is_installed{$altn})) {
my $tar = Archive::Tar->new("$tardir/$n",COMPRESS_GZIP); my $tar = Archive::Tar->new("$tardir/$n",COMPRESS_GZIP);