[50714] trunk/dports/lang/erlang
nottwo at macports.org
nottwo at macports.org
Thu May 7 09:02:49 PDT 2009
Revision: 50714
http://trac.macports.org/changeset/50714
Author: nottwo at macports.org
Date: 2009-05-07 09:02:49 -0700 (Thu, 07 May 2009)
Log Message:
-----------
erlang: patch lib/wx/configure so an installed port:mesa won't interfere with the build phase (Closes #19482)
Modified Paths:
--------------
trunk/dports/lang/erlang/Portfile
Added Paths:
-----------
trunk/dports/lang/erlang/files/patch-lib_wx_configure
trunk/dports/lang/erlang/files/patch-lib_wx_configure.in
Modified: trunk/dports/lang/erlang/Portfile
===================================================================
--- trunk/dports/lang/erlang/Portfile 2009-05-07 15:53:00 UTC (rev 50713)
+++ trunk/dports/lang/erlang/Portfile 2009-05-07 16:02:49 UTC (rev 50714)
@@ -3,7 +3,7 @@
PortSystem 1.0
name erlang
version R13B
-revision 2
+revision 3
categories lang erlang
maintainers bfulgham at macports.org
platforms darwin
@@ -58,7 +58,9 @@
patch-lib_ssl_c_src_Makefile.in \
patch-decode_big.c.diff \
patch-decode_fun.c.diff \
- patch-erts_configure.diff
+ patch-erts_configure.diff \
+ patch-lib_wx_configure.in \
+ patch-lib_wx_configure
configure.args --prefix=${destroot}${prefix} \
--enable-kernel-poll \
Added: trunk/dports/lang/erlang/files/patch-lib_wx_configure
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_wx_configure (rev 0)
+++ trunk/dports/lang/erlang/files/patch-lib_wx_configure 2009-05-07 16:02:49 UTC (rev 50714)
@@ -0,0 +1,93 @@
+--- lib/wx/configure.orig 2009-05-05 11:06:59.000000000 -0400
++++ lib/wx/configure 2009-05-05 11:09:13.000000000 -0400
+@@ -4872,10 +4872,10 @@
+ #ifdef WIN32
+ # include <windows.h>
+ # include <gl/gl.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/gl.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/gl.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/gl.h>
+ #endif
+
+
+@@ -4945,10 +4945,10 @@
+ #ifdef WIN32
+ # include <windows.h>
+ # include <gl/gl.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/gl.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/gl.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/gl.h>
+ #endif
+
+
+@@ -5018,10 +5018,10 @@
+ #ifdef WIN32
+ # include <windows.h>
+ # include <gl/gl.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/gl.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/gl.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/gl.h>
+ #endif
+
+
+@@ -5091,10 +5091,10 @@
+ #ifdef WIN32
+ # include <windows.h>
+ # include <gl/gl.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/gl.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/gl.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/gl.h>
+ #endif
+
+
+@@ -5164,10 +5164,10 @@
+ #ifdef WIN32
+ # include <windows.h>
+ # include <gl/gl.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/gl.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/gl.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/gl.h>
+ #endif
+
+
+@@ -5237,10 +5237,10 @@
+ #ifdef WIN32
+ # include <windows.h>
+ # include <gl/gl.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/gl.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/gl.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/gl.h>
+ #endif
+
+
+@@ -5320,10 +5320,10 @@
+ #ifdef WIN32
+ # include <windows.h>
+ # include <gl/glu.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/glu.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/glu.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/glu.h>
+ #endif
+ #ifndef CALLBACK
+ # define CALLBACK
Added: trunk/dports/lang/erlang/files/patch-lib_wx_configure.in
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_wx_configure.in (rev 0)
+++ trunk/dports/lang/erlang/files/patch-lib_wx_configure.in 2009-05-07 16:02:49 UTC (rev 50714)
@@ -0,0 +1,41 @@
+--- lib/wx/configure.in.orig 2009-05-05 16:04:51.000000000 -0400
++++ lib/wx/configure.in 2009-05-05 16:06:10.000000000 -0400
+@@ -363,10 +363,10 @@
+ [#ifdef WIN32
+ # include <windows.h>
+ # include <gl/gl.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/gl.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/gl.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/gl.h>
+ #endif
+ ])
+
+@@ -381,10 +381,10 @@
+ #ifdef WIN32
+ # include <windows.h>
+ # include <gl/glu.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/glu.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/glu.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/glu.h>
+ #endif
+ #ifndef CALLBACK
+ # define CALLBACK
+@@ -431,10 +431,10 @@
+ #ifdef WIN32
+ # include <windows.h>
+ # include <gl/gl.h>
+- #elif defined(HAVE_GL_GL_H)
+- # include <GL/gl.h>
+ #elif defined(HAVE_OPENGL_GL_H)
+ # include <OpenGL/gl.h>
++ #elif defined(HAVE_GL_GL_H)
++ # include <GL/gl.h>
+ #endif
+ #include "wx/wx.h"
+ #include "wx/stc/stc.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090507/575f8a88/attachment.html>
More information about the macports-changes
mailing list