<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/93edd889ed0e1ef31279d22b7fa4a62aa42d3c50">https://github.com/macports/macports-ports/commit/93edd889ed0e1ef31279d22b7fa4a62aa42d3c50</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 93edd88 demeter: Update to 0.9.26
</span>93edd88 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 93edd889ed0e1ef31279d22b7fa4a62aa42d3c50
</span>Author: Joe Fowler <joe.fowler@nist.gov>
AuthorDate: Tue Nov 5 18:21:44 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> demeter: Update to 0.9.26
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55973
</span>---
science/demeter/Portfile | 23 +++----
.../demeter/files/patch-DocBuilder-Artemis.pm.diff | 28 --------
.../demeter/files/patch-DocBuilder-Athena.pm.diff | 28 --------
science/demeter/files/patch-build-darwin-fix.diff | 77 ++++++++++++++++++++++
4 files changed, 89 insertions(+), 67 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/demeter/Portfile b/science/demeter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e4082e3..3350736 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/demeter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/demeter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,12 @@ PortGroup github 1.0
</span>
set perl-version 5.28
perl5.branches ${perl-version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup bruceravel demeter 0.9.25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup bruceravel demeter 0.9.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ffabee287fe397551f3b6fa2d57900c43d9dd07a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 001e6a18a9150b8edffa1c00c81701003d13a300121e498207ab370d48542b28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 82922089
</span>
conflicts demeter-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,10 +26,6 @@ long_description Demeter is a comprehensive system for processing and analyzi
</span>
homepage https://bruceravel.github.io/demeter/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 be2d1eeec4e698d8630cf910a141640503ec5777 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 54801aa04d8e8f83ea3ecf52024eb75d34410c29c0188c8be8917f09bcd6efd2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 77389499
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:p${perl-version}-capture-tiny \
port:p${perl-version}-file-copy-recursive \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,6 +87,8 @@ configure.args --destdir ${destroot}
</span> build.cmd ./Build
build.target install
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-build-darwin-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# Put the main executables (perl scripts) into the PATH
ln -s ${prefix}/libexec/perl${perl-version}/sitebin/dartemis ${destroot}${prefix}/bin/artemis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,14 +101,14 @@ test.run yes
</span>
# At the moment, demeter-devel will use the most recent full release
subport demeter-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bruceravel demeter 0.9.25
</span> epoch 2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bruceravel demeter 0.9.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ffabee287fe397551f3b6fa2d57900c43d9dd07a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 001e6a18a9150b8edffa1c00c81701003d13a300121e498207ab370d48542b28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 82922089
</span>
conflicts demeter
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 be2d1eeec4e698d8630cf910a141640503ec5777 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 54801aa04d8e8f83ea3ecf52024eb75d34410c29c0188c8be8917f09bcd6efd2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 77389499
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # depends_lib-append port:p${perl-version}-encoding-fixlatin-xs
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/demeter/files/patch-DocBuilder-Artemis.pm.diff b/science/demeter/files/patch-DocBuilder-Artemis.pm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2aca585..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/demeter/files/patch-DocBuilder-Artemis.pm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- DocBuilder/Artemis.pm.orig 2014-07-07 14:00:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ DocBuilder/Artemis.pm 2014-07-07 14:02:12.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,14 +72,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print " configuring bin directory\n" if ($self->verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my $b (qw(build)) { # tex texbw pod mobile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unlink File::Spec->catfile('bin', $b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- system("tpage --define installdir=\"$id\" bin/$b.tt > bin/$b");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system("tpage-@@PERL-VERSION@@ --define installdir=\"$id\" bin/$b.tt > bin/$b");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod 0755, File::Spec->catfile('bin', $b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print " configuring etc directory\n" if ($self->verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my $b (qw(ttree)) { # ttree_tex ttree_texbw ttree_pod ttree_mobile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unlink File::Spec->catfile('etc', $b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- system("tpage --define installdir=\"$id\" etc/$b.tt > etc/$b.cfg");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system("tpage-@@PERL-VERSION@@ --define installdir=\"$id\" etc/$b.tt > etc/$b.cfg");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print " copying map and version templates\n" if ($self->verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $id = cwd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $verbose = q{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $verbose = "--verbose", if ($self->verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- system("ttree -f \"$id/etc/ttree.cfg\" --relative --trim $verbose");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system("ttree-@@PERL-VERSION@@ -f \"$id/etc/ttree.cfg\" --relative --trim $verbose");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chdir $here;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/demeter/files/patch-DocBuilder-Athena.pm.diff b/science/demeter/files/patch-DocBuilder-Athena.pm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 60000be..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/demeter/files/patch-DocBuilder-Athena.pm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- DocBuilder/Athena.pm.orig 2014-07-07 14:01:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ DocBuilder/Athena.pm 2014-07-07 14:01:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,14 +72,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print " configuring bin directory\n" if ($self->verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my $b (qw(build)) { # tex texbw pod mobile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unlink File::Spec->catfile('bin', $b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- system("tpage --define installdir=\"$id\" bin/$b.tt > bin/$b");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system("tpage-@@PERL-VERSION@@ --define installdir=\"$id\" bin/$b.tt > bin/$b");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod 0755, File::Spec->catfile('bin', $b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print " configuring etc directory\n" if ($self->verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my $b (qw(ttree)) { # ttree_tex ttree_texbw ttree_pod ttree_mobile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unlink File::Spec->catfile('etc', $b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- system("tpage --define installdir=\"$id\" etc/$b.tt > etc/$b.cfg");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system("tpage-@@PERL-VERSION@@ --define installdir=\"$id\" etc/$b.tt > etc/$b.cfg");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print " copying map and version templates\n" if ($self->verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $id = cwd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $verbose = q{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $verbose = "--verbose", if ($self->verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- system("ttree -f \"$id/etc/ttree.cfg\" --relative --trim $verbose");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system("ttree-@@PERL-VERSION@@ -f \"$id/etc/ttree.cfg\" --relative --trim $verbose");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chdir $here;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/demeter/files/patch-build-darwin-fix.diff b/science/demeter/files/patch-build-darwin-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..26cf61e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/demeter/files/patch-build-darwin-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,77 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DemeterBuilder.pm.orig 2018-02-07 13:30:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DemeterBuilder.pm 2019-11-05 10:39:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,64 +182,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print STDOUT "$term terminal.\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-## this is no longer needed -- Larch is tested for at runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-sub ACTION_test_for_larchserver {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # search for Python exe and Larch server script, write larch_server.ini
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my $inifile = File::Spec->catfile(cwd, 'lib', 'Demeter', 'share', 'ini', 'larch_server.ini');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print STDOUT "Looking for Python and Larch ---> ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my $larchexec = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (($^O eq 'MSWin32') or ($^O eq 'cygwin')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my @dirlist = split /;/, $ENV{'PATH'};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- push @dirlist, (File::Spec->catfile($ENV{LOCALAPPDATA}, 'Continuum', 'Anaconda3'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- File::Spec->catfile($ENV{LOCALAPPDATA}, 'Continuum', 'Anaconda2'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- File::Spec->catfile($ENV{LOCALAPPDATA}, 'Continuum', 'Anaconda'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- File::Spec->catfile($ENV{APPDATA}, 'Continuum', 'Anaconda3'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- File::Spec->catfile($ENV{APPDATA}, 'Continuum', 'Anaconda2'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- File::Spec->catfile($ENV{APPDATA}, 'Continuum', 'Anaconda'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'C:\Python27', 'C:\Python35');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- foreach my $d (@dirlist) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my $pyexe_ = File::Spec->catfile($d, 'python.exe');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my $larch_ = File::Spec->catfile($d, 'Scripts', 'larch_server');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((-e $pyexe_) && (-e $larch_)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $larchexec = "$pyexe_ $larch_";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- last;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my @dirlist = split /:/, $ENV{'PATH'};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- push @dirlist, (File::Spec->catfile($ENV{HOME}, 'anaconda3', 'bin'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- File::Spec->catfile($ENV{HOME}, 'anaconda2', 'bin'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- File::Spec->catfile($ENV{HOME}, 'anaconda', 'bin'));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- foreach my $d (@dirlist) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my $pyexe_ = File::Spec->catfile($d, 'python');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my $larch_ = File::Spec->catfile($d, 'larch_server');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((-e $pyexe_) && (-e $larch_)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $larchexec = "$pyexe_ $larch_";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- last;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ($larchexec eq '') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "not found\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "found $larchexec \n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my $larch_server_ini_text = <<"END_OF_FILE";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-server: 'localhost' # URL of larch_server or "localhost" is running locally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-port: 4966 # the port number the larch server is listening to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-timeout: 3 # the timeout in seconds before Demeter gives up trying to talk to the larch server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-quiet: 1 # 1 means to suppress larch_server screen messages, 0 means allow larch_server to print messages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-windows: $larchexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-END_OF_FILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- open(my $FOUT, '>', $inifile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print $FOUT $larch_server_ini_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- close $FOUT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Wrote $inifile\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub ACTION_compile_ifeffit_wrapper {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $self = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -278,9 +220,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qw{-lcpgplot -lpgplot -lGrWin -lgdi32 -lgfortran},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $compile_flags = $linker_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } elsif ($platform eq 'darwin') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ($pgplot_location, $compile_flags, $linker_flags) = (q{}, q{});
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $iffdir = `ifeffit -i 2>/dev/null`;
</span></pre><pre style='margin:0'>
</pre>