<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/b2817300adb2e5436183dc130d576e63f14ef9af">https://github.com/macports/macports-ports/commit/b2817300adb2e5436183dc130d576e63f14ef9af</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 b281730 auto-multiple-choice-devel: update to version 1.4.0-201912050859
</span>b281730 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b2817300adb2e5436183dc130d576e63f14ef9af
</span>Author: Joël Brogniart <joel.brogniart@jomamala.org>
AuthorDate: Wed Mar 18 16:07:43 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> auto-multiple-choice-devel: update to version 1.4.0-201912050859
</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-201912050859
</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-201912050859
</span><span style='display:block; white-space:pre;color:#404040;'> * solve printer access with old version of CUPS https://project.auto-multiple-choice.net/issues/688
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Close https://trac.macports.org/ticket/59521
</span>---
x11/auto-multiple-choice/Portfile | 15 ++++----
.../files/patch-cupslp-pm-684.diff | 42 ++++++++++++++++++++++
2 files changed, 51 insertions(+), 6 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 41696f4..f1734a5 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,15 +40,16 @@ if {${subport} eq ${name}} {
</span> conflicts auto-multiple-choice-devel
} else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set gitlab.commit "adb638a014e0a1da2419ee092d1a19210b16d3c9"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set amc_revision "201911160924"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set amc_date "201911160924"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gitlab.commit "fc646f9d08f9b1fc5d680de7ec84a8cdbf34aeb8"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set amc_revision "201912050859"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set amc_date "201912050859"
</span> version 1.4.0-${amc_revision}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0b48d68161f1bace705a2fa1508e3946dd5d6d36 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a2b0ac4b9599939e8c51d05ac7528bdab0cd91ccd67dd0c08b8b86373522fbff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5768018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5c43a192632b08ae022f861d0ee1cd71efb2a05e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f4406c246c8eb44c870539c5e7a45e422f51dd243465afe7750d15ca2aad1da2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5770205
</span> build.cmd ${prefix}/bin/gmake
conflicts auto-multiple-choice
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;background:#e0e0e0;'>@@ -99,6 +100,8 @@ configure {
</span> system -W ${worksrcpath} "${build.cmd} version_files AMCCONF=macports BASEPATH=${prefix} PERLPATH=${perl5.bin} PERLDIR=${perl5.lib} SYSTEM_TYPE=macports TEXDIR=${amc.texmflocal}/tex/latex/AMC TEXDOCDIR=${amc.texmflocal}/doc/latex/AMC"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append AMCCONF=macports BASEPATH=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-destroot {
destroot.args-append PERLDIR=${perl5.lib}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0df4153
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/auto-multiple-choice/files/patch-cupslp-pm-684.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- AMC-perl/AMC/Print/cupslp.pm.orig 2019-12-05 09:59:42.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ AMC-perl/AMC/Print/cupslp.pm 2020-01-09 15:22:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,14 +65,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub printers_list {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($self) = @_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my @list = ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- open( PL, "-|", "lpstat", "-e" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- or die "Can't exec lpstat: $!";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while (<PL>) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- chomp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- push @list, { name => $_, description => "" };
</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;'>++ # Verify if lpstat -e output to stderr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ open( PL, "-|", "lpstat -e 2>&1 1>/dev/null" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ or die "Can't exec lpstat: $!";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $err = <PL>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close PL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (@list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if($err) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # lpstat -e outputted to stderr so try lpstat -a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ open(PL,"-|","lpstat","-a")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ or die "Can't exec lpstat: $!";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while(<PL>) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ push @list,{name=>$1,description=>$1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(/^([^\s]+)\s+accept/);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ close PL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # lpstat -e outputted nothing to stderr so use it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ open( PL, "-|", "lpstat", "-e" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ or die "Can't exec lpstat: $!";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (<PL>) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ chomp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ push @list, { name => $_, description => "" };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ close PL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(@list);
</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 default_printer {
</span></pre><pre style='margin:0'>
</pre>