Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Jun 2019 16:16:48 +0000 (UTC)
From:      Kai Knoblich <kai@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r503742 - in head/emulators/ucon64: . files
Message-ID:  <201906081616.x58GGm7e099474@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kai
Date: Sat Jun  8 16:16:48 2019
New Revision: 503742
URL: https://svnweb.freebsd.org/changeset/ports/503742

Log:
  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)

Added:
  head/emulators/ucon64/files/patch-ucon64__misc.c   (contents, props changed)
Deleted:
  head/emulators/ucon64/files/patch-Makefile.in
  head/emulators/ucon64/files/patch-backup-lynxit.c
  head/emulators/ucon64/files/patch-libdiscimage-misc_z.c
  head/emulators/ucon64/files/patch-libdiscimage-unzip.h
  head/emulators/ucon64/files/patch-misc-archive.c
  head/emulators/ucon64/files/patch-misc-unzip.h
  head/emulators/ucon64/files/patch-ucon64_misc.c
Modified:
  head/emulators/ucon64/Makefile
  head/emulators/ucon64/distinfo
  head/emulators/ucon64/files/patch-ucon64.c

Modified: head/emulators/ucon64/Makefile
==============================================================================
--- head/emulators/ucon64/Makefile	Sat Jun  8 15:59:46 2019	(r503741)
+++ head/emulators/ucon64/Makefile	Sat Jun  8 16:16:48 2019	(r503742)
@@ -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,14 +9,37 @@ 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
 
-PLIST_FILES=	bin/ucon64 lib/libdiscmage.so
+WRKSRC_SUBDIR=	src
 
+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
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/ucon64_misc.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
 

Modified: head/emulators/ucon64/distinfo
==============================================================================
--- head/emulators/ucon64/distinfo	Sat Jun  8 15:59:46 2019	(r503741)
+++ head/emulators/ucon64/distinfo	Sat Jun  8 16:16:48 2019	(r503742)
@@ -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

Modified: head/emulators/ucon64/files/patch-ucon64.c
==============================================================================
--- head/emulators/ucon64/files/patch-ucon64.c	Sat Jun  8 15:59:46 2019	(r503741)
+++ head/emulators/ucon64/files/patch-ucon64.c	Sat Jun  8 16:16:48 2019	(r503742)
@@ -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)

Added: head/emulators/ucon64/files/patch-ucon64__misc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/ucon64/files/patch-ucon64__misc.c	Sat Jun  8 16:16:48 2019	(r503742)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906081616.x58GGm7e099474>