From owner-svn-ports-all@freebsd.org Sat Feb 24 23:17:05 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7BFB4F2BBDC; Sat, 24 Feb 2018 23:17:05 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 256EA7CD6E; Sat, 24 Feb 2018 23:17:05 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1FE502C24C; Sat, 24 Feb 2018 23:17:05 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1ONH51c069382; Sat, 24 Feb 2018 23:17:05 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1ONH4Fs069380; Sat, 24 Feb 2018 23:17:04 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201802242317.w1ONH4Fs069380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Sat, 24 Feb 2018 23:17:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462877 - in head/math/octave-forge-base: . files X-SVN-Group: ports-head X-SVN-Commit-Author: stephen X-SVN-Commit-Paths: in head/math/octave-forge-base: . files X-SVN-Commit-Revision: 462877 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Feb 2018 23:17:05 -0000 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);