CVS commit: pkgsrc/emulators/ucon64

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May  8 15:18:37 UTC 2021

Modified Files:
        pkgsrc/emulators/ucon64: DESCR Makefile PLIST

Log Message:
ucon64: Fix build on macOS. Patch from Daniël Hörchner.

"There are several reasons not to enable libdiscmage, which is different
than saying that it is unnecessary. It appears it is also unnecessary, as it
has never gotten further than alpha status and certain functionality was
actively disabled many years ago, but I never got any feedback about it.

The presence of libdiscmage caused confusion for some users and I had
discovered some issues in its limited functionality, so for version 2.2.1 of
uCON64 I decided to change the default of the configure script to
--without-libdiscmage. I probably should have stated that I consider
libdiscmage deprecated, because several distribution channels responded by
adding --with-libdiscmage to their build specifications for uCON64 instead.
Among those is pkgsrc."


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/emulators/ucon64/DESCR
cvs rdiff -u -r1.19 -r1.20 pkgsrc/emulators/ucon64/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/ucon64/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/ucon64/DESCR
diff -u pkgsrc/emulators/ucon64/DESCR:1.1.1.1 pkgsrc/emulators/ucon64/DESCR:1.2
--- pkgsrc/emulators/ucon64/DESCR:1.1.1.1       Tue Jul 26 04:12:22 2005
+++ pkgsrc/emulators/ucon64/DESCR       Sat May  8 15:18:37 2021
@@ -1,18 +1,15 @@
 uCON64 - THE tool for all your video game console concerns.
 
-- Support for 14+ different cartridge and disc-based video game console system
-- Support for ALL common patch file formats like: IPS *), APS, BSL, PPF and
-  Game Genie
-  *) with RLE compression
-- Support for 10+ different backup units to backup/restore ROM(s), disc(s) and
-  SRAM(s) like: Flash Advance Linker, Flash 2 Advance, Doctor V64 (Junior),
-  Super Wild Card, Game Doctor, Dexdrive, Super Magic Drive, Game Boy Xchanger
-  Mad Catz Camera Link, Lynxit, MD-PRO, SMS-PRO, PCE-PRO, GG-PRO, Super Flash
-  and your CD-writer.
+- Support for 14+ different cartridge and disc-based video game console systems.
+- Support for common patch file formats like: IPS, APS, BSL, PPF and Game Genie.
+- Support for 20+ different backup units to backup/restore ROM(s) and SRAM(s)
+  like: Super Wild Card, Super Pro Fighter, Game Doctor, Super Magic Drive,
+  Super Magic Card, Magic Super Griffin, Doctor V64 (Junior), Game Boy Xchanger,
+  Flash Advance Linker, Flash 2 Advance, MD-PRO, PCE-PRO, SMS-PRO, GG-PRO, CD64,
+  Pocket Linker, Super Flash, Super Card, SNES PowerPak and Super UFO Pro 8 SD.
 
   Including:
-  *VERY* verbose ROM information for ALL systems, detection of bad dumps using
-  internal checksums or DAT files, CRC32 calculation, ROM comparison,
-  modification (strip, pad, etc...), SRAM conversion (emulator <-> backup
-  unit), DiscJuggler and Nero image conversions, complete gzip and zip support
-  for all file-related funtions, etc...
+  Verbose ROM information for all systems, detection of bad dumps using internal
+  checksums or DAT files, CRC32 calculation, ROM comparison, modification
+  (strip, pad, etc.), SRAM conversion (emulator <-> backup unit), complete gzip
+  and zip support for all file related funtions.

Index: pkgsrc/emulators/ucon64/Makefile
diff -u pkgsrc/emulators/ucon64/Makefile:1.19 pkgsrc/emulators/ucon64/Makefile:1.20
--- pkgsrc/emulators/ucon64/Makefile:1.19       Fri Jan  8 21:39:04 2021
+++ pkgsrc/emulators/ucon64/Makefile    Sat May  8 15:18:37 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2021/01/08 21:39:04 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2021/05/08 15:18:37 nia Exp $
 
 DISTNAME=              ucon64-2.2.1-src
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ucon64/}
 
@@ -20,24 +20,19 @@ WRKSRC=                     ${WRKDIR}/${DISTNAME}/src
 CONFIGURE_ARGS+=               --with-libcd64
 .endif
 
+# parallel port I/O cannot work on macOS, even on Intel
 .if ${OPSYS} == "Darwin"
-EXT=   dylib
-.else
-EXT=   so
+CONFIGURE_ARGS+=               --disable-parallel
 .endif
 
-PLIST_SUBST+=                  EXT=${EXT}
-
-CONFIGURE_ARGS+=               --with-libdiscmage
 GNU_CONFIGURE=                 yes
 USE_TOOLS+=                    gmake
 CHECK_PORTABILITY_SKIP+=       install_beos.sh
 
-INSTALLATION_DIRS=     bin lib share/doc/ucon64/images
+INSTALLATION_DIRS=     bin share/doc/ucon64/images
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/ucon64 ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_LIB} ${WRKSRC}/libdiscmage/discmage.${EXT} ${DESTDIR}${PREFIX}/lib
        ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/*.html \
                ${DESTDIR}${PREFIX}/share/doc/ucon64
        ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/images/* \

Index: pkgsrc/emulators/ucon64/PLIST
diff -u pkgsrc/emulators/ucon64/PLIST:1.7 pkgsrc/emulators/ucon64/PLIST:1.8
--- pkgsrc/emulators/ucon64/PLIST:1.7   Fri Jan  8 21:39:04 2021
+++ pkgsrc/emulators/ucon64/PLIST       Sat May  8 15:18:37 2021
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2021/01/08 21:39:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/05/08 15:18:37 nia Exp $
 bin/ucon64
-lib/discmage.${EXT}
 share/doc/ucon64/changes.html
 share/doc/ucon64/developers.html
 share/doc/ucon64/faq.html