diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index a8861eb163d8..9214c8ddeb9a 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,6 +1,9 @@
 PORTNAME=	pixman
-PORTVERSION=	0.42.2
+DISTVERSION=	0.42.2
+PORTREVISION=	1
 CATEGORIES=	x11
+MASTER_SITES=	XORG/individual/lib/
+DIST_SUBDIR=	xorg/lib
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Low-level pixel manipulation library
@@ -9,28 +12,34 @@ WWW=		http://pixman.org
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
+BUILD_DEPENDS_aarch64=	as:devel/binutils
+BUILD_DEPENDS_armv6=	as:devel/binutils
+BUILD_DEPENDS_armv7=	as:devel/binutils
+
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c11 cpe perl5 tar:xz xorg-cat:lib
+USES=		compiler:c11 cpe meson perl5 tar:xz
 USE_PERL5=	build
-CONFIGURE_ARGS=	--disable-gtk
-INSTALL_TARGET=	install-strip
 
-# Build the library exclusively, thus disabling the demos and the tests (which
-# do not get installed anyway).  This is to workaround a problem in powerpc64
-# where the build of the tests crashes ld; see PR bin/202284.
-MAKE_ARGS=	SUBDIRS=pixman
+TEST_TARGET=	test
+
+CFLAGS_aarch64+=	-fno-integrated-as
+CFLAGS_armv6+=		-fno-integrated-as
+CFLAGS_armv7+=		-fno-integrated-as
+
+MESON_ARGS=		-Dgtk=disabled ${MESON_ARGS_${ARCH}}
+MESON_ARGS_powerpc=	-Dvmx=disabled
+
+OPTIONS_DEFINE=		TEST
+
+TEST_LIB_DEPENDS=	libpng.so:graphics/png
+TEST_MESON_ENABLED=	libpng tests
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "armv6" || ${ARCH} == "armv7"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
-CONFIGURE_ENV+=	CCASFLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as"
 LLD_UNSAFE=	yes
-.elif ${ARCH} == "aarch64"
-CONFIGURE_ARGS+=	--disable-arm-a64-neon
-.elif ${ARCH} == "powerpc"
-CONFIGURE_ARGS+=	--disable-vmx
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index fba0281fc19c..cf237098e889 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667505454
+TIMESTAMP = 1667658241
 SHA256 (xorg/lib/pixman-0.42.2.tar.xz) = 5747d2ec498ad0f1594878cc897ef5eb6c29e91c53b899f7f71b506785fc1376
 SIZE (xorg/lib/pixman-0.42.2.tar.xz) = 652984
diff --git a/x11/pixman/pkg-plist b/x11/pixman/pkg-plist
index 89d6b50037a8..10164af3b799 100644
--- a/x11/pixman/pkg-plist
+++ b/x11/pixman/pkg-plist
@@ -1,6 +1,5 @@
 include/pixman-1/pixman-version.h
 include/pixman-1/pixman.h
-lib/libpixman-1.a
 lib/libpixman-1.so
 lib/libpixman-1.so.0
 lib/libpixman-1.so.0.42.2