Re: Outdated version of uCON64.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Sun, Mar 04, 2018 at 12:51:36PM -0800, John Nemeth wrote:
> On Mar 4,  4:22pm, Thomas Klausner wrote:
> } On Sun, Mar 04, 2018 at 09:31:40AM +0100, "Daniël Hörchner" wrote:
> } >  
> } > I noticed on http://pkgsrc.se/emulators/ucon64 that you are still using version
> } > 2.0.0 of uCON64, which I develop and maintain. Would it be possible for you to
> } > upgrade to the latest version, 2.1.0? It includes quite a few bug fixes and
> } > code improvements as well as new features. If you need any assistance I am
> } > willing to help, but I do not have access to nor the time to set up a machine
> } > running NetBSD.
> } > The download link of the source code of uCON64 2.1.0 is:
> } > https://sourceforge.net/projects/ucon64/files/ucon64/ucon64-2.1.0/ucon64-2.1.0-src.tar.gz/download
> } >  
> } > Kind regards,
> } > Daniel
> } 
> } 
> } I've just updated the package.
> } 
> } I've attached the three patches we're using in pkgsrc now.
> } 
> } A short description:
> } * OF() is not defined in all zlib.h installations.
> } * We want to let users define their own optimization settings, so I've removed the -O3 override
> } * A header file needs to learn about NetBSD (which also provides inttypes.h)
> } 
> } Perhaps you can merge at least two of them :)
> 
>      There's a bug in the second patch (missing "||")...

Interesting. I see that there should be || for symmetry, but when I
add that, compilation breaks like before I added the
defined(__NetBSD__).

Now I'm confused.
 Thomas

> } $NetBSD: patch-libdiscmage_libdiscmage.h,v 1.1 2018/03/04 15:20:02 wiz Exp $
> } 
> } Fix build on NetBSD.
> } 
> } --- libdiscmage/libdiscmage.h.orig	2015-11-16 01:33:49.000000000 +0000
> } +++ libdiscmage/libdiscmage.h
> } @@ -28,7 +28,7 @@ extern "C" {
> }  
> }  #include <stdio.h>                              // FILENAME_MAX
> }  
> } -#if     defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__ || \
> } +#if     defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__ || defined(__NetBSD__) \
> +#if     defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__ || defined(__NetBSD__) || \
> }          defined __solaris__ || defined __MINGW32__ || defined __CYGWIN__ || \
> }          defined __BEOS__ || defined AMIGA || defined __APPLE__ // Mac OS X actually
> }  // We cannot use config.h (for HAVE_INTTYPES_H), because this header file may be
> } 
> }-- End of excerpt from Thomas Klausner
>