Merge remote-tracking branch 'netbsd/trunk' into joyent/release/trunk

archivers/py-zipp/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2022/01/04 20:52:31 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/07/29 09:02:47 adam Exp $
 
-DISTNAME=	zipp-3.4.1
+DISTNAME=	zipp-3.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	archivers python
 MASTER_SITES=	${MASTER_SITE_PYPI:=z/zipp/}
 
@@ -11,13 +10,20 @@ HOMEPAGE=	https://github.com/jaraco/zipp
 COMMENT=	Backport of pathlib-compatible object wrapper for zip files
 LICENSE=	mit
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
+BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=3.4.1:../../devel/py-setuptools_scm
+BUILD_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 TEST_DEPENDS+=	${PYPKGPREFIX}-jaraco.itertools-[0-9]*:../../devel/py-jaraco.itertools
 TEST_DEPENDS+=	${PYPKGPREFIX}-func_timeout-[0-9]*:../../devel/py-func_timeout
+TEST_DEPENDS+=	${PYPKGPREFIX}-test>=6:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
 
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-.include "../../lang/python/egg.mk"
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
+
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

archivers/py-zipp/PLIST

@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2019/05/29 19:48:29 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2022/07/29 09:02:47 adam Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/zipp.py
 ${PYSITELIB}/zipp.pyc
-${PYSITELIB}/zipp.pyo

archivers/py-zipp/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 09:57:14 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/07/29 09:02:47 adam Exp $
 
-BLAKE2s (zipp-3.4.1.tar.gz) = 669aeceb7873dd3a30551d9ad2630533096770cb20e8b3605ae4b41f9c17570d
-SHA512 (zipp-3.4.1.tar.gz) = 2ba50109efd0ceea9eb1d57e2d839f522b5a78a8dae344d6da54b79305dd46bff23f1116f562127290152c0b100369439c17fe9dc3fb14d0b42beaa48348ebe6
-Size (zipp-3.4.1.tar.gz) = 16545 bytes
+BLAKE2s (zipp-3.8.1.tar.gz) = 83201a9adf1194b19a12eab8754d3ae4fb7e44d461ac58c3fa127883555b535f
+SHA512 (zipp-3.8.1.tar.gz) = 05639feb20c7e8d3480ce17a52115a85bb2f0706ee0c1b15589b7556bb914ef30a1a34fa743217694b753bb5e72095c90fab7dfee85f2dbf461347322acb4d2e
+Size (zipp-3.8.1.tar.gz) = 14189 bytes

audio/musicpd/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.273 2022/07/26 07:38:42 wiz Exp $
+# $NetBSD: Makefile,v 1.274 2022/07/27 09:42:45 wiz Exp $
 
 DISTNAME=	mpd-0.23.8
 PKGNAME=	${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.xz

audio/musicpd/distinfo

@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.139 2022/07/12 21:20:40 triaxx Exp $
+$NetBSD: distinfo,v 1.140 2022/07/27 09:42:45 wiz Exp $
 
 BLAKE2s (mpd-0.23.8.tar.xz) = f7573d127356d7e8a2042086abdd4b65eedd9eea85b80505a26277a7a892a898
 SHA512 (mpd-0.23.8.tar.xz) = 62f7571de29a329b8ef1fc6f7c338125e70895e06fca134eb9ade19635498ec13da00511870bfadabc5a9ccb090c44543d3101361ffe109e4fadce66435b37ab
 Size (mpd-0.23.8.tar.xz) = 773280 bytes
 SHA1 (patch-doc_mpd.conf.5.rst) = ee22092564075cdf7917e4e66687f6ab98b5817c
+SHA1 (patch-src_decoder_plugins_FfmpegIo.cxx) = 01a0dede40448c1b145f2465531fd063550bd360
 SHA1 (patch-src_decoder_plugins_meson.build) = 8033d6e19da05f472f14f3562a5dfc2f410da98b
 SHA1 (patch-src_net_IPv6Address.hxx) = f89b838ad5e946c5db8d95a6dd560e02bdccae29
 SHA1 (patch-src_util_WStringAPI.hxx) = 92f39096770943c26d8aaae8a7581d4daca2d233

audio/musicpd/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.43 2022/07/26 07:38:42 wiz Exp $
+# $NetBSD: options.mk,v 1.44 2022/07/27 09:42:45 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.musicpd
 
@@ -83,10 +83,7 @@ MESON_ARGS+=	-Dfaad=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mffmpeg)
-# needs 5.1 support
-# https://github.com/MusicPlayerDaemon/MPD/issues/1582
-#.  include "../../multimedia/ffmpeg5/buildlink3.mk"
-.  include "../../multimedia/ffmpeg4/buildlink3.mk"
+.  include "../../multimedia/ffmpeg5/buildlink3.mk"
 .else
 MESON_ARGS+=	-Dffmpeg=disabled
 .endif

