Index: head/emulators/ucon64/Makefile
===================================================================
--- head/emulators/ucon64/Makefile	(revision 562043)
+++ head/emulators/ucon64/Makefile	(revision 562044)
@@ -1,55 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	ucon64
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME:tl}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	Multipurpose video game ROM image and backup utility
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../license.html # only available as HTML file
 
 USES=		gmake
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
+MAKE_ARGS=	CC="${CC}"
+
 WRKSRC_SUBDIR=	src
 
 PLIST_FILES=	bin/ucon64
 
-OPTIONS_DEFINE=	COLOR DEBUG DISCMAGE PARALLEL USB ZLIB
-OPTIONS_DEFAULT=COLOR DISCMAGE PARALLEL USB ZLIB
+OPTIONS_DEFINE=	CD64 COLOR DEBUG DISCMAGE PARALLEL USB ZLIB
+OPTIONS_DEFAULT=CD64 COLOR DISCMAGE PARALLEL USB ZLIB
 OPTIONS_SUB=	yes
 
+CD64_DESC=	CD64 backup unit support
 COLOR_DESC=	ANSI-colored output
 DEBUG_DESC=	Additional debugging output
 DISCMAGE_DESC=	ISO/BIN/CDI format support
 PARALLEL_DESC=	Parallel port backup unit support
 USB_DESC=	USB backup unit support
 ZLIB_DESC=	ZIP/gzip archive support
 
+CD64_CONFIGURE_WITH=		libcd64
 COLOR_CONFIGURE_ENABLE=		ansi-color
 DEBUG_CONFIGURE_ENABLE=		debug
 DISCMAGE_CONFIGURE_WITH=	libdiscmage
 DISCMAGE_PLIST_FILES=		lib/libdiscmage.so
 PARALLEL_CONFIGURE_ENABLE=	parallel
 USB_CONFIGURE_WITH=		libusb
 ZLIB_CONFIGURE_WITH=		zlib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/ucon64.c
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/ucon64_misc.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 do-install-DISCMAGE-on:
 	${INSTALL_LIB} ${WRKSRC}/libdiscmage/discmage.so \
 		${STAGEDIR}${PREFIX}/lib/libdiscmage.so
 
 .include <bsd.port.mk>
Index: head/emulators/ucon64/distinfo
===================================================================
--- head/emulators/ucon64/distinfo	(revision 562043)
+++ head/emulators/ucon64/distinfo	(revision 562044)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559378280
-SHA256 (ucon64-2.2.0-src.tar.gz) = 5727e0be9ee878bba84d204135a7ca25662db6b56fee6895301e50c1bdda70af
-SIZE (ucon64-2.2.0-src.tar.gz) = 1488002
+TIMESTAMP = 1608717049
+SHA256 (ucon64-2.2.1-src.tar.gz) = e814f427a59866e16fe757bf4af51004ac68be29cabd78944590878f1df73f79
+SIZE (ucon64-2.2.1-src.tar.gz) = 1476080
Index: head/emulators/ucon64/files/patch-Makefile
===================================================================
--- head/emulators/ucon64/files/patch-Makefile	(nonexistent)
+++ head/emulators/ucon64/files/patch-Makefile	(revision 562044)
@@ -0,0 +1,16 @@
+Remove some hardcoded optimization/warnings flags.  This will become obsolete
+with the next release.
+
+--- Makefile.orig	2020-12-26 22:51:37 UTC
++++ Makefile
+@@ -9,8 +9,8 @@ endif
+ 
+ CC=gcc
+ CFLAGS0:=$(CFLAGS)
+-CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough -Wno-format-truncation \
+--Wno-stringop-overflow -O3 -fsigned-char
++CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough \
++-fsigned-char
+ # Enable -Wstringop-overflow[=type] when it is no longer a broken, partial
+ # implementation with false positives for trivial cases.
+ LDFLAGS0:=$(LDFLAGS)

Property changes on: head/emulators/ucon64/files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/emulators/ucon64/files/patch-backup_libcd64_Makefile
===================================================================
--- head/emulators/ucon64/files/patch-backup_libcd64_Makefile	(nonexistent)
+++ head/emulators/ucon64/files/patch-backup_libcd64_Makefile	(revision 562044)
@@ -0,0 +1,19 @@
+Remove some hardcoded optimization/warnings flags.  This will become obsolete
+with the next release.
+
+--- backup/libcd64/Makefile.orig	2020-12-26 22:52:19 UTC
++++ backup/libcd64/Makefile
+@@ -1,11 +1,11 @@
+ CC=gcc
+ 
+ # I think we only use gnu99 instead of c99 due to va_args extensions.
+-CFLAGS+=-I. -Wall -W -Wno-format-truncation -std=gnu99
++CFLAGS+=-I. -Wall -W -std=gnu99
+ ifdef DEBUG
+ CFLAGS+=-pg -g -pedantic -ansi -DDEBUG
+ else
+-CFLAGS+=-O6 -funroll-loops -fexpensive-optimizations
++CFLAGS+=-funroll-loops
+ endif
+ 
+ ifndef DJGPP

