<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/da43f28c7cbc5a55eb7606c9b22f80de0877d0cb">https://github.com/macports/macports-ports/commit/da43f28c7cbc5a55eb7606c9b22f80de0877d0cb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit da43f28c7cbc5a55eb7606c9b22f80de0877d0cb
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Dec 26 12:33:27 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> opendx: fix dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add dependency for any port OpenDX explicitly uses.
</span><span style='display:block; white-space:pre;color:#404040;'> Fix check for ImageMagick.
</span>---
science/opendx/Portfile | 27 +++++++---
science/opendx/files/patch-imagemagick.diff | 81 +++++++++++++++++++++++++++++
2 files changed, 101 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opendx/Portfile b/science/opendx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f2dc89..d7cdb4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/opendx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opendx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup deprecated 1.0
</span>
name opendx
version 4.4.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 10
</span> categories science
license Permissive
# "IBM PUBLIC LICENSE", http://opendx.org/dlSource.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +34,25 @@ checksums rmd160 db4cff78c9712a6e1e19265b0f42fdb87ab5ff7b \
</span>
distname dx-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:netcdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:ImageMagick \
</span> port:cdf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cosmoplayer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opendx-java40 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libXm.dylib:openmotif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf4 \
</span> port:libGLU \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netcdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib:libXm:openmotif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXmu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libice \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xpm
</span>
# cdf is not universal
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +61,8 @@ patchfiles configure.ac.diff \
</span> patch-src-exec-dpexec-packet.c.diff \
patch-src-exec-dxmods-local.mk.in.diff \
main.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-uipp-java-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-uipp-java-Makefile.am.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-imagemagick.diff
</span>
# see https://trac.macports.org/ticket/56716
# fix missing -c flag
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opendx/files/patch-imagemagick.diff b/science/opendx/files/patch-imagemagick.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..596c195
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opendx/files/patch-imagemagick.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,81 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2006-08-21 14:56:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2019-12-26 11:18:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -792,77 +792,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for IMAGEMAGICK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-have_magick='no'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_MAGICK=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$with_magick" != 'no'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_MESSAGE([checking for ImageMagick support ......])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_PROG(HAVE_MC, Magick-config, yes, no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- failed=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- passed=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "$ARCH" = "intelnt" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING(if ImageMagick package is complete)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test $passed -gt 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test $failed -gt 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT(no -- some components failed test)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_magick='no (failed tests)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$with_smagick" != 'no'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_MAGICK='-lCORE_RL_magick_ -lCORE_RL_bzlib_ -lCORE_RL_coders_ -lCORE_RL_filters_ -lCORE_RL_jbig_ -lCORE_RL_jbig_ -lCORE_RL_jp2_ -lCORE_RL_jpeg_ -lCORE_RL_lcms_ -lCORE_RL_libxml_ -lCORE_RL_png_ -lCORE_RL_tiff_ -lCORE_RL_ttf_ -lCORE_RL_wand_ -lCORE_RL_wmf_ -lCORE_RL_zlib_'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_MAGICK='-lCORE_RL_magick_'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS="$LIB_MAGICK $LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FMT_LIBS="$FMT_LIBS CORE_RL_magick_.lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT(yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_magick='yes'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT(no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl -- check for unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl The ImageMagick configuration can be collected with an ImageMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl routine. This allows us to simplify the configuration of all the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl format configuration libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$HAVE_MC" = "yes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING(if ImageMagick package is complete)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test $passed -gt 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test $failed -gt 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT(no -- some components failed test)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_magick='no (failed tests)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl CFLAGS="`Magick-config --cflags` $CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="`Magick-config --cppflags` $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_MAGICK="$LIBS `Magick-config --ldflags` `Magick-config --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl UNIQUIFY will remove duplicate library tokens leaving the last instance.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_UTILS_UNIQUIFY($LIB_MAGICK, LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FMT_LIBS="$FMT_LIBS libMagick.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS="$LIBS `Magick-config --ldflags` `Magick-config --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT(yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_magick='yes'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT(no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT(no - Magick-config not found)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_LANG([C++])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a = true;]])],
</span></pre><pre style='margin:0'>
</pre>