Index: emulators/ucon64/Makefile =================================================================== --- emulators/ucon64/Makefile (revision 559448) +++ emulators/ucon64/Makefile (working copy) @@ -1,7 +1,7 @@ # $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 @@ -17,14 +17,17 @@ 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 @@ -32,6 +35,7 @@ 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 Index: emulators/ucon64/distinfo =================================================================== --- emulators/ucon64/distinfo (revision 559448) +++ emulators/ucon64/distinfo (working copy) @@ -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: emulators/ucon64/files/patch-Makefile =================================================================== --- emulators/ucon64/files/patch-Makefile (nonexistent) +++ emulators/ucon64/files/patch-Makefile (working copy) @@ -0,0 +1,15 @@ +Remove some hardcoded optimization/warnings flags. + +--- 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: 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: emulators/ucon64/files/patch-backup_libcd64_Makefile =================================================================== --- emulators/ucon64/files/patch-backup_libcd64_Makefile (nonexistent) +++ emulators/ucon64/files/patch-backup_libcd64_Makefile (working copy) @@ -0,0 +1,18 @@ +Remove some hardcoded optimization/warnings flags. + +--- 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: 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: emulators/ucon64/files/patch-libdiscmage_Makefile.in =================================================================== --- emulators/ucon64/files/patch-libdiscmage_Makefile.in (nonexistent) +++ emulators/ucon64/files/patch-libdiscmage_Makefile.in (working copy) @@ -0,0 +1,13 @@ +Remove some hardcoded optimization/warnings flags. + +--- 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: 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: emulators/ucon64/files/patch-libdiscmage_misc.c =================================================================== --- emulators/ucon64/files/patch-libdiscmage_misc.c (nonexistent) +++ emulators/ucon64/files/patch-libdiscmage_misc.c (working copy) @@ -0,0 +1,14 @@ +Fixes a crash in change_mem2() on 64-bit platforms. That function is used for +patching functionality. + +--- 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: 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: emulators/ucon64/files/patch-misc_misc.c =================================================================== --- emulators/ucon64/files/patch-misc_misc.c (nonexistent) +++ emulators/ucon64/files/patch-misc_misc.c (working copy) @@ -0,0 +1,14 @@ +Fixes a crash in change_mem2() on 64-bit platforms. That function is used for +patching functionality. + +--- 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: 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: emulators/ucon64/pkg-descr =================================================================== --- emulators/ucon64/pkg-descr (revision 559448) +++ emulators/ucon64/pkg-descr (working copy) @@ -4,4 +4,4 @@ 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