Property changes on: head/emulators/ucon64/files/patch-backup_libcd64_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/emulators/ucon64/files/patch-libdiscmage_Makefile.in
===================================================================
--- head/emulators/ucon64/files/patch-libdiscmage_Makefile.in	(nonexistent)
+++ head/emulators/ucon64/files/patch-libdiscmage_Makefile.in	(revision 562044)
@@ -0,0 +1,14 @@
+Remove some hardcoded optimization/warnings flags.  This will become obsolete
+with the next release.
+
+--- libdiscmage/Makefile.in.orig	2020-12-26 22:53:30 UTC
++++ libdiscmage/Makefile.in
+@@ -22,7 +22,7 @@ INSTALL_DATA=@INSTALL_DATA@
+ 
+ CC=@CC@
+ CFLAGS0:=$(CFLAGS) -I. -Wall -W -Wno-implicit-fallthrough \
+--Wno-format-truncation -Wno-stringop-overflow -O3 @DEFS@
++@DEFS@
+ CFLAGS=$(CFLAGS0) -DDLL
+ ifdef DLOPEN
+ CFLAGS+=-DDLOPEN

Property changes on: head/emulators/ucon64/files/patch-libdiscmage_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/emulators/ucon64/files/patch-libdiscmage_misc.c
===================================================================
--- head/emulators/ucon64/files/patch-libdiscmage_misc.c	(nonexistent)
+++ head/emulators/ucon64/files/patch-libdiscmage_misc.c	(revision 562044)
@@ -0,0 +1,17 @@
+Fixes a crash in change_mem2() on 64-bit platforms.  That function is used for
+patching functionality.
+
+This patch is already incorporated at upstream and will become obsolete with
+the next release.
+
+--- libdiscmage/misc.c.orig	2020-07-03 08:13:04 UTC
++++ libdiscmage/misc.c
+@@ -1874,7 +1874,7 @@ change_mem2 (char *buf, size_t bufsize, char *searchst
+ 
+           if (strpos == pos_1st_esc)
+             setindex = 0;                       // reset argument pointer
+-          if (pos_1st_esc == (unsigned int) -1)
++          if (pos_1st_esc == (size_t) -1)
+             pos_1st_esc = strpos;
+ 
+           set = sets[setindex].data;            // get next set of characters

Property changes on: head/emulators/ucon64/files/patch-libdiscmage_misc.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/emulators/ucon64/files/patch-misc_misc.c
===================================================================
--- head/emulators/ucon64/files/patch-misc_misc.c	(nonexistent)
+++ head/emulators/ucon64/files/patch-misc_misc.c	(revision 562044)
@@ -0,0 +1,17 @@
+Fixes a crash in change_mem2() on 64-bit platforms.  That function is used for
+patching functionality.
+
+This patch is already incorporated at upstream and will become obsolete with
+the next release.
+
+--- misc/misc.c.orig	2020-07-03 08:09:50 UTC
++++ misc/misc.c
+@@ -501,7 +501,7 @@ change_mem2 (char *buf, size_t bufsize, char *searchst
+ 
+           if (strpos == pos_1st_esc)
+             setindex = 0;                       // reset argument pointer
+-          if (pos_1st_esc == (unsigned int) -1)
++          if (pos_1st_esc == (size_t) -1)
+             pos_1st_esc = strpos;
+ 
+           set = sets[setindex].data;            // get next set of characters

Property changes on: head/emulators/ucon64/files/patch-misc_misc.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/emulators/ucon64/pkg-descr
===================================================================
--- head/emulators/ucon64/pkg-descr	(revision 562043)
+++ head/emulators/ucon64/pkg-descr	(revision 562044)
@@ -1,7 +1,7 @@
 uCON64 is the video game backup tool and emulator Swiss Army knife program.
 It supports almost every system (Consoles, Handheld, and Arcade) with very
 verbose ROM information, ROM and SRAM convertion to various backup tool
 formats, IPS/APS/BSL/PPF patching, bad dump detection via RomCenter DAT files,
 and more.
 
-WWW: http://ucon64.sourceforge.net/
+WWW: https://ucon64.sourceforge.io