audio/musicpd/patches/patch-src_decoder_plugins_FfmpegIo.cxx

@@ -0,0 +1,22 @@
+$NetBSD: patch-src_decoder_plugins_FfmpegIo.cxx,v 1.1 2022/07/27 09:42:45 wiz Exp $
+
+Fix build with ffmpeg 5.1.
+https://github.com/MusicPlayerDaemon/MPD/commit/59792cb0b801854ee41be72d33db9542735df754
+
+--- src/decoder/plugins/FfmpegIo.cxx.orig	2022-07-08 23:05:38.000000000 +0000
++++ src/decoder/plugins/FfmpegIo.cxx
+@@ -21,10 +21,13 @@
+ #define __STDC_CONSTANT_MACROS
+
+ #include "FfmpegIo.hxx"
+-#include "libavutil/mem.h"
+ #include "../DecoderAPI.hxx"
+ #include "input/InputStream.hxx"
+
++extern "C" {
++#include "libavutil/mem.h"
++}
++
+ AvioStream::~AvioStream()
+ {
+ 	if (io != nullptr) {

audio/speech-dispatcher/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/06/30 11:18:03 nia Exp $
+# $NetBSD: Makefile,v 1.27 2022/07/29 16:29:08 jperkin Exp $
 
 DISTNAME=	speech-dispatcher-0.10.2
 PKGREVISION=	5
@@ -33,6 +33,8 @@ CONFIGURE_ARGS+=	--without-nas
 CONFIGURE_ARGS+=	--without-oss
 CONFIGURE_ARGS+=	--without-pulse
 
+LIBS.SunOS+=	-lintl
+
 .include "../../mk/bsd.prefs.mk"
 
 PKGCONFIG_OVERRIDE+=	speech-dispatcher.pc.in

chat/swirc/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2022/06/27 15:29:13 fcambus Exp $
+# $NetBSD: Makefile,v 1.6 2022/07/28 22:18:05 fcambus Exp $
 
-DISTNAME=	swirc-3.3.4
+DISTNAME=	swirc-3.3.5
 CATEGORIES=	chat
 MASTER_SITES=	https://www.nifty-networks.net/swirc/releases/
 EXTRACT_SUFX=	.tgz

chat/swirc/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2022/05/05 07:02:46 fcambus Exp $
+$NetBSD: distinfo,v 1.3 2022/07/28 22:18:05 fcambus Exp $
 
-BLAKE2s (swirc-3.3.4.tgz) = 23f4591fc38bb0d2f8e1130fa692266a3b8031e5e930bd1e1d6ef4777552168a
-SHA512 (swirc-3.3.4.tgz) = 5316160f77349ac6317bb7ed32de09ff6dfe355d32c6e670f6270bb7afdb5808d665f07a8cdebca30d97476236c56fa5a2e9578e829bc494d46274515a809c55
-Size (swirc-3.3.4.tgz) = 271603 bytes
+BLAKE2s (swirc-3.3.5.tgz) = 9723254acc50f0b8680c4f78bdef7934c1984a7b7fa91201360d4ee648862145
+SHA512 (swirc-3.3.5.tgz) = 424b567709cd82aa84efb2623b52d4586077dab5e025c3dce8fae382a5de2a4531819b1f7fde353b84c462c7c7b6cac6142c7d807d05f534a7599d706237d4ee
+Size (swirc-3.3.5.tgz) = 291300 bytes

converters/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2022/07/03 12:10:32 wiz Exp $
+# $NetBSD: Makefile,v 1.196 2022/07/27 19:05:47 rhialto Exp $
 #
 
 COMMENT=	Document format and character code converters
@@ -122,6 +122,7 @@ SUBDIR+=	py-chardet4
 SUBDIR+=	py-charset-normalizer
 SUBDIR+=	py-confusable_homoglyphs
 SUBDIR+=	py-emoji
+SUBDIR+=	py-fastbencode
 SUBDIR+=	py-jpCodecs
 SUBDIR+=	py-reedsolo
 SUBDIR+=	py-simplejson

converters/py-fastbencode/DESCR

@@ -0,0 +1,6 @@
+fastbencode is an implementation of the bencode serialization format
+originally used by BitTorrent.
+
+The package includes both a pure-Python version and an optional C
+extension based on Cython. Both provide the same functionality, but the
+C extension provides significantly better performance.

converters/py-fastbencode/Makefile

@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2022/07/27 18:40:31 rhialto Exp $
+
+DISTNAME=	fastbencode-0.0.9
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	converters python
+MASTER_SITES+=	${MASTER_SITE_PYPI:=f/fastbencode/}
+
+MAINTAINER=	rhialto@NetBSD.org
+HOMEPAGE=	https://github.com/breezy-team/fastbencode
+COMMENT=	Implementation of bencode with optional fast C extensions
+LICENSE=	gnu-gpl-v2
+
+BUILD_DEPENDS+=	${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"

converters/py-fastbencode/PLIST

@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST,v 1.1 2022/07/27 18:40:31 rhialto Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/fastbencode/__init__.py
+${PYSITELIB}/fastbencode/__init__.pyc
+${PYSITELIB}/fastbencode/__init__.pyo
+${PYSITELIB}/fastbencode/_bencode_py.py
+${PYSITELIB}/fastbencode/_bencode_py.pyc
+${PYSITELIB}/fastbencode/_bencode_py.pyo
+${PYSITELIB}/fastbencode/_bencode_pyx.so

converters/py-fastbencode/distinfo

@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/07/27 18:40:31 rhialto Exp $
+
+BLAKE2s (fastbencode-0.0.9.tar.gz) = 49957139af29e19dd453617a1ff9834d07bfd32d22312edc0065c64b22a5fe49
+SHA512 (fastbencode-0.0.9.tar.gz) = 72ae5bfbd9d4ef44296c29e60f470fae99d62260a031b8612b785dba9617649c1e3f80c664633c852bf43adf4e1f2434cb514d1e3e35600f33126357a4ad26a1
+Size (fastbencode-0.0.9.tar.gz) = 84064 bytes

devel/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3767 2022/07/24 11:04:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3768 2022/07/29 16:35:15 wiz Exp $
 #
 
 COMMENT=	Development utilities
@@ -798,6 +798,7 @@ SUBDIR+=	lemon
 SUBDIR+=	lettuce
 SUBDIR+=	libFoundation
 SUBDIR+=	libFoundation-examples
+SUBDIR+=	libadwaita
 SUBDIR+=	libantlr3c
 SUBDIR+=	libappindicator
 SUBDIR+=	libarena

devel/at-spi2-core/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2022/06/07 20:45:56 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2022/07/29 16:29:08 jperkin Exp $
 
 DISTNAME=	at-spi2-core-2.40.3
 PKGREVISION=	2
@@ -17,6 +17,8 @@ PKGCONFIG_OVERRIDE=		output/meson-private/atspi-2.pc
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
 MAKE_ENV+=			LD_LIBRARY_PATH=${WRKSRC}/output/atspi
 
+LIBS.SunOS+=	-lintl
+
 BUILD_DEFS+=		PKG_SYSCONFBASE
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}

devel/breezy/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2022/06/30 11:18:11 nia Exp $
+# $NetBSD: Makefile,v 1.13 2022/07/27 18:52:41 rhialto Exp $
 
 DISTNAME=	breezy-3.2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel scm
 MASTER_SITES=	https://launchpad.net/brz/${PKGVERSION_NOREV:R}/${PKGVERSION_NOREV}/+download/
 
@@ -13,10 +13,11 @@ LICENSE=	gnu-gpl-v2
 # For building from repo instead of release tarball:
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-cython>=0:../../devel/py-cython
 DEPENDS+=		${PYPKGPREFIX}-configobj>0:../../devel/py-configobj
-DEPENDS+=		${PYPKGPREFIX}-dulwich>0:../../devel/py-dulwich
+DEPENDS+=		${PYPKGPREFIX}-dulwich>=0.20.23:../../devel/py-dulwich
+DEPENDS+=		${PYPKGPREFIX}-fastbencode>=0.0.9:../../converters/py-fastbencode
 DEPENDS+=		${PYPKGPREFIX}-fastimport>0:../../devel/py-fastimport
-DEPENDS+=		${PYPKGPREFIX}-six>0:../../lang/py-six
 DEPENDS+=		${PYPKGPREFIX}-patiencediff>=0.2.2:../../textproc/py-patiencediff
+DEPENDS+=		${PYPKGPREFIX}-six>0:../../lang/py-six
 # Not yet packaged; only needed for lp: shortcuts.
 #DEPENDS+=		${PYPKGPREFIX}-launchpadlib>=1.6.3:../../devel/py-launchpadlib
 TEST_DEPENDS+=		${PYPKGPREFIX}-testtools>=0:../../devel/py-testtools

devel/cmake/Makefile

@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.193 2022/06/29 11:34:47 thor Exp $
+# $NetBSD: Makefile,v 1.194 2022/07/29 10:40:21 adam Exp $
 
 .include "Makefile.common"
 
 COMMENT=	Cross platform make
-PKGREVISION=	1
 
 USE_TOOLS+=		gmake
 GCC_REQD+=		4.8

devel/cmake/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.196 2022/06/29 11:34:47 thor Exp $
+$NetBSD: distinfo,v 1.197 2022/07/29 10:40:21 adam Exp $
 
-BLAKE2s (cmake-3.23.2.tar.gz) = b44f9a76f3f1e4aa386a4be76174c9d6b7b788106153e8940bb7093893bec458
-SHA512 (cmake-3.23.2.tar.gz) = 0925adf973d642fd76d4089b61b3882babb0a85050c4c57d5f5f3bd6b17564a9feb0beed236cd636e25f69072fa30b67ea3f80932380b6b6576f2dd78b8e6931
-Size (cmake-3.23.2.tar.gz) = 9987716 bytes
+BLAKE2s (cmake-3.23.3.tar.gz) = d4a7bab86632620ccb10614e38225fe784bbcba0f0b5ecd39f7389b65a5b7acb
+SHA512 (cmake-3.23.3.tar.gz) = 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
+Size (cmake-3.23.3.tar.gz) = 9988050 bytes
 SHA1 (patch-CMakeLists.txt) = 500b8645e7fbfa54dd97555432c453a1b0a57ff3
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindBLAS.cmake) = ee73b652fdea0c6c4a5cec37f01b65358c73a1fb

devel/cmake/version.mk

@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.27 2022/05/26 08:53:59 adam Exp $
+# $NetBSD: version.mk,v 1.28 2022/07/29 10:40:21 adam Exp $
 # used by devel/cmake/Makefile.common
 # used by devel/cmake-fedora/Makefile
 
-CMAKE_VERSION=	3.23.2
+CMAKE_VERSION=	3.23.3
 CMAKE_API=	${CMAKE_VERSION:R}

devel/giblib/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2020/11/24 17:10:43 nia Exp $
+# $NetBSD: Makefile,v 1.38 2022/07/29 05:58:10 rin Exp $
 
 DISTNAME=		giblib-1.2.4
-PKGREVISION=		16
+PKGREVISION=		17
 CATEGORIES=		devel
 MASTER_SITES=		http://linuxbrit.co.uk/downloads/
 
@@ -13,6 +13,7 @@ LICENSE=		mit
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	giblib.pc.in
 USE_LIBTOOL=		YES
+USE_TOOLS+=		pkg-config
 
 .include "../../graphics/imlib2/buildlink3.mk"
 

devel/giblib/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:14:41 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/07/29 05:58:10 rin Exp $
 
 BLAKE2s (giblib-1.2.4.tar.gz) = c9d66be3b0621f2c0d9882bb0e7f5ca79fd84f7247bcf77c061a41adb19e548e
 SHA512 (giblib-1.2.4.tar.gz) = 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
 Size (giblib-1.2.4.tar.gz) = 287653 bytes
 SHA1 (patch-aa) = 19e3d89366a6455df891fb843f6682d623023b0d
+SHA1 (patch-configure) = f2da73648586410c2e8334e64581a3761dbd6009
 SHA1 (patch-giblib_Makefile.in) = c2e844ea064a755ff62ca65529cd8ca581c13fc9

devel/giblib/patches/patch-configure

@@ -0,0 +1,58 @@
+$NetBSD: patch-configure,v 1.1 2022/07/29 05:58:10 rin Exp $
+
+Add minimal support to `pkg-config imlib2`; imlib2-config has been
+dropped since imlib2-1.7.5.
+
+--- configure.orig	2004-09-05 00:01:41.000000000 +0900
++++ configure	2022-07-29 04:18:07.334548485 +0900
+@@ -19773,12 +19773,21 @@
+ fi
+ IMLIB2_CONFIG=$ac_cv_path_IMLIB2_CONFIG
+
+-if test -n "$IMLIB2_CONFIG"; then
++if test -n "$IMLIB2_CONFIG" && test "$IMLIB2_CONFIG" != "no"; then
+   echo "$as_me:$LINENO: result: $IMLIB2_CONFIG" >&5
+ echo "${ECHO_T}$IMLIB2_CONFIG" >&6
++  imlib2_version=--version
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  if pkg-config imlib2; then
++    IMLIB2_CONFIG=pkg-config
++    imlib2_config_args=imlib2
++    imlib2_version=--modversion
++    echo "$as_me:$LINENO: result: $IMLIB2_CONFIG" >&5
++  echo "${ECHO_T}$IMLIB2_CONFIG" >&6
++  else
++    echo "$as_me:$LINENO: result: no" >&5
++  echo "${ECHO_T}no" >&6
++  fi
+ fi
+
+   echo "$as_me:$LINENO: checking for imlib2 - version >= 1.0.0" >&5
+@@ -19792,11 +19801,11 @@
+      IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`"
+
+         imlib2_config_major_version=`$IMLIB2_CONFIG $imlib2_config_args \
+-         --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++         $imlib2_version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+         imlib2_config_minor_version=`$IMLIB2_CONFIG $imlib2_config_args \
+-         --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++         $imlib2_version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+         imlib2_config_micro_version=`$IMLIB2_CONFIG $imlib2_config_args \
+-         --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++         $imlib2_version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+         imlib2_wanted_major_version="1"
+         imlib2_wanted_minor_version="0"
+         imlib2_wanted_micro_version="0"
+@@ -19866,8 +19875,8 @@
+
+
+
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
++IMLIB_LIBS=$IMLIB2_LIBS
++IMLIB_CFLAGS=$IMLIB2_CFLAGS
+
+
+

devel/libadwaita/DESCR

@@ -0,0 +1,3 @@
+Libadwaita is a GTK 4 library implementing the GNOME HIG, complementing
+GTK. For GTK 3 this role has increasingly been played by Libhandy,
+and so Libadwaita is a direct Libhandy successor.