diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index 234daf0d0073..68b3a288fe16 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	xmedcon
-PORTVERSION=	0.17.0
-PORTREVISION=	1
+PORTVERSION=	0.23.0
+DISTVERSIONSUFFIX=	-gtk2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/XMedCon-Source/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Medical image conversion utility and library
 WWW=		http://xmedcon.sourceforge.net/
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gnome libtool localbase pkgconfig tar:bzip2
-USE_GNOME=	cairo gdkpixbuf2 gtk20
+USES=		gnome libtool pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/xmedcon \
 		--enable-llcheck
 INSTALL_TARGET=	install-strip
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 OPTIONS_DEFINE=	X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF \
 		INTERFILE INW PNG
 OPTIONS_DEFAULT=X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF \
 		INTERFILE INW PNG
 OPTIONS_SUB=	yes
 
 X11_CONFIGURE_ENABLE=	gui
-X11_USE=		GNOME=gtk20
+X11_USE=		GNOME=cairo,gdkpixbuf2,gtk20
 X11_DESKTOP_ENTRIES=	"XMedCon" \
 			"" \
 			"${PREFIX}/etc/xmedcon.png" \
 			"${PORTNAME}" \
 			"" \
 			""
 
 GLIB_DESC=		With Glib
 GLIB_CONFIGURE_ENABLE=	glib
 GLIB_USE=		GNOME=glib20
 
 ACR_NEMA_DESC=		With Acr/Nema 2.0
 
 ANALYZE_DESC=		With Analyze (SPM)
 ANALYZE_CONFIGURE_ENABLE=	anlz
 
 CONCORDE_DESC=		With Concorde __ET
 CONCORDE_CONFIGURE_ENABLE=	conc
 
 DICOM_DESC=		With DICOM 3.0
 
 DICOM_LJPEG_DESC=	With DICOM 3.0 Lossless JPEG
 DICOM_LJPEG_CONFIGURE_ENABLE=	ljpg
 
 ECAT_DESC=		With CTI ECAT 6/7
 ECAT_CONFIGURE_ENABLE=	ecat
 
 INTERFILE_DESC=		With InterFile 3.3
 INTERFILE_CONFIGURE_ENABLE=	intf
 
 INW_DESC=		With INW (RUG)
 INW_CONFIGURE_ENABLE=	inw
 
 GIF_CONFIGURE_OFF=	--disable-gif
 
 PNG_CONFIGURE_ENABLE=	png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MACR_NEMA) || empty(PORT_OPTIONS:MDICOM)
 CONFIGURE_ARGS+=	--disable-acr
 .endif
 
 .if empty(PORT_OPTIONS:MDICOM) || empty(PORT_OPTIONS:MDICOM_LJPEG)
 CONFIGURE_ARGS+=	--disable-dicom
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|etc||g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/^configheadersdir/s|=.*$$|= $$(includedir)|g' \
 		${WRKSRC}/source/Makefile.in
 	@${REINPLACE_CMD} -e '/xmedcon.1/d' \
 		${WRKSRC}/man/Makefile.in
 
 post-install-X11-on:
 .for file in xmedcon.png xmedconrc xmedconrc.linux
 	${INSTALL_DATA} ${WRKSRC}/etc/${file} ${STAGEDIR}${PREFIX}/etc
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/man/xmedcon.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/graphics/xmedcon/distinfo b/graphics/xmedcon/distinfo
index 32f4753626f7..23265c712db2 100644
--- a/graphics/xmedcon/distinfo
+++ b/graphics/xmedcon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613565091
-SHA256 (xmedcon-0.17.0.tar.bz2) = bf61713d8db8e4cb600eed0f889bf34f5d9df967937c4e4df9074c9a442d490a
-SIZE (xmedcon-0.17.0.tar.bz2) = 837628
+TIMESTAMP = 1673016389
+SHA256 (xmedcon-0.23.0-gtk2.tar.bz2) = 4feaf01eed1604f5f85d3c130c1100a17f59b436afd5654bcc877e0dc5b2a98e
+SIZE (xmedcon-0.23.0-gtk2.tar.bz2) = 888815
diff --git a/graphics/xmedcon/pkg-plist b/graphics/xmedcon/pkg-plist
index 3bf64d35edf3..912fd8491041 100644
--- a/graphics/xmedcon/pkg-plist
+++ b/graphics/xmedcon/pkg-plist
@@ -1,57 +1,57 @@
 bin/medcon
 bin/xmedcon-config
 %%X11%%bin/xmedcon
 %%X11%%etc/xmedcon.png
 %%X11%%etc/xmedconrc
 %%X11%%etc/xmedconrc.linux
 include/xmedcon/m-acr.h
 include/xmedcon/m-algori.h
 include/xmedcon/m-anlz.h
 include/xmedcon/m-color.h
 include/xmedcon/m-conc.h
 include/xmedcon/m-config.h
 include/xmedcon/m-debug.h
 include/xmedcon/m-defs.h
 include/xmedcon/m-depend.h
 include/xmedcon/m-dicm.h
 include/xmedcon/m-ecat64.h
 include/xmedcon/m-ecat72.h
 include/xmedcon/m-error.h
 include/xmedcon/m-fancy.h
 include/xmedcon/m-files.h
 include/xmedcon/m-getopt.h
 include/xmedcon/m-gif.h
 include/xmedcon/m-global.h
 include/xmedcon/m-init.h
 include/xmedcon/m-intf.h
 include/xmedcon/m-inw.h
 include/xmedcon/m-matrix.h
 include/xmedcon/m-nifti.h
 include/xmedcon/m-pixels.h
 include/xmedcon/m-png.h
 include/xmedcon/m-progress.h
 include/xmedcon/m-qmedian.h
 include/xmedcon/m-raw.h
 include/xmedcon/m-rslice.h
 include/xmedcon/m-split.h
 include/xmedcon/m-stack.h
 include/xmedcon/m-structs.h
 include/xmedcon/m-transf.h
 include/xmedcon/m-vifi.h
 include/xmedcon/m-xtract.h
 include/xmedcon/medcon.h
 lib/libmdc.a
 lib/libmdc.so
-lib/libmdc.so.%%GTK3_VERSION%%
+lib/libmdc.so.3.0.0
 lib/libmdc.so.3
 man/man1/medcon.1.gz
 %%X11%%man/man1/xmedcon.1.gz
 man/man1/xmedcon-config.1.gz
 man/man3/medcon.3.gz
 man/man4/m-acr.4.gz
 man/man4/m-anlz.4.gz
 man/man4/m-ecat.4.gz
 man/man4/m-gif.4.gz
 man/man4/m-intf.4.gz
 man/man4/m-inw.4.gz
 share/aclocal/xmedcon.m4