- Small bug fix so that packages x.y and x.y.0 are considered the same.

- Bump portrevision.

2 files changed, 5 insertions, 3 deletions

diff --git a/math/octave-forge-base/Makefile b/math/octave-forge-base/Makefile
index 849d160232f9..51d21842c5d0 100644
--- a/math/octave-forge-base/Makefile
+++ b/math/octave-forge-base/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-base
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 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 5da1b478262f..20839ef748fb 100644
--- a/math/octave-forge-base/files/load-octave-pkg.in
+++ b/math/octave-forge-base/files/load-octave-pkg.in
@@ -123,7 +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+)\.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++;
@@ -184,7 +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+)(\.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);