emulators/ucon64: Update to 2.2.0

* Switch to options framework to make the port more flexible
* Remove no longer required patches that have been adapted by upstream
* Add license information

Also while I'm here:
* Order variables a bit according to the PHB with the support of portclippy.

Notable changes since 2.0.0:

Additions:
* (N64) Support for remaining 6101, 6103, and 6106 bootcodes
* (Coleco) Recognition of Coleco ROMs
* (Virtual Boy) Recognition of Virtual Boy ROMs
* (NDS) Recognition of DS ROMs
* (Atari) Recognition of Atari VCS 2600 ROMs
* Added support for NetBSD
* Introduction of many new command-line switches

Updates/Fixes:
* Updated support for OpenBSD (64-bit)
* Many fixes/improvements for backup devices, ROM types and command-line
  switches

http://ucon64.sourceforge.net/ucon64/changes.html

PR:		238275
Submitted by:	Allison Nicole Reid <root@cooltrainer.org> (maintainer)

11 files changed, 60 insertions, 112 deletions

diff --git a/emulators/ucon64/Makefile b/emulators/ucon64/Makefile
index fbf22119ca60..1393bf7925a6 100644
--- a/emulators/ucon64/Makefile
+++ b/emulators/ucon64/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ucon64
-PORTVERSION=	2.0.0
+PORTVERSION=	2.2.0
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME:tl}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -9,13 +9,36 @@ 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
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-WRKSRC_SUBDIR=		src
+GNU_CONFIGURE=	yes
+
+WRKSRC_SUBDIR=	src
 
-PLIST_FILES=	bin/ucon64 lib/libdiscmage.so
+PLIST_FILES=	bin/ucon64
+
+OPTIONS_DEFINE=	COLOR DEBUG DISCMAGE PARALLEL USB ZLIB
+OPTIONS_DEFAULT=COLOR DISCMAGE PARALLEL USB ZLIB
+OPTIONS_SUB=	yes
+
+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
+
+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
@@ -24,6 +47,8 @@ post-patch:
 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
 
