<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/68fd00495644008985c28d4c3888f0e826ba1697">https://github.com/macports/macports-ports/commit/68fd00495644008985c28d4c3888f0e826ba1697</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 68fd004 auto-multiple-choice-devel: update to version 1.4.0-202004101300
</span>68fd004 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 68fd00495644008985c28d4c3888f0e826ba1697
</span>Author: Joël Brogniart <joel.brogniart@jomamala.org>
AuthorDate: Fri Apr 10 16:25:18 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> auto-multiple-choice-devel: update to version 1.4.0-202004101300
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> auto-multiple-choice-devel: update to version 1.4.0-202004101300
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to version 1.4.0-202004101300
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove patch for cupslp.pm (patch incorporated upstream)
</span><span style='display:block; white-space:pre;color:#404040;'> * AMC can now send QCM as PDF forms via email and analyze completed forms.
</span>---
x11/auto-multiple-choice/Portfile | 13 ++++---
.../files/patch-cupslp-pm-684.diff | 42 ----------------------
2 files changed, 6 insertions(+), 49 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/auto-multiple-choice/Portfile b/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1734a5..b157ece 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,16 +40,15 @@ if {${subport} eq ${name}} {
</span> conflicts auto-multiple-choice-devel
} else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set gitlab.commit "fc646f9d08f9b1fc5d680de7ec84a8cdbf34aeb8"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set amc_revision "201912050859"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set amc_date "201912050859"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gitlab.commit "fd2136db5241e33dec5d920535d23000525b6b6d"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set amc_revision "202004101300"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set amc_date "202004101300"
</span> version 1.4.0-${amc_revision}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5c43a192632b08ae022f861d0ee1cd71efb2a05e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f4406c246c8eb44c870539c5e7a45e422f51dd243465afe7750d15ca2aad1da2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5770205
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 bb6b8faefbca2ba5293a6ba2861fffcdc26844c2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ce77a35e6c72d32645921cdf327e2fc9569f4146823c6d1d98d54ecdcb2edf31 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6522121
</span> build.cmd ${prefix}/bin/gmake
conflicts auto-multiple-choice
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-cupslp-pm-684.diff
</span> }
master_sites https://gitlab.com/jojo_boulix/auto-multiple-choice/repository/archive.tar.gz?ref=${gitlab.commit}&dummy=
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/auto-multiple-choice/files/patch-cupslp-pm-684.diff b/x11/auto-multiple-choice/files/patch-cupslp-pm-684.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0df4153..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/auto-multiple-choice/files/patch-cupslp-pm-684.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- AMC-perl/AMC/Print/cupslp.pm.orig 2019-12-05 09:59:42.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ AMC-perl/AMC/Print/cupslp.pm 2020-01-09 15:22:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,14 +65,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sub printers_list {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my ($self) = @_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my @list = ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- open( PL, "-|", "lpstat", "-e" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- or die "Can't exec lpstat: $!";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while (<PL>) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- chomp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- push @list, { name => $_, description => "" };
</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;'>-+ # Verify if lpstat -e output to stderr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ open( PL, "-|", "lpstat -e 2>&1 1>/dev/null" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ or die "Can't exec lpstat: $!";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $err = <PL>;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close PL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (@list);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if($err) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # lpstat -e outputted to stderr so try lpstat -a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ open(PL,"-|","lpstat","-a")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ or die "Can't exec lpstat: $!";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while(<PL>) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ push @list,{name=>$1,description=>$1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(/^([^\s]+)\s+accept/);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ close PL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # lpstat -e outputted nothing to stderr so use it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ open( PL, "-|", "lpstat", "-e" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ or die "Can't exec lpstat: $!";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (<PL>) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ chomp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ push @list, { name => $_, description => "" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ close PL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return(@list);
</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;'>- sub default_printer {
</span></pre><pre style='margin:0'>
</pre>