svn commit: r462877 - in head/math/octave-forge-base: . files

[Stephen Montgomery-Smith]

Author: stephen
Date: Sat Feb 24 23:17:04 2018
New Revision: 462877
URL: https://svnweb.freebsd.org/changeset/ports/462877

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

Modified:
  head/math/octave-forge-base/Makefile
  head/math/octave-forge-base/files/load-octave-pkg.in

Modified: head/math/octave-forge-base/Makefile
==============================================================================
--- head/math/octave-forge-base/Makefile	Sat Feb 24 23:15:44 2018	(r462876)
+++ head/math/octave-forge-base/Makefile	Sat Feb 24 23:17:04 2018	(r462877)
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-base
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	#none
 DISTFILES=	#none

Modified: head/math/octave-forge-base/files/load-octave-pkg.in
==============================================================================
--- head/math/octave-forge-base/files/load-octave-pkg.in	Sat Feb 24 23:15:44 2018	(r462876)
+++ head/math/octave-forge-base/files/load-octave-pkg.in	Sat Feb 24 23:17:04 2018	(r462877)
@@ -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);