diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index d54e0476509d..f7e3f1a43f57 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -1,110 +1,110 @@
 PORTNAME=	gogglesmm
 PORTVERSION=	1.2.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Music collection manager and player
 WWW=		https://gogglesmm.github.io/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_powerpc64=	fails to compile: ap_mad.cpp:358:2: \#error fixme
 
 LIB_DEPENDS=	libtag.so:audio/taglib \
 		libexpat.so:textproc/expat2 \
 		libFOX-1.7.so:x11-toolkits/fox17
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gnome \
 		localbase:ldflags pkgconfig sqlite xorg
 USE_GITHUB=	yes
 USE_XORG=	ice sm x11
 
 CMAKE_OFF=	WITH_CFOX WITH_IMPORT
 
 PORTDOCS=	AUTHORS ChangeLog README
 
 OPTIONS_DEFINE=		A52 ALSA DBUS DCA DOCS FAAD FLAC MAD NLS \
 			OGG OPENGL OPUS PULSEAUDIO SNDIO ZLIB
 OPTIONS_RADIO=		SSL VORBISDEC
 OPTIONS_RADIO_SSL=	GCRYPT GNUTLS OPENSSL
 VORBISDEC_DESC=		Vorbis decoder library
 OPTIONS_RADIO_VORBISDEC=	TREMOR VORBIS
 OPTIONS_DEFAULT=	DBUS FAAD FLAC MAD OGG OPENGL OPENSSL OPUS VORBIS ZLIB
 OPTIONS_SUB=		yes
 
 A52_LIB_DEPENDS=	liba52.so:audio/liba52
 A52_CMAKE_BOOL=		WITH_A52
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	WITH_ALSA
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_BOOL=	WITH_DBUS
 
 DCA_LIB_DEPENDS=	libdca.so:multimedia/libdca
 DCA_CMAKE_BOOL=		WITH_DCA
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CMAKE_BOOL=	WITH_FAAD
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_BOOL=	WITH_FLAC
 FLAC_IMPLIES=		OGG
 
 GCRYPT_DESC=		MD5 calculation via libgcrypt (no https)
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CMAKE_BOOL=	WITH_GCRYPT
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CMAKE_BOOL=	WITH_GNUTLS
 
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CMAKE_BOOL=		WITH_MAD
 
 NLS_USES=		gettext
 NLS_CMAKE_BOOL=		WITH_NLS
 
 OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_CMAKE_BOOL=		WITH_OGG
 
 OPENGL_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl,glu
 OPENGL_CMAKE_BOOL=	WITH_OPENGL
 
 OPENSSL_USES=		ssl
 OPENSSL_CMAKE_BOOL=	WITH_OPENSSL
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CMAKE_BOOL=	WITH_OPUS
 OPUS_IMPLIES=		OGG
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_BOOL=	WITH_SNDIO
 
 TREMOR_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor
 TREMOR_CMAKE_BOOL=	WITH_TREMOR
 TREMOR_IMPLIES=		OGG
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CMAKE_BOOL=	WITH_VORBIS
 VORBIS_IMPLIES=		OGG
 
 ZLIB_CMAKE_BOOL=	WITH_ZLIB
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOGG} && !${PORT_OPTIONS:MTREMOR} && !${PORT_OPTIONS:MVORBIS}
 IGNORE=	you have selected an option that requires a Vorbis decoder. Run 'make config' and select one
 .endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/gogglesmm/files/patch-gap_fox.h b/audio/gogglesmm/files/patch-gap_fox.h
index c9d375c0b72a..70dcf116e1c6 100644
--- a/audio/gogglesmm/files/patch-gap_fox.h
+++ b/audio/gogglesmm/files/patch-gap_fox.h
@@ -1,40 +1,43 @@
-Fix build with FOX 1.7.80
+Fix build with FOX >= 1.7.80
 
 --- gap/fox.h.orig	2020-12-27 21:40:54 UTC
 +++ gap/fox.h
-@@ -35,6 +35,9 @@
+@@ -35,6 +35,12 @@
  #define FXVERSION(major,minor,release) ((release)+(minor*1000)+(major*100000))
  
  #include <fxdefs.h>
 +#if FOXVERSION >= FXVERSION(1, 7, 80)
 +#include <fxchar.h>
++#endif
++#if FOXVERSION >= FXVERSION(1, 7, 81)
++#include <fxmath.h>
 +#endif
  #include <fxendian.h>
  #include <fxascii.h>
  #include <fxunicode.h>
-@@ -121,6 +124,25 @@ constexpr FXTime operator"" _ms(unsigned long long int
+@@ -121,6 +127,25 @@ constexpr FXTime operator"" _ms(unsigned long long int
  {
    return value * NANOSECONDS_PER_MILLISECOND;
  }
 +
 +#if FOXVERSION >= FXVERSION(1, 7, 80)
 +#include <utility>
 +#define FX_ALIAS_SPEC(SPECS, NEW_NAME, ...)                      \
 +  template <typename... Args>                                    \
 +  SPECS auto NEW_NAME(Args &&... args)                           \
 +    noexcept(noexcept(__VA_ARGS__(std::forward<Args>(args)...))) \
 +    -> decltype(__VA_ARGS__(std::forward<Args>(args)...)) {      \
 +    return __VA_ARGS__(std::forward<Args>(args)...);             \
 +  }
 +
 +#define FX_ALIAS(NEW_NAME, ...)                                  \
 +  FX_ALIAS_SPEC(inline, NEW_NAME, __VA_ARGS__)
 +
 +FX_ALIAS(compare, FXString::compare)
 +FX_ALIAS(comparecase, FXString::comparecase)
 +FX_ALIAS(compareversion, FXString::comparenatural)
 +#define FXISFOLLOWUTF8 followUTF8
 +#endif
  
  #endif