Index: Makefile
===================================================================
--- Makefile	(revision 556918)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 PORTNAME=		libheif
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.6.2
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		graphics
 
 MAINTAINER=		freebsd@sebastiansteinmetz.ch
@@ -19,6 +19,7 @@
 GH_ACCOUNT=		strukturag
 GH_PROJECT=		libheif
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--disable-go
 USE_LDCONFIG=		yes
 SHEBANG_GLOB=		*.sh
 INSTALL_TARGET=		install-strip
@@ -31,7 +32,11 @@
 LIBDE265_DESC=	Use libde265 (support for HEVC decoding)
 X265_DESC=	Use x265 (support for HEVC encoding)
 
+JPEG_USES=		jpeg
+LIBDE265_LIB_DEPENDS=	libde265.so:multimedia/libde265
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 THREADS_CONFIGURE_OFF=	--disable-multithreading
+X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 
 .include <bsd.port.options.mk>
 
@@ -40,23 +45,18 @@
 LICENSE_COMB=		multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/examples/COPYING
 USES+=			shared-mime-info
-CONFIGURE_ARGS+=	--disable-go
 .endif
 
-.if ${PORT_OPTIONS:MJPEG}
-USES+=			jpeg
-.endif
+post-patch-JPEG-off:
+	@${REINPLACE_CMD} -e '/AC_CHECK_/ s|jpeg|ignore&|g' ${WRKSRC}/configure.ac
 
-.if ${PORT_OPTIONS:MLIBDE265}
-LIB_DEPENDS+=		libde265.so:multimedia/libde265
-.endif
+post-patch-LIBDE265-off:
+	@${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/ s|libde265|ignore&|g' ${WRKSRC}/configure.ac
 
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=		libpng.so:graphics/png
-.endif
+post-patch-PNG-off:
+	@${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/ s|png|ignore&|g' ${WRKSRC}/configure.ac
 
-.if ${PORT_OPTIONS:MX265}
-LIB_DEPENDS+=		libx265.so:multimedia/x265
-.endif
+post-patch-X265-off:
+	@${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/ s|x265|ignore&|g' ${WRKSRC}/configure.ac
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 556918)
+++ pkg-plist	(working copy)
@@ -1,7 +1,7 @@
 %%EXAMPLES%%bin/heif-convert
 %%EXAMPLES%%bin/heif-enc
 %%EXAMPLES%%bin/heif-info
-%%EXAMPLES%%bin/heif-thumbnailer
+%%EXAMPLES%%%%PNG%%bin/heif-thumbnailer
 include/libheif/heif.h
 include/libheif/heif_cxx.h
 include/libheif/heif_plugin.h
@@ -14,6 +14,6 @@
 %%EXAMPLES%%man/man1/heif-convert.1.gz
 %%EXAMPLES%%man/man1/heif-enc.1.gz
 %%EXAMPLES%%man/man1/heif-info.1.gz
-%%EXAMPLES%%man/man1/heif-thumbnailer.1.gz
+%%EXAMPLES%%%%PNG%%man/man1/heif-thumbnailer.1.gz
 %%EXAMPLES%%share/mime/packages/heif.xml
 %%EXAMPLES%%share/thumbnailers/heif.thumbnailer