From owner-svn-ports-all@freebsd.org Sat Jun 8 16:16:49 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91BA215AC7A4; Sat, 8 Jun 2019 16:16:49 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 36E208FDEC; Sat, 8 Jun 2019 16:16:49 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 247631DE46; Sat, 8 Jun 2019 16:16:49 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x58GGnfW099478; Sat, 8 Jun 2019 16:16:49 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x58GGm7e099474; Sat, 8 Jun 2019 16:16:48 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201906081616.x58GGm7e099474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Sat, 8 Jun 2019 16:16:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503742 - in head/emulators/ucon64: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in head/emulators/ucon64: . files X-SVN-Commit-Revision: 503742 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 36E208FDEC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jun 2019 16:16:49 -0000 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 (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