[153947] trunk/dports/graphics/oce

[Ryan Schmidt]

> On Oct 16, 2016, at 3:30 PM, mps at macports.org wrote:
> 
> Revision
> 153947
> Author
> mps at macports.org
> Date
> 2016-10-16 13:30:15 -0700 (Sun, 16 Oct 2016)
> Log Message
> 
> oce: fix Sierra build issue.
> Modified Paths
> 
> 	• trunk/dports/graphics/oce/Portfile
> Added Paths
> 
> 	• trunk/dports/graphics/oce/files/
> 	• trunk/dports/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff
> Diff
> 
> Modified: trunk/dports/graphics/oce/Portfile (153946 => 153947)
> --- trunk/dports/graphics/oce/Portfile	2016-10-16 19:48:51 UTC (rev 153946)
> +++ trunk/dports/graphics/oce/Portfile	2016-10-16 20:30:15 UTC (rev 153947)
> @@ -21,6 +21,10 @@
>  
>  depends_lib-append          port:freetype
>  
> +platform darwin 16 {
> +    patchfiles-append       patch-src-OSD-OSD_Chronometer.cxx.diff
> +}
> +
>  # tell CMake to build in a build directory
>  configure.dir               ${workpath}/build
>  build.dir                   ${configure.dir}
> 
> Added: trunk/dports/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff (0 => 153947)
> --- trunk/dports/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff	                        (rev 0)
> +++ trunk/dports/graphics/oce/files/patch-src-OSD-OSD_Chronometer.cxx.diff	2016-10-16 20:30:15 UTC (rev 153947)
> @@ -0,0 +1,16 @@
> +--- src/OSD/OSD_Chronometer.cxx.orig	2016-06-02 07:18:16.000000000 -0500
> ++++ src/OSD/OSD_Chronometer.cxx	2016-10-16 15:01:08.000000000 -0500
> +@@ -51,9 +51,10 @@
> +   #include <mach/mach.h>
> + #endif
> + 
> +-#if defined(__APPLE__) && defined(__MACH__)
> +-#include "gettime_osx.h"
> +-#endif
> ++//Not needed for Sierra

But you anticipate it will be needed again on Darwin 17 and later? If not, you should apply the patch on Darwin 16 and later, not just on Darwin 16.

> ++//#if defined(__APPLE__) && defined(__MACH__)
> ++//#include "gettime_osx.h"
> ++//#endif

Why comment out these lines? Why not remove them instead? It would make for a smaller and clearer patchfile.