ucon64: update to 2.2.2.

- added proper support for Clang to the makefiles (by dbjh)
  Indicate that you want to use Clang by setting the environment variable CC.
  Either at configuration time:
  $ CC=clang ./configure
  Or at build time:
  $ CC=clang make
- updated (SNES) implemented dumping for --xgd6. 15 years late, but still the
  only tool to do it :-) (by dbjh; thanks to Kristian Gunstone for making me
  try to explain why it could not be done ;-) )
- restored support for NetBSD/i386 and OpenBSD/i386 in makefile of libcd64 (by
  dbjh)
- updated FAQ with explanation about how to compile uCON64 on macOS with support
  for USB (by dbjh)
- fixed some issues in MinGW, MinGW-w64 and Visual C++ ports that made them
  choke on files larger than 2 GB. On 32-bit UNIX try adding
  -D_FILE_OFFSET_BITS=64 to CFLAGS to fix the issues (by dbjh; thanks to
  Mystic_Merlin for testing on Windows 98)
- updated (all) upgraded unzip to version 1.1 (by dbjh)
- updated (SNES) --gd3 writes correct SRAM mapping values for Trials of Mana
  (by dbjh; thanks to Mystic_Merlin for reporting the issue and testing)
- updated (SNES) --gd3 supports 64 Mbit HiROM games. It works at least for the
  English fan translation of Fire Emblem - Seisen no Keifu (J) (Project Naga,
  beta version 7) (by dbjh)
- updated (SNES) --gd3 supports up to 64 Mbit LoROM games. It works at least for
  the 48 Mbit English fan translation of Fire Emblem - Thraki 776 (J) (V.ROM)
  (Lil' Manster 1.07) (by dbjh)
- updated (all) --hfind and --hfindr accept search strings without spaces (by
  dbjh; thanks to eadmaster for the feedback)
- renamed (all) --dual to --bit (by dbjh)
- updated (all) --hex, --bit, --code and --print accept an optional end offset
  (by dbjh)
- added (all) --hreplace=S:R find S and copy R to the start of each match
  (wildcard: '?') (by dbjh; thanks to eadmaster for the suggestion)

6 files changed, 13 insertions, 91 deletions

diff --git a/emulators/ucon64/Makefile b/emulators/ucon64/Makefile
index 213a63fc374..1fdb45aca40 100644
--- a/emulators/ucon64/Makefile
+++ b/emulators/ucon64/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2021/05/08 15:18:37 nia Exp $
+# $NetBSD: Makefile,v 1.21 2021/11/24 12:05:18 wiz Exp $
 
-DISTNAME=		ucon64-2.2.1-src
+DISTNAME=		ucon64-2.2.2-src
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		3
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ucon64/}
 
@@ -15,14 +14,13 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
 .include "../../mk/bsd.prefs.mk"
 
-# code assumes 64-bit target on NetBSD
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} != "i386"
-CONFIGURE_ARGS+=		--with-libcd64
-.endif
-
-# parallel port I/O cannot work on macOS, even on Intel
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=		--disable-parallel
+# parallel port I/O works on i386 and x86_64, but cannot work on macOS, even on Intel
+.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
+# --enable-parallel is default
+CONFIGURE_ARGS+=	--with-libcd64
+.else
+# --without-libcd64 is default
+CONFIGURE_ARGS+=	--disable-parallel
 .endif
 
 GNU_CONFIGURE=			yes
diff --git a/emulators/ucon64/distinfo b/emulators/ucon64/distinfo
index 7bf2e641d27..c074bcb6911 100644
--- a/emulators/ucon64/distinfo
+++ b/emulators/ucon64/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:24:14 nia Exp $
+$NetBSD: distinfo,v 1.15 2021/11/24 12:05:18 wiz Exp $
 
