From owner-svn-ports-head@freebsd.org Wed Jan 13 01:19:35 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CDC9A6E490; Wed, 13 Jan 2016 01:19:35 +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 mx1.freebsd.org (Postfix) with ESMTPS id E67CB1C51; Wed, 13 Jan 2016 01:19:34 +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 u0D1JXFZ044836; Wed, 13 Jan 2016 01:19:33 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0D1JXcu044834; Wed, 13 Jan 2016 01:19:33 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201601130119.u0D1JXcu044834@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Wed, 13 Jan 2016 01:19:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405979 - in head/math/octave-forge-base: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2016 01:19:35 -0000 Author: stephen Date: Wed Jan 13 01:19:33 2016 New Revision: 405979 URL: https://svnweb.freebsd.org/changeset/ports/405979 Log: - Update to 1.4. The only change is to call octave-cli instead of octave. 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 Wed Jan 13 01:10:57 2016 (r405978) +++ head/math/octave-forge-base/Makefile Wed Jan 13 01:19:33 2016 (r405979) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-base -PORTVERSION= 1.3 +PORTVERSION= 1.4 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 Wed Jan 13 01:10:57 2016 (r405978) +++ head/math/octave-forge-base/files/load-octave-pkg.in Wed Jan 13 01:19:33 2016 (r405979) @@ -17,7 +17,7 @@ use File::Remove qw(remove); # Interrogate octave to see where it stores its packages. -open(OCTAVE,"octave -H -q --no-site-file --eval \"pkg('prefix');pkg('global_list')\" |") || die; +open(OCTAVE,"octave-cli -H -q --no-site-file --eval \"pkg('prefix');pkg('global_list')\" |") || die; my $install_prefix = || die; chomp $install_prefix; $install_prefix =~ s/.*\s+//; @@ -76,7 +76,7 @@ while (my $p = <$install_prefix/*>) { # out everything. my %check_installed; -open(OCTAVE,"octave -H -q --no-site-file --eval \"pkg('list')\" |") || die; +open(OCTAVE,"octave-cli -H -q --no-site-file --eval \"pkg('list')\" |") || die; ; my $out = join "",; while ($out =~ s/^\s*(\S+)\s*\|\s*(\S+).*$//m) { @@ -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//; - system "octave -H -q --no-site-file --eval \"pkg('uninstall','$p')\" > /dev/null"; + system "octave-cli -H -q --no-site-file --eval \"pkg('uninstall','$p')\" > /dev/null"; } } @@ -238,7 +238,7 @@ make_ordered_list_to_install(join("|",so foreach my $p (@ordered_list_to_install) { print "load-octave-pkg: octave is installing $p.\n"; - system "octave -H -q --no-site-file --eval \"pkg('install','$tardir/$p')\" > /dev/null\n"; + system "octave-cli -H -q --no-site-file --eval \"pkg('install','$tardir/$p')\" > /dev/null\n"; } # Remove directories that may have been left behind by the octave packaging