<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/29c9642e2ed91a762f1625047fd68fb5fe1b08a0">https://github.com/macports/macports-ports/commit/29c9642e2ed91a762f1625047fd68fb5fe1b08a0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 29c9642e2ed91a762f1625047fd68fb5fe1b08a0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Sep 10 22:37:10 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Use jasper2 where needed
</span>---
devel/libdevil/Portfile | 13 ++++++-------
graphics/exact-image/Portfile | 9 ++++++---
graphics/xv/Portfile | 6 +++---
kde/digikam/Portfile | 7 ++++---
kde/kdelibs4/Portfile | 9 +++++----
kde/kopete/Portfile | 9 +++++----
science/wgrib2/Portfile | 9 ++++-----
7 files changed, 33 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdevil/Portfile b/devel/libdevil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 327a5572e4a..c99aaf3e05b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdevil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdevil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,13 +7,12 @@ PortGroup muniversal 1.0
</span> name libdevil
conflicts ResIL
version 1.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 411efa9982a1dfd9075536a80c1eb3d8c2ed15e8 \
sha256 0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709 \
size 3084833
categories devel multimedia
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license LGPL-2.1
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +35,7 @@ master_sites sourceforge:project/openil/DevIL/${version}
</span> distname DevIL-${version}
worksrcdir DevIL/DevIL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/jasper.pc:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:jasper2 \
</span> path:include/turbojpeg.h:libjpeg-turbo \
port:lcms2 \
port:libmng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,10 +57,10 @@ configure.env OPENEXR_DIR=${prefix}
</span>
# I don't know what the deal is with plural vs. singular cmake flags.
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARIES=${prefix}/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARY=${prefix}/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIR=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIRS=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARIES=${prefix}/libexec/jasper2/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARY=${prefix}/libexec/jasper2/lib/libjasper.dylib \
</span> -DJPEG_INCLUDE_DIR=${prefix}/include \
-DJPEG_INCLUDE_DIRS=${prefix}/include \
-DJPEG_LIBRARIES=${prefix}/lib/libjpeg.dylib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/exact-image/Portfile b/graphics/exact-image/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4130d4adfa9..d1a1c841457 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/exact-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/exact-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,13 +5,12 @@ PortGroup legacysupport 1.0
</span>
name exact-image
version 1.0.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 2d33b4139e33f547ba3c7b7025f5045abdf5a17a \
sha256 0694c66be5dec41377acead475de69b3d7ffb42c702402f8b713f8b44cdc2791 \
size 322174
categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-2
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +32,7 @@ patchfiles-append patch-codecs-jpeg2000.diff
</span> depends_build port:pkgconfig
depends_lib port:antigraingeometry \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/jasper.pc:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jasper2 \
</span> port:expat \
port:openexr \
port:lcms
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +66,10 @@ configure.post_args-append " && printenv >> config.make"
</span> # build system.
configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Find jasper2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-prepend -isystem${prefix}/libexec/jasper2/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-prepend -L${prefix}/libexec/jasper2/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 1998
configure.cxxflags-append -std=gnu++98
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xv/Portfile b/graphics/xv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a07471a606..cee9c670693 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/xv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ PortSystem 1.0
</span> name xv
version 3.10a
set jumbo_version 20070520
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 16
</span> # 3.10a was stealth-updated (with no consequential changes); remove this line when updating to next proper version
dist_subdir ${name}/${version}_1
categories graphics x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,6 @@ long_description xv is an interactive image manipulation program for \
</span> use only, please read the license agreement.
homepage http://www.trilon.com/xv/xv.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
master_sites ftp://ftp.trilon.com/pub/xv/:xv \
sourceforge:project/png-mng/XV%20jumbo%20patches/${jumbo_version}:xv-jumbo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +47,7 @@ depends_lib port:xorg-libXt \
</span> path:include/turbojpeg.h:libjpeg-turbo \
port:tiff \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/jasper.pc:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jasper2 \
</span> port:zlib
pre-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +68,7 @@ variant universal {}
</span> build.post_args PREFIX='${prefix}' \
ZLIBDIR='${prefix}' \
JPEGDIR='${prefix}' \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ JP2KDIR='${prefix}/libexec/jasper2' \
</span> TIFFDIR='${prefix}' \
PNGDIR='${prefix}' \
CC='${configure.cc}' \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/digikam/Portfile b/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8bfeec30ae4..c44144ebbac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name digikam
version 4.9.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 14
</span>
# TODO: Remove, if/when this port is fixed
known_fail yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,6 @@ categories kde kde4
</span> license GPL-2+
maintainers openmaintainer \
gmail.com:caulier.gilles
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
description Photo Management Programme
long_description Digital photo management programme to import, organise, enhance, search and export your digital images.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +66,7 @@ depends_lib-append port:gettext \
</span> port:libgphoto2 \
port:liblqr \
path:lib/pkgconfig/libusb-1.0.pc:libusb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/jasper.pc:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jasper2 \
</span> port:shared-desktop-ontologies
# RunTime dependencies
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,6 +108,8 @@ configure.args-append -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON \
</span> -DOpenCV_DIR=${prefix}/libexec/opencv${opencv_ver}/cmake \
-DDIGIKAMSC_COMPILE_LIBKGEOMAP:BOOL=ON -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE:BOOL=ON \
-DDIGIKAMSC_COMPILE_LIBMEDIAWIKI:BOOL=ON -DDIGIKAMSC_COMPILE_LIBKFACE:BOOL=ON \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIR:FILEPATH=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARY_RELEASE:FILEPATH=${prefix}/libexec/jasper2/lib \
</span> -Wno-dev \
../${distname}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdelibs4/Portfile b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6918337aaba..eb0c2b1ebf5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,13 +5,12 @@ PortGroup kde4 1.1
</span>
name kdelibs4
version 4.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 18
</span> categories kde kde4
maintainers {nicos @NicosPavlov}
license LGPL-2+ GPL-2+ BSD
description KDE4 core libraries
long_description Core libraries for KDE4 applications to function
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage https://www.kde.org
master_sites kde:stable/${version}/src/
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +33,7 @@ depends_lib-append port:bzip2 port:zlib \
</span> port:pcre port:shared-mime-info \
port:giflib \
path:include/turbojpeg.h:libjpeg-turbo port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/jasper.pc:jasper port:openexr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jasper2 port:openexr \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/libssl.dylib:openssl port:enchant \
port:aspell port:aspell-dict-en \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +87,9 @@ configure.args-append -DWITH_ENCHANT=ON \
</span> -DKDE_DEFAULT_HOME=Library/Preferences/KDE \
-DWITH_HSPELL=OFF \
-DWITH_FAM=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKDE4_AUTH_BACKEND_NAME="OSX"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DKDE4_AUTH_BACKEND_NAME="OSX" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIR:FILEPATH=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARY_RELEASE:FILEPATH=${prefix}/libexec/jasper2/lib
</span>
# Install the kdelibs headerfiles in their own directory to prevent clashes with KF5 headers
configure.args-append -DINCLUDE_INSTALL_DIR=${kde4.include_dirs}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kopete/Portfile b/kde/kopete/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd9b274550a..b991e6621dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kopete/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kopete/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup kde4 1.1
</span>
name kopete
version 4.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span> categories kde kde4
license GPL-2+ LGPL-2+
maintainers {nicos @NicosPavlov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,6 @@ description KDE-based instant messenger
</span> long_description Kopete is an instant messenger supporting ICQ, \
Yahoo, Jabber, Gadu-Gadu, Novell \
GroupWise Messenger, and more.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage http://kopete.kde.org
master_sites kde:stable/${version}/src/
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +35,7 @@ depends_lib-append port:kdelibs4 \
</span> port:libmsn \
port:giflib \
port:expat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/jasper.pc:jasper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jasper2
</span>
configure.args-append -DWITH_Libgadu=OFF \
-DWITH_msiLBC=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +43,9 @@ configure.args-append -DWITH_Libgadu=OFF \
</span> -DWITH_LibMeanwhile=OFF \
-DWITH_meanwhile=OFF \
-DWITH_Mediastreamer=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_nowlistening=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_nowlistening=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIR:FILEPATH=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARY_RELEASE:FILEPATH=${prefix}/libexec/jasper2/lib
</span>
patchfiles-append patch-no-xmms.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/Portfile b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a6d0104ace..962a0519e2b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,7 @@ legacysupport.newest_darwin_requires_legacy 10
</span>
name wgrib2
version 3.0.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> maintainers {takeshi @tenomoto}
license public-domain
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +33,7 @@ compilers.setup require_fortran -clang33 -clang34
</span> compilers.allow_arguments_mismatch yes
depends_extract bin:gnutar:gnutar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/jasper.pc:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:jasper2 \
</span> port:libpng \
port:netcdf \
port:hdf5 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,8 +63,8 @@ set lipolate ${ip}/libip2_d.a
</span> set g2c ${worksrcpath}/g2clib-${version_g2clib}
set lg2c ${g2c}/libgrib2c.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-prepend -I${prefix}/lib/libaec/include -DJAS_VERSION_MAJOR=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-prepend -L${prefix}/lib/proj5/lib -L${prefix}/lib/libaec/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-prepend -I${prefix}/lib/libaec/include -I${prefix}/libexec/jasper2/include -DJAS_VERSION_MAJOR=2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-prepend -L${prefix}/lib/proj5/lib -L${prefix}/lib/libaec/lib ${prefix}/libexec/jasper2/lib
</span> variant universal {}
set cflags "${configure.cflags} [get_canonical_archflags cc]"
set ldflags "${configure.ldflags} [get_canonical_archflags ld]"
</pre><pre style='margin:0'>
</pre>