cvs-fast-export: 'CLOCK_REALTIME' macro redefined, and different types ('int' vs 'enum clockid_t')

[ewenmcneill (Ewen McNeill)]

After upgrading to macOS 10.14 and following wiki:Migration I found that cvs-fast-export fails to build:

:info:build ./cvs.h:437:13: error: typedef redefinition with different types ('int' vs 'enum clockid_t')

:info:build ./cvs.h:439:9: warning: 'CLOCK_REALTIME' macro redefined [-Wmacro-redefined]

This appears to be the same error as ticket:52388 (for macOS 10.12), fixed with a patch about 18 months ago, on the ​advice of upstream.

However it appears this patch has been removed again (in two steps, commented out, then removed as unused). Which seems to leave the same build errors as before, since cvs.h now unconditionally redefines CLOCK_REALTIME, etc, on all Apple platforms again. Possibly it was removed due to upstream including the patch upstream, but MacPorts hasn't updated to newer upstream? Either way it does not build for me today.

Perhaps the patch from ticket:52388 could be restored? Or maybe there's a newer upstream version to package that includes this fix?

Ewen

ewen@ashram:~/Desktop/macports$ uname -a
Darwin ashram 18.2.0 Darwin Kernel Version 18.2.0: Mon Nov 12 20:24:46 PST 2018; root:xnu-4903.231.4~2/RELEASE_X86_64 x86_64
ewen@ashram:~/Desktop/macports$ sudo port install cvs-fast-export
Password:
--->  Computing dependencies for cvs-fast-export
--->  Building cvs-fast-export
Error: Failed to build cvs-fast-export: command execution failed
Error: See /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_devel_cvs-fast-export/cvs-fast-export/main.log for details.
Error: Follow https://guide.macports.org/#project.tickets to report a bug.
Error: Processing of port cvs-fast-export failed
ewen@ashram:~/Desktop/macports$ port info --maintainer cvs-fast-export
maintainer: mojca@macports.org mojca, openmaintainer
ewen@ashram:~/Desktop/macports$ 

ewen@ashram:/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_devel_cvs-fast-export/cvs-fast-export/work/cvs-fast-export-1.43$ grep -A 5 "if defined(__APPLE" cvs.h 
#if defined(__APPLE__)
/* we mock this in utils.c; the CLOCK_REALTIME value is not used */
typedef int clockid_t;
int clock_gettime(clockid_t clock_id, struct timespec *tp);
#define CLOCK_REALTIME	0
#endif
ewen@ashram:/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_devel_cvs-fast-export/cvs-fast-export/work/cvs-fast-export-1.43$ 

[ewenmcneill (Ewen McNeill)]

cvs-fast-export/main.log from macOS 10.14 build attempt