diff --git a/emulators/ucon64/distinfo b/emulators/ucon64/distinfo
index 9b8497001056..9cc85d1e472a 100644
--- a/emulators/ucon64/distinfo
+++ b/emulators/ucon64/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ucon64-2.0.0-src.tar.gz) = 62064324a1912387f84ac9d4c521c5d5e7b80f2567e9f61bf0ab3e1d976c0127
-SIZE (ucon64-2.0.0-src.tar.gz) = 1188488
+TIMESTAMP = 1559378280
+SHA256 (ucon64-2.2.0-src.tar.gz) = 5727e0be9ee878bba84d204135a7ca25662db6b56fee6895301e50c1bdda70af
+SIZE (ucon64-2.2.0-src.tar.gz) = 1488002
diff --git a/emulators/ucon64/files/patch-Makefile.in b/emulators/ucon64/files/patch-Makefile.in
deleted file mode 100644
index 724b968cfcdb..000000000000
--- a/emulators/ucon64/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-02-24 19:04:22.959942880 -0800
-+++ Makefile.in	2013-02-24 19:04:55.927943650 -0800
-@@ -68,7 +68,7 @@
- ifneq ($(OSTYPE),beos)
- ifeq ($(findstring freebsd,$(OSTYPE)),) # false if OSTYPE contains "freebsd"
- ifeq ($(findstring openbsd,$(OSTYPE)),) # false if OSTYPE contains "openbsd"
--LDFLAGS+=-ldl
-+#LDFLAGS+=-ldl
- endif
- endif
- endif
diff --git a/emulators/ucon64/files/patch-backup-lynxit.c b/emulators/ucon64/files/patch-backup-lynxit.c
deleted file mode 100644
index e436023df313..000000000000
--- a/emulators/ucon64/files/patch-backup-lynxit.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- backup/lynxit.c.orig 2013-02-24 18:40:11.525942823 -0800
-+++ backup/lynxit.c	2013-02-24 18:46:25.101942911 -0800
-@@ -561,7 +561,7 @@
-       return FALSE;
-     }
- 
--  if (strcmp (header.magic, "LYNX") != 0)
-+  if (memcmp (header.magic, "LYNX", sizeof(header.magic)) != 0)
-     {
-       MESSAGE (("ERROR    : %s is not a lynx image\n", filename));
-       fclose (fp);
-@@ -682,7 +682,7 @@
- #endif
- 
-   memset (&header, 0, sizeof (st_lnx_header_t));
--  strcpy (header.magic, MAGIC_STRING);
-+  memcpy (header.magic, MAGIC_STRING, sizeof(header.magic));
-   strcpy (header.cartname, cartname);
-   strcpy (header.manufname, manufname);
-   header.page_size_bank0 = cart_analyse (BANK0);
diff --git a/emulators/ucon64/files/patch-libdiscimage-misc_z.c b/emulators/ucon64/files/patch-libdiscimage-misc_z.c
deleted file mode 100644
index b7e80e85ac12..000000000000
--- a/emulators/ucon64/files/patch-libdiscimage-misc_z.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libdiscmage/misc_z.c.orig	2013-02-24 18:50:29.788944291 -0800
-+++ libdiscmage/misc_z.c	2013-02-24 18:51:00.403942771 -0800
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#define Z_SOLO
- #include <zlib.h>
- #include "misc_z.h"
- #include "misc.h"
diff --git a/emulators/ucon64/files/patch-libdiscimage-unzip.h b/emulators/ucon64/files/patch-libdiscimage-unzip.h
deleted file mode 100644
index 81d26859cd89..000000000000
--- a/emulators/ucon64/files/patch-libdiscimage-unzip.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- libdiscmage/unzip.h.orig	2013-02-24 18:48:58.073946338 -0800
-+++ libdiscmage/unzip.h	2013-02-24 18:50:15.451943149 -0800
-@@ -49,6 +49,10 @@
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff --git a/emulators/ucon64/files/patch-misc-archive.c b/emulators/ucon64/files/patch-misc-archive.c
deleted file mode 100644
index a9c5776aae9d..000000000000
--- a/emulators/ucon64/files/patch-misc-archive.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/archive.c.orig	2013-02-24 18:51:23.157943222 -0800
-+++ misc/archive.c	2013-02-24 18:55:00.666943043 -0800
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#define Z_SOLO
- #include <zlib.h>
- #ifdef  HAVE_BYTESWAP_H
- #include <byteswap.h>
diff --git a/emulators/ucon64/files/patch-misc-unzip.h b/emulators/ucon64/files/patch-misc-unzip.h
deleted file mode 100644
index cc99ae29d53e..000000000000
--- a/emulators/ucon64/files/patch-misc-unzip.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/unzip.h.orig	2013-02-24 18:47:37.112077049 -0800
-+++ misc/unzip.h	2013-02-24 18:48:46.040942781 -0800
-@@ -49,6 +49,10 @@
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff --git a/emulators/ucon64/files/patch-ucon64.c b/emulators/ucon64/files/patch-ucon64.c
index 12b0fa6c12a9..4d707a002389 100644
--- a/emulators/ucon64/files/patch-ucon64.c
+++ b/emulators/ucon64/files/patch-ucon64.c
@@ -1,21 +1,11 @@
---- ucon64.c.orig	2005-01-06 15:43:44.000000000 -0800
-+++ ucon64.c	2013-02-24 23:25:47.094966291 -0800
-@@ -1394,17 +1394,7 @@
- #ifdef  DLOPEN
-     ucon64.discmage_path;
- #else
--#if     defined __MSDOS__
--    "discmage.dxe";
--#elif   defined __CYGWIN__ || defined _WIN32
--    "discmage.dll";
--#elif   defined __APPLE__                       // Mac OS X actually
--    "libdiscmage.dylib";
--#elif   defined __unix__ || defined __BEOS__
+--- ucon64.c.orig	2019-05-29 15:54:58 UTC
++++ ucon64.c
+@@ -2081,7 +2081,7 @@ ucon64_usage (int argc, char *argv[], int view)
+ #elif   defined __APPLE__                       // Mac OS X actually
+     "libdiscmage.dylib";
+ #elif   defined __unix__ || defined __BEOS__
 -    "libdiscmage.so";
--#else
--    "unknown";
--#endif
 +    "%%PREFIX%%/lib/libdiscmage.so";
+ #else
+     "library";
  #endif
- 
-   if (!ucon64.discmage_enabled)
diff --git a/emulators/ucon64/files/patch-ucon64__misc.c b/emulators/ucon64/files/patch-ucon64__misc.c
new file mode 100644
index 000000000000..c2710ec3fa52
--- /dev/null
+++ b/emulators/ucon64/files/patch-ucon64__misc.c
@@ -0,0 +1,20 @@
+--- ucon64_misc.c.orig	2019-05-30 17:27:48 UTC
++++ ucon64_misc.c
+@@ -576,7 +576,7 @@ ucon64_load_discmage (void)
+ {
+   uint32_t version;
+ #ifdef  DLOPEN
+-  const char *p = get_property (ucon64.configfile, "discmage_path", PROPERTY_MODE_FILENAME);
++  const char *p = "%%PREFIX%%/lib/libdiscmage.so";
+   if (p)
+     strcpy (ucon64.discmage_path, p);
+   else
+@@ -1235,7 +1235,7 @@ ucon64_set_property_array (const char *org_configfile)
+ #elif   defined __APPLE__                       // Mac OS X actually
+                        PROPERTY_MODE_DIR ("ucon64") "discmage.dylib",
+ #elif   defined __unix__ || defined __BEOS__
+-                       PROPERTY_MODE_DIR ("ucon64") "discmage.so",
++                       "%%PREFIX%%/lib/libdiscmage.so",
+ #else
+                        "",
+ #endif
diff --git a/emulators/ucon64/files/patch-ucon64_misc.c b/emulators/ucon64/files/patch-ucon64_misc.c
deleted file mode 100644
index 32b4418ea19c..000000000000
--- a/emulators/ucon64/files/patch-ucon64_misc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ucon64_misc.c.orig	2013-02-24 22:48:15.577943937 -0800
-+++ ucon64_misc.c	2013-02-24 22:51:28.521008805 -0800
-@@ -1698,7 +1698,7 @@
- #elif   defined __APPLE__                       // Mac OS X actually
-         "~/.ucon64/discmage.dylib",
- #elif   defined __unix__ || defined __BEOS__
--        "~/.ucon64/discmage.so",
-+        "%%PREFIX%%/lib/libdiscmage.so",
- #else
-         "",
- #endif