-BLAKE2s (ucon64-2.2.1-src.tar.gz) = 284e9898df53397682d44493118a779116f79e4d33d1e274f476214b031b37b6
-SHA512 (ucon64-2.2.1-src.tar.gz) = 34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
-Size (ucon64-2.2.1-src.tar.gz) = 1476080 bytes
-SHA1 (patch-libdiscmage_ioapi.h) = a5857b1623a3180d09e19815e261f23491aaad96
-SHA1 (patch-libdiscmage_misc.c) = df3124b713b9db5379fa2bfd529c5637b6e8f6d0
-SHA1 (patch-misc_ioapi.h) = dc2939f8f404e25a7dcb841555024551f2962984
-SHA1 (patch-misc_misc.c) = 528e1f79df8c01841a95c0632becf8fcd1358255
+BLAKE2s (ucon64-2.2.2-src.tar.gz) = aecd9fab19cf65c2f057e926dcf8fb20406da3d4539a73eed4eb74669c081080
+SHA512 (ucon64-2.2.2-src.tar.gz) = 21e403e6de64c0a76de32032fbafea75f53a96b88b343220cdc8d62ef3bdec252764cacb9bbf98a910477ba451bc05aee8c9f91024b9e5d3149f7ead20d426b5
+Size (ucon64-2.2.2-src.tar.gz) = 1481087 bytes
diff --git a/emulators/ucon64/patches/patch-libdiscmage_ioapi.h b/emulators/ucon64/patches/patch-libdiscmage_ioapi.h
deleted file mode 100644
index 57690becf8e..00000000000
--- a/emulators/ucon64/patches/patch-libdiscmage_ioapi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-libdiscmage_ioapi.h,v 1.1 2020/12/05 13:16:36 wiz Exp $
-
-OF is not defined in zlib.h on all systems.
-From upstream.
-
---- libdiscmage/ioapi.h.orig	2016-03-03 13:55:44.000000000 +0000
-+++ libdiscmage/ioapi.h
-@@ -35,6 +35,11 @@
- extern "C" {
- #endif
- 
-+// On NetBSD and Gentoo, OF is not defined in zconf.h, which is included by zlib.h.
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
- typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
- typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
diff --git a/emulators/ucon64/patches/patch-libdiscmage_misc.c b/emulators/ucon64/patches/patch-libdiscmage_misc.c
deleted file mode 100644
index 2b609de53e0..00000000000
--- a/emulators/ucon64/patches/patch-libdiscmage_misc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-libdiscmage_misc.c,v 1.1 2020/12/20 15:15:02 fcambus Exp $
-
-Fixed crash in change_mem2() on 64-bit platforms.
-
-Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/
-
---- libdiscmage/misc.c.orig	2020-07-03 08:13:04.000000000 +0000
-+++ libdiscmage/misc.c
-@@ -1874,7 +1874,7 @@ change_mem2 (char *buf, size_t bufsize, 
- 
-           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
diff --git a/emulators/ucon64/patches/patch-misc_ioapi.h b/emulators/ucon64/patches/patch-misc_ioapi.h
deleted file mode 100644
index 859bb30813a..00000000000
--- a/emulators/ucon64/patches/patch-misc_ioapi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-misc_ioapi.h,v 1.1 2020/12/05 13:16:36 wiz Exp $
-
-OF is not defined in zlib.h on all systems.
-From upstream.
-
---- misc/ioapi.h.orig	2016-03-03 13:55:44.000000000 +0000
-+++ misc/ioapi.h
-@@ -35,6 +35,11 @@
- extern "C" {
- #endif
- 
-+// On NetBSD and Gentoo, OF is not defined in zconf.h, which is included by zlib.h.
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
- typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
- typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
diff --git a/emulators/ucon64/patches/patch-misc_misc.c b/emulators/ucon64/patches/patch-misc_misc.c
deleted file mode 100644
index d5c083694f3..00000000000
--- a/emulators/ucon64/patches/patch-misc_misc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-misc_misc.c,v 1.1 2020/12/20 15:15:02 fcambus Exp $
-
-Fixed crash in change_mem2() on 64-bit platforms.
-
-Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/
-
---- misc/misc.c.orig	2020-07-03 08:09:50.000000000 +0000
-+++ misc/misc.c
-@@ -501,7 +501,7 @@ change_mem2 (char *buf, size_t bufsize, 
- 
-           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