diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile
index aa24e5158597..b41f31a871a8 100644
--- a/x11/eaglemode/Makefile
+++ b/x11/eaglemode/Makefile
@@ -1,106 +1,94 @@
 PORTNAME=	eaglemode
-PORTVERSION=	0.95.0
-PORTREVISION=	18
+PORTVERSION=	0.95.1
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Futuristic zoomable user environment
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libfreetype.so:print/freetype2
 
-USES=		compiler:features jpeg gnome perl5 \
+USES=		compiler:c++11-lib jpeg gnome perl5 \
 		pkgconfig tar:bzip2 xorg
 USE_PERL5=	build
-USE_XORG=	x11 xext xxf86vm
+USE_XORG=	x11
 SUB_FILES=	eaglemode.sh
 
-LLD_UNSAFE=	yes
-
 BUILD_ARGS=	continue=no
 
-.for lib in X11 jpeg png tiff
-BUILD_ARGS+=	${lib}-inc-dir="${LOCALBASE}/include" \
-		${lib}-lib-dir="${LOCALBASE}/lib"
-.endfor
-
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
-OPTIONS_DEFINE=	RSVG PDF
-OPTIONS_DEFAULT=VLC RSVG PDF
+OPTIONS_DEFINE=	RSVG PDF WEBP
+OPTIONS_DEFAULT=VLC RSVG PDF WEBP
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	EMAV
 OPTIONS_GROUP_EMAV=	XINE VLC
 
 RSVG_DESC=	SVG support through librsvg
 PDF_DESC=	PDF support through poppler-glib
 EMAV_DESC=	Video preview backend
 VLC_DESC=	Multimedia support via VLC
 
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 XINE_VARS=		EMAV+=xine
 RSVG_USE=		GNOME=librsvg2
 PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 PDF_USE=		GNOME=gtk20
 VLC_LIB_DEPENDS=	libvlc.so:multimedia/vlc
 VLC_VARS=		EMAV+=vlc
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
-USE_GCC=	yes
-.endif
-
-.if ${PORT_OPTIONS:MXINE}
-BUILD_ARGS+=	xine-inc-dir="${LOCALBASE}/include" \
-		xine-lib-dir="${LOCALBASE}/lib"
-.endif
 .if !empty(EMAV)
-BUILD_ARGS+=	emAv=${EMAV:ts,}
+BUILD_ARGS+=	emAv=${EMAV:ts,}  # seed perl make.pl show-extra-options
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.pl" | ${XARGS} \
 		${REINPLACE_CMD} -e '1s|/usr/bin/perl|${perl_CMD}|'
 .if empty(EMAV)
 	@${RM} ${WRKSRC}/makers/emAv.maker.pm
 .endif
 
 post-patch-RSVG-off:
 	@${RM} ${WRKSRC}/makers/emSvg.maker.pm
 
 post-patch-PDF-off:
 	@${RM} ${WRKSRC}/makers/emPdf.maker.pm
 
+post-patch-WEBP-off:
+	@${RM} ${WRKSRC}/makers/emWebp.maker.pm
+
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PERL} make.pl build ${BUILD_ARGS})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${PERL} make.pl install dir=${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/eaglemode.sh ${STAGEDIR}${PREFIX}/bin/eaglemode
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/bin/* \
 		${STAGEDIR}${PREFIX}/lib/eaglemode/lib/*.so \
 		${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emClock/emTimeZonesProc \
 		${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emTmpConv/emTmpConvProc
 
 do-install-XINE-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emAv/emAvServerProc_xine
 
 do-install-VLC-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emAv/emAvServerProc_vlc
 
 do-install-RSVG-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emSvg/emSvgServerProc
 
 do-install-PDF-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eaglemode/lib/emPdf/emPdfServerProc
 
 .include <bsd.port.post.mk>
diff --git a/x11/eaglemode/distinfo b/x11/eaglemode/distinfo
index c3fc5aca0698..af1997f50030 100644
--- a/x11/eaglemode/distinfo
+++ b/x11/eaglemode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598183362
-SHA256 (eaglemode-0.95.0.tar.bz2) = a3a63a4a5eba73d89c54840aa1f6fdb26da505d9c2b220fcca90d94b3727756a
-SIZE (eaglemode-0.95.0.tar.bz2) = 16566607
+TIMESTAMP = 1626355146
+SHA256 (eaglemode-0.95.1.tar.bz2) = e7dd54d31f2092a766909971e2fcf8a002170e9e2bca30698e4912e66ac363a0
+SIZE (eaglemode-0.95.1.tar.bz2) = 16580356
diff --git a/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm b/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm
index 82e5850b1e6b..9c5260d7a108 100644
--- a/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm
+++ b/x11/eaglemode/files/patch-makers_unicc_plugins_unicc__gnu.pm
@@ -1,33 +1,43 @@
---- makers/unicc/plugins/unicc_gnu.pm.orig	2018-12-23 06:47:44 UTC
+Note that this plugin is used for both gnu and clang build.
+
+--- makers/unicc/plugins/unicc_gnu.pm.orig	2021-07-11 05:50:52 UTC
 +++ makers/unicc/plugins/unicc_gnu.pm
 @@ -35,7 +35,7 @@ my $IsWinOrCygwin;
  my $IsDarwin;
  
  {
 -	my $s=`gcc -dumpversion`; # Examples: "4.3", "2.95.3"
 +	my $s=`$ENV{'CC'} -dumpversion`; # Examples: "4.3", "2.95.3"
  	if ($? != 0) { exit(1); }
  	for (;; $s=substr($s,1)) {
  		if (length($s)==0) { die("Cannot determine GCC version, stopped"); }
 @@ -112,9 +112,9 @@ sub Compile
  		push(@args,("-o",GetObjFiles->[$index]));
  	}
  	else {
 -		push(@args,"gcc");
 +		push(@args,$isCpp ? $ENV{'CXX'} : $ENV{'CC'});
  		if (HaveDebug) { push(@args,"-g"); }
 -		push(@args,"-O2");
 +		push(@args,grep /./, split(/\s+/, $isCpp ? $ENV{'CXXFLAGS'} : $ENV{'CFLAGS'}));
  		if ($isCpp && $GccVersion>=4.7 && $GccVersion<6.1) {
  			push(@args,"-std=c++11");
  		}
-@@ -167,7 +167,8 @@ sub Link
+@@ -166,7 +166,8 @@ sub Link
  		push(@args,(@{GetObjFiles()}));
  	}
  	else {
 -		push(@args,"gcc");
-+		push(@args,$ENV{'CC'});
++		push(@args,HaveCppLib ? $ENV{'CXX'} : $ENV{'CC'});
 +		push(@args,grep /./, split(/\s+/, $ENV{'LDFLAGS'}));
  		if (HaveDebug) { push(@args,"-g"); }
  		if ($type eq 'dynlib') {
  			push(@args,$IsDarwin ? "-dynamiclib" : "-shared");
+@@ -182,7 +183,6 @@ sub Link
+ 		foreach my $s (@{GetLinkNames()}) { push(@args,"-l$s"); }
+ 		if ($IsCygwin && -e "/lib/libcygipc.a") { push(@args,"-lcygipc"); }
+ 		if (HaveMath) { push(@args,"-lm"); }
+-		if (HaveCppLib) { push(@args,"-lstdc++"); }
+ 		push(@args,"-o");
+ 		push(@args,GetTgtFile);
+ 		if ($IsWinOrCygwin and $type eq "dynlib") {