<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/cac8f8397ca2439143934fb09559e7cc9c775e42">https://github.com/macports/macports-ports/commit/cac8f8397ca2439143934fb09559e7cc9c775e42</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 cac8f8397ca auto-multiple-choice: update to version 1.5.0
</span>cac8f8397ca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cac8f8397ca2439143934fb09559e7cc9c775e42
</span>Author: Joël Brogniart <joel.brogniart@jomamala.org>
AuthorDate: Tue Oct 12 10:10:22 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> auto-multiple-choice: update to version 1.5.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> auto-multiple-choice: update to version 1.5.0-1-g7ad0c6c6
</span><span style='display:block; white-space:pre;color:#404040;'> auto-multiple-choice-devel : update to version 1.5.0-3-g3f13eaba
</span>---
x11/auto-multiple-choice/Portfile | 47 ++++++++--------------
.../files/patch-opencv3-makefile.diff | 28 -------------
2 files changed, 17 insertions(+), 58 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 49e9594e2f1..252da2b6d24 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;'>@@ -19,50 +19,37 @@ long_description Utility to manage multiple choice questionnaires, \
</span>
homepage http://www.auto-multiple-choice.net/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport auto-multiple-choice-devel {}
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1c4774798321281f2fa76d0fcaeb490bd6ac58d3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6d447bc5053fd2a57f854ead33ac50bb5c3a09e99e6f662c85febc5eb85a9fad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8513750
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- perl5.branches 5.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:opencv3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set amc.version.main 1.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set amc.version.secondary 1-g7ad0c6c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 eec8abdce3b026cdbb4e721d95aeb6037924148d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 28c1d9ed2ff0b8fa9b8c2e0a9a28d405dbae3121af2bf486624ad5ca546069ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11190366
</span>
conflicts auto-multiple-choice-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Patches specific to v1.4.x; won't be needed once v1.5 released
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-opencv3-makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } else {
# devel
set amc.version.main 1.5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set amc.version.secondary rc2-4-g4357dcbf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${amc.version.main}_${amc.version.secondary}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e258d7fb16af0b71f06573b0f088f730856bfdd0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a02734bf0177bae3fb72d34f80863c3dc0f74f2080244d22e50bc629cfa0c788 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11125547
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- perl5.branches 5.30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set opencv_ver 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:opencv${opencv_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PKG_CONFIG_PATH=${prefix}/lib/opencv${opencv_ver}/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set amc.version.secondary 3-g3f13eaba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a340e46fd9ca22ebc27fd867d2641ca4c3da1819 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5a18f33bf1155ce2fd85aad75c408122f80fab06980244ae3412773f461bdb58 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11190764
</span>
conflicts auto-multiple-choice
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${amc.version.main}-${amc.version.secondary}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set opencv_ver 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:opencv${opencv_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PKG_CONFIG_PATH=${prefix}/lib/opencv${opencv_ver}/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> master_sites https://download.auto-multiple-choice.net/precomp/
distfiles ${name}_${version}_dist${extract.suffix}
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bbb215c479a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/auto-multiple-choice/files/patch-opencv3-makefile.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;'>---- Makefile 2021-06-13 12:26:27.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.new 2021-06-13 14:03:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,20 +40,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS ?= -O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS ?= -O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# try to find right names for OpenCV libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BASEDIR=@@MACPORTS_PREFIX@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(GCC_OPENCV_LIBS),auto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--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:#ffe0e0;'>-- GCC_OPENCV_LIBS:=-lopencv_core -lopencv_imgproc -lopencv_imgcodecs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--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:#ffe0e0;'>-- GCC_OPENCV_LIBS:=-lopencv_core -lopencv_highgui -lopencv_imgproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GCC_OPENCV_LIBS:=-lcv -lhighgui -lcxcore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPENCV_LIBDIR=$(BASEDIR)/lib/opencv3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPENCV_PKGCONFIG=$(BASEDIR)/lib/opencv3/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GCC_OPENCV ?= $(shell pkg-config --cflags opencv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GCC_OPENCV_LIBS ?= $(shell pkg-config --libs opencv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GCC_OPENCV=$(shell pkg-config --cflags $(OPENCV_PKGCONFIG))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GCC_OPENCV_LIBS=$(shell pkg-config --libs $(OPENCV_PKGCONFIG))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_PDF ?= $(shell pkg-config --cflags --libs cairo pangocairo poppler-glib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_POPPLER ?= $(shell pkg-config --cflags --libs poppler-glib gio-2.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>