<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/81fc7338ca1b52b33d237c730169f603a9d41714">https://github.com/macports/macports-ports/commit/81fc7338ca1b52b33d237c730169f603a9d41714</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 81fc7338ca1 auto-multiple-choice: migrate to opencv3
</span>81fc7338ca1 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 81fc7338ca1b52b33d237c730169f603a9d41714
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jun 13 13:38:59 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    auto-multiple-choice: migrate to opencv3
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/62774
</span>---
 x11/auto-multiple-choice/Portfile                  | 13 +++++++++-
 .../files/patch-opencv3-makefile.diff              | 28 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

<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 cb463cf9003..49e9594e2f1 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;'>@@ -24,15 +24,26 @@ subport auto-multiple-choice-devel {}
</span> if {${subport} eq ${name}} {
     # release
     version                 1.4.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision                1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     checksums               rmd160  1c4774798321281f2fa76d0fcaeb490bd6ac58d3 \
                             sha256  6d447bc5053fd2a57f854ead33ac50bb5c3a09e99e6f662c85febc5eb85a9fad \
                             size    8513750
 
     perl5.branches          5.28
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:opencv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:opencv3
</span> 
     conflicts               auto-multiple-choice-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Patches specific to v1.4.x; won't be needed once v1.5 released
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append       patch-opencv3-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@MACPORTS_PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
     # devel
     set amc.version.main        1.5.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/auto-multiple-choice/files/patch-opencv3-makefile.diff b/x11/auto-multiple-choice/files/patch-opencv3-makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bbb215c479a
</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-opencv3-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile       2021-06-13 12:26:27.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.new   2021-06-13 14:03:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,20 +40,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS ?= -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS ?= -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# try to find right names for OpenCV libs 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BASEDIR=@@MACPORTS_PREFIX@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(GCC_OPENCV_LIBS),auto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(shell echo 'int main(){}' | gcc -xc -lopencv_imgcodecs - && ( rm -f a.out ; echo "OK")),OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  GCC_OPENCV_LIBS:=-lopencv_core -lopencv_imgproc -lopencv_imgcodecs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else ifeq ($(shell echo 'int main(){}' | gcc -xc -lopencv_core - && ( rm -f a.out ; echo "OK")),OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  GCC_OPENCV_LIBS:=-lopencv_core -lopencv_highgui -lopencv_imgproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  GCC_OPENCV_LIBS:=-lcv -lhighgui -lcxcore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPENCV_LIBDIR=$(BASEDIR)/lib/opencv3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPENCV_PKGCONFIG=$(BASEDIR)/lib/opencv3/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GCC_OPENCV ?= $(shell pkg-config --cflags opencv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GCC_OPENCV_LIBS ?= $(shell pkg-config --libs opencv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GCC_OPENCV=$(shell pkg-config --cflags $(OPENCV_PKGCONFIG))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GCC_OPENCV_LIBS=$(shell pkg-config --libs $(OPENCV_PKGCONFIG))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_PDF ?= $(shell pkg-config --cflags --libs cairo pangocairo poppler-glib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_POPPLER ?= $(shell pkg-config --cflags --libs poppler-glib gio-2.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>