diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 5cfda94f626c..cb7b1e78936a 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -1,69 +1,68 @@
 # Created by: kbyanc@posi.net
 
 PORTNAME=	grip
-PORTVERSION=	4.2.1
-PORTREVISION=	1
+DISTVERSION=	4.2.2
 CATEGORIES=	audio
-MASTER_SITES=	SF/grip/${PORTVERSION}
+MASTER_SITES=	SF/grip/${DISTVERSION}
 
 MAINTAINER=	freebsd-ports@jan0sch.de
 COMMENT=	GTK front-end to external cd rippers and audio encoders
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libid3.so:audio/id3lib
 
-USES=		compiler:c++11-lang gmake gnome libtool localbase \
-		pathfix pkgconfig xorg gnome
+USES=		compiler:c++11-lang gmake gnome libtool localbase pathfix \
+		pkgconfig xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 INSTALLS_ICONS=	yes
 USE_XORG=	ice sm x11 xext
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--disable-werror
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-werror
 
-OPTIONS_DEFINE=	CDPARANOIA CDDA2WAV LAME VORBIS FAAC FLAC NLS
+OPTIONS_DEFINE=		CDDA2WAV CDPARANOIA FAAC FLAC LAME NLS VORBIS
 OPTIONS_DEFAULT=	CDPARANOIA FLAC VORBIS
 
 .if !defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	LAME
 .endif
 
 OPTIONS_SUB=	yes
 
-CDPARANOIA_LIB_DEPENDS=	libcdda_paranoia.so:audio/cdparanoia
+CDDA2WAV_RUN_DEPENDS=		cdda2wav:sysutils/cdrtools
+CDPARANOIA_LIB_DEPENDS=		libcdda_paranoia.so:audio/cdparanoia
 CDPARANOIA_CONFIGURE_ENABLE=	cdpar
-CDDA2WAV_RUN_DEPENDS=  cdda2wav:sysutils/cdrtools
-FAAC_RUN_DEPENDS=	faac:audio/faac
-FLAC_RUN_DEPENDS=	flac:audio/flac
-LAME_RUN_DEPENDS=	lame:audio/lame
-VORBIS_RUN_DEPENDS=	ogg123:audio/vorbis-tools
-NLS_USES=	gettext
+FAAC_RUN_DEPENDS=		faac:audio/faac
+FLAC_RUN_DEPENDS=		flac:audio/flac
+LAME_RUN_DEPENDS=		lame:audio/lame
+VORBIS_RUN_DEPENDS=		ogg123:audio/vorbis-tools
+NLS_USES=			gettext
 
 .if defined(WITH_CDROM_DEVICE)
-DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
+DEFAULT_CDROM_DEVICE=	${WITH_CDROM_DEVICE}
 .else
-DEFAULT_CDROM_DEVICE=/dev/cd0
+DEFAULT_CDROM_DEVICE=	/dev/cd0
 .endif
 
 .include <bsd.port.pre.mk>
 
 pre-everything::
 .if !defined(WITH_CDROM_DEVICE)
 	@${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"
 	@${ECHO_MSG} "===> Define WITH_CDROM_DEVICE if you want to change the default"
 	@${ECHO_MSG} "===> For example, 'make WITH_CDROM_DEVICE=\"/dev/somedevice\"'"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		${WRKSRC}/src/grip.c
 .if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
 	${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/cdpar.c
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/grip/distinfo b/audio/grip/distinfo
index 22fa938692cd..c52dbd9d6f19 100644
--- a/audio/grip/distinfo
+++ b/audio/grip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622477995
-SHA256 (grip-4.2.1.tar.gz) = ddb1495113dbabdaf32ec242a6946348046170e2710b87927f0e55c6f6604374
-SIZE (grip-4.2.1.tar.gz) = 1210309
+TIMESTAMP = 1625758321
+SHA256 (grip-4.2.2.tar.gz) = 9d7b4680978d60cf25ca594d8bd51d9ac9d57073825dfaf25a628667d4054c71
+SIZE (grip-4.2.2.tar.gz) = 1210481