[MacPorts] #57822: cvs-fast-export: error on 10.14.2: 'CLOCK_REALTIME' macro redefined, and different types ('int' vs 'enum clockid_t')

[MacPorts]

#57822: cvs-fast-export: error on 10.14.2: 'CLOCK_REALTIME' macro redefined, and
different types ('int' vs 'enum clockid_t')
-------------------------------------------------+-------------------------
 Reporter:  ewenmcneill                          |      Owner:  (none)
     Type:  defect                               |     Status:  new
 Priority:  Normal                               |  Milestone:
Component:  ports                                |    Version:
 Keywords:  cvs-fast-export CLOCK_REALTIME       |       Port:  cvs-fast-
  clockid_t                                      |  export
-------------------------------------------------+-------------------------
 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 ('i
 nt' vs 'enum clockid_t')
 }}}

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

 This appears to be the same error as ticket:52388 (for macOS 10.12),
 [https://github.com/macports/macports-
 ports/commit/898ee2781b27a4e60f2f16366f46eb8b60316a47 fixed with a patch]
 about 18 months ago, on the [https://gitlab.com/esr/cvs-fast-
 export/issues/17 advice of upstream].

 However it appears this patch has been removed again (in two steps,
 [https://github.com/macports/macports-
 ports/commit/7d9000aaf4c3cb28a529aaec8c5baffba5ed60e9#diff-
 7d8182a960ad093810569ee6d01a938c commented out], then
 [https://github.com/macports/macports-
 ports/commit/587aa028e2c0f08b21a4bcb78d39821b989b271a#diff-
 7d8182a960ad093810569ee6d01a938c 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 at 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 at 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 at ashram:~/Desktop/macports$ port info --maintainer cvs-fast-export
 maintainer: mojca at macports.org mojca, openmaintainer
 ewen at ashram:~/Desktop/macports$
 }}}

 {{{
 ewen at 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 at 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$
 }}}

-- 
Ticket URL: <https://trac.macports.org/ticket/57822>
MacPorts <https://www.macports.org/>
Ports system for macOS