[148699] trunk/dports/math/octave-devel

[mcalhoun at macports.org]

Revision: 148699
          https://trac.macports.org/changeset/148699
Author:   mcalhoun at macports.org
Date:     2016-05-15 03:20:59 -0700 (Sun, 15 May 2016)
Log Message:
-----------
octave-devel, octave-devel-rc, octave-devel-release: incorporate fixes from main octave port intended for older systems
no revbump since ports build successfully or not at all

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile

Added Paths:
-----------
    trunk/dports/math/octave-devel/files/patch-gl2ps_renderer.diff

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2016-05-15 09:55:48 UTC (rev 148698)
+++ trunk/dports/math/octave-devel/Portfile	2016-05-15 10:20:59 UTC (rev 148699)
@@ -5,6 +5,7 @@
 PortGroup           compilers  1.0
 PortGroup           muniversal 1.0
 PortGroup           active_variants 1.1
+PortGroup           compiler_blacklist_versions 1.0
 PortGroup           select     1.0
 
 name                octave-devel
@@ -94,6 +95,15 @@
     livecheck.regex   "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\nrelease-"
 }
 
+# Block compilers: Some older versions of CLANG do not honor the CPATH
+# environment variables, which is required for compiling this port
+# when using MacPorts.  The versions seem to be: MacPorts CLANG 2.9 or
+# earlier, and Apple CLANG 318.0.58 or older.
+#
+# See also < http://llvm.org/bugs/show_bug.cgi?id=8971 >
+#          < https://trac.macports.org/ticket/40250 >.
+compiler.blacklist-append { clang <= 318.0.61 }
+
 select.group octave
 select.file  ${filespath}/${subport}
 
@@ -141,6 +151,17 @@
         patchfiles-append   \
             clang-libcxx-fix.patch
     }
+
+    # see https://trac.macports.org/ticket/44704
+    set gl2psbug no
+    if { ${configure.cc} eq "/usr/bin/clang" && [vercmp ${xcodeversion} 5.0.0] < 0 } {
+        set gl2psbug yes
+    } elseif { [variant_exists clang33] && [variant_isset clang33] } {
+        set gl2psbug yes
+    }
+    if { ${gl2psbug} } {
+        patchfiles-append   patch-gl2ps_renderer.diff
+    }
 }
 
 # need for autoconf

Added: trunk/dports/math/octave-devel/files/patch-gl2ps_renderer.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-gl2ps_renderer.diff	                        (rev 0)
+++ trunk/dports/math/octave-devel/files/patch-gl2ps_renderer.diff	2016-05-15 10:20:59 UTC (rev 148699)
@@ -0,0 +1,101 @@
+--- libinterp/corefcn/gl2ps-renderer.h.orig	2016-05-08 02:17:06.000000000 -0700
++++ libinterp/corefcn/gl2ps-renderer.h	2016-05-08 02:26:05.000000000 -0700
+@@ -35,8 +35,7 @@
+ glps_renderer : public opengl_renderer
+ {
+ public:
+-  glps_renderer (FILE *_fp, const std::string& _term)
+-    : opengl_renderer () , fp (_fp), term (_term), fontsize (), fontname () { }
++  glps_renderer (FILE *_fp, const std::string& _term);
+ 
+   ~glps_renderer (void) { }
+ 
+@@ -54,34 +53,9 @@
+   void draw_pixels (GLsizei w, GLsizei h, GLenum format,
+                     GLenum type, const GLvoid *data);
+ 
+-  void set_linestyle (const std::string& s, bool use_stipple = false)
+-  {
+-    opengl_renderer::set_linestyle (s, use_stipple);
+-
+-    if (s == "-" && ! use_stipple)
+-      gl2psDisable (GL2PS_LINE_STIPPLE);
+-    else
+-      gl2psEnable (GL2PS_LINE_STIPPLE);
+-  }
+-
+-  void set_polygon_offset (bool on, float offset = 0.0f)
+-  {
+-    if (on)
+-      {
+-        opengl_renderer::set_polygon_offset (on, offset);
+-        gl2psEnable (GL2PS_POLYGON_OFFSET_FILL);
+-      }
+-    else
+-      {
+-        gl2psDisable (GL2PS_POLYGON_OFFSET_FILL);
+-        opengl_renderer::set_polygon_offset (on, offset);
+-      }
+-  }
+-
+-  void set_linewidth (float w)
+-  {
+-    gl2psLineWidth (w);
+-  }
++  void set_linestyle (const std::string& s, bool use_stipple = false);
++  void set_polygon_offset (bool on, float offset = 0.0f);
++  void set_linewidth (float w);
+ 
+ private:
+   int alignment_to_mode (int ha, int va) const;
+--- libinterp/corefcn/gl2ps-renderer.cc.orig	2016-05-08 02:16:56.000000000 -0700
++++ libinterp/corefcn/gl2ps-renderer.cc	2016-05-08 02:29:17.000000000 -0700
+@@ -38,6 +38,9 @@
+ #include "gl2ps.h"
+ #include "sysdep.h"
+ 
++glps_renderer::glps_renderer (FILE *_fp, const std::string& _term)
++  : opengl_renderer () , fp (_fp), term (_term), fontsize (), fontname () { }
++
+ void
+ glps_renderer::draw (const graphics_object& go, const std::string& print_cmd)
+ {
+@@ -346,6 +349,38 @@
+     octave_pclose (f);
+ }
+ 
++void
++glps_renderer::set_linestyle (const std::string& s, bool use_stipple)
++{
++  opengl_renderer::set_linestyle (s, use_stipple);
++
++  if (s == "-" && ! use_stipple)
++    gl2psDisable (GL2PS_LINE_STIPPLE);
++  else
++    gl2psEnable (GL2PS_LINE_STIPPLE);
++}
++
++void
++glps_renderer::set_polygon_offset (bool on, float offset)
++{
++  if (on)
++    {
++      opengl_renderer::set_polygon_offset (on, offset);
++      gl2psEnable (GL2PS_POLYGON_OFFSET_FILL);
++    }
++  else
++    {
++      gl2psDisable (GL2PS_POLYGON_OFFSET_FILL);
++      opengl_renderer::set_polygon_offset (on, offset);
++    }
++}
++
++void
++glps_renderer::set_linewidth (float w)
++{
++  gl2psLineWidth (w);
++}
++
+ #endif
+ 
+ void
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160515/8f8907ed/attachment.html>