[109600] trunk/dports/lang/erlang
mojca at macports.org
mojca at macports.org
Sun Aug 18 05:59:59 PDT 2013
Revision: 109600
https://trac.macports.org/changeset/109600
Author: mojca at macports.org
Date: 2013-08-18 05:59:58 -0700 (Sun, 18 Aug 2013)
Log Message:
-----------
erlang: whitespace & append '.diff' to patches only
Modified Paths:
--------------
trunk/dports/lang/erlang/Portfile
Added Paths:
-----------
trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c.diff
trunk/dports/lang/erlang/files/patch-lib_wx_configure.diff
trunk/dports/lang/erlang/files/patch-lib_wx_configure.in.diff
Removed Paths:
-------------
trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c
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 2013-08-18 12:33:55 UTC (rev 109599)
+++ trunk/dports/lang/erlang/Portfile 2013-08-18 12:59:58 UTC (rev 109600)
@@ -1,45 +1,44 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
+PortSystem 1.0
-name erlang
-version R16B01
-categories lang erlang
-maintainers bfulgham
-platforms darwin
-license MPL
+name erlang
+version R16B01
+categories lang erlang
+maintainers bfulgham
+platforms darwin
+license MPL
license_noconflict perl5
-description The Erlang Programming Language
-long_description \
- Erlang is a programming language designed at the \
- Ericsson Computer Science Laboratory. Open-source \
- Erlang is being released to help encourage the spread \
- of Erlang outside Ericsson. \
- \
- We are releasing free of charge: \
- The entire source code of the current Erlang \
- system. \
- Extensive libraries of code for building robust \
- fault-tolerant distributed applications. \
- All with documentation. \
- \
- All the above software has been battle tested in a \
- number of Ericsson products, for example the new \
- Ericsson ATM switch.
+description The Erlang Programming Language
+long_description Erlang is a programming language designed at the \
+ Ericsson Computer Science Laboratory. Open-source \
+ Erlang is being released to help encourage the spread \
+ of Erlang outside Ericsson. \
+ \
+ We are releasing free of charge: \
+ The entire source code of the current Erlang \
+ system. \
+ Extensive libraries of code for building robust \
+ fault-tolerant distributed applications. \
+ All with documentation. \
+ \
+ All the above software has been battle tested in a \
+ number of Ericsson products, for example the new \
+ Ericsson ATM switch.
-homepage http://www.erlang.org/
-master_sites http://www.erlang.org/download/ \
- http://www.erlang.org/download/patches/:patches
+homepage http://www.erlang.org/
+master_sites http://www.erlang.org/download/ \
+ http://www.erlang.org/download/patches/:patches
# Parallel build doesn't work as per R13B01
use_parallel_build no
universal_variant no
-distfiles otp_src_${version}${extract.suffix} \
- otp_doc_man_${version}${extract.suffix} \
- otp_doc_html_${version}${extract.suffix}
+distfiles otp_src_${version}${extract.suffix} \
+ otp_doc_man_${version}${extract.suffix} \
+ otp_doc_html_${version}${extract.suffix}
checksums otp_src_${version}.tar.gz \
rmd160 0e3eccb9ec2797dab0a43e94434e148e971ded7c \
@@ -51,70 +50,70 @@
rmd160 46fa69b8ec46c1c5a77d0ead33aa7fcd5a9b36fd \
sha256 fa8fc507b3f799e8ff4d2ab800f054f3f99b39212e348504024403a6951bd036
-pre-patch { file rename ${workpath}/otp_src_${version} ${workpath}/${name}-${version} }
+pre-patch { file rename ${workpath}/otp_src_${version} ${workpath}/${name}-${version} }
# http://www.erlang.org/pipermail/erlang-bugs/2009-January/001171.html
-patchfiles patch-toolbar.erl.diff \
- patch-erts_emulator_Makefile.in.diff \
- patch-erts_configure.diff \
- patch-disable_wx.diff
+patchfiles patch-toolbar.erl.diff \
+ patch-erts_emulator_Makefile.in.diff \
+ patch-erts_configure.diff \
+ patch-disable_wx.diff
-configure.args --prefix=${prefix} \
- --enable-kernel-poll \
- --enable-threads \
- --enable-dynamic-ssl-lib \
- --enable-smp-support \
- --enable-hipe \
- --without-ssl \
- --without-odbc
+configure.args --prefix=${prefix} \
+ --enable-kernel-poll \
+ --enable-threads \
+ --enable-dynamic-ssl-lib \
+ --enable-smp-support \
+ --enable-hipe \
+ --without-ssl \
+ --without-odbc
-depends_build port:gawk port:perl5
+depends_build port:gawk port:perl5
# ${prefix}/lib/erlang/erts-5.8.4/bin/beam.smp links with ncurses
-depends_lib port:ncurses
+depends_lib port:ncurses
# Erlang seems to have an on-again/off-again relationship with Clang.
# As of XCode 4.2, it's off again.
compiler.blacklist clang
post-destroot {
- system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_html_${version}${extract.suffix}"
- system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_man_${version}${extract.suffix}"
+ system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_html_${version}${extract.suffix}"
+ system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_man_${version}${extract.suffix}"
- set erts_dir erts-5.10.2
- set erl_interface_dir erl_interface-3.7.13
- set wx_dir wx-1.0
+ set erts_dir erts-5.10.2
+ set erl_interface_dir erl_interface-3.7.13
+ set wx_dir wx-1.0
- reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/erl
- reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/start
- reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/${erts_dir}/bin/erl
- reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/${erts_dir}/bin/start
+ reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/erl
+ reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/start
+ reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/${erts_dir}/bin/erl
+ reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/${erts_dir}/bin/start
- foreach x {dialyzer ear ecc elink epmd erl erlc escript run_erl start to_erl typer} { file delete -force ${destroot}${prefix}/bin/${x} }
- foreach x {dialyzer erl erlc escript run_erl start to_erl typer} { system "ln -s ../lib/erlang/bin/${x} ${destroot}${prefix}/bin/${x}" }
+ foreach x {dialyzer ear ecc elink epmd erl erlc escript run_erl start to_erl typer} { file delete -force ${destroot}${prefix}/bin/${x} }
+ foreach x {dialyzer erl erlc escript run_erl start to_erl typer} { system "ln -s ../lib/erlang/bin/${x} ${destroot}${prefix}/bin/${x}" }
- file delete -force ${destroot}${prefix}/lib/erlang/bin/epmd
- system "ln -s ../${erts_dir}/bin/epmd ${destroot}${prefix}/lib/erlang/bin/epmd"
- system "ln -s ../lib/erlang/lib/${erl_interface_dir}/bin/erl_call ${destroot}${prefix}/bin/erl_call"
+ file delete -force ${destroot}${prefix}/lib/erlang/bin/epmd
+ system "ln -s ../${erts_dir}/bin/epmd ${destroot}${prefix}/lib/erlang/bin/epmd"
+ system "ln -s ../lib/erlang/lib/${erl_interface_dir}/bin/erl_call ${destroot}${prefix}/bin/erl_call"
}
platform darwin 10 {
- patchfiles-delete patch-lib_ssl_c_src_esock_openssl.c
+ patchfiles-delete patch-lib_ssl_c_src_esock_openssl.c.diff
# 10.6 (and 10.6.1) has a bad bug related to using dlopen in a thread.
# rdar://7209349 - http://www.openradar.appspot.com/7209349
# This is a workaround.
- patchfiles-append patch-erts_emulator_sys_unix_ddll.c.diff
- configure.ldflags-append -framework CoreFoundation
+ patchfiles-append patch-erts_emulator_sys_unix_ddll.c.diff
+ configure.ldflags-append -framework CoreFoundation
}
platform darwin 11 {
- #patchfiles-delete patch-lib_ssl_c_src_esock_openssl.c
+ #patchfiles-delete patch-lib_ssl_c_src_esock_openssl.c.diff
# 10.6 (and 10.6.1) has a bad bug related to using dlopen in a thread.
# rdar://7209349 - http://www.openradar.appspot.com/7209349
# This is a workaround.
- #patchfiles-append patch-erts_emulator_sys_unix_ddll.c.diff
- configure.ldflags-append -framework CoreFoundation
+ #patchfiles-append patch-erts_emulator_sys_unix_ddll.c.diff
+ configure.ldflags-append -framework CoreFoundation
}
platform darwin {
@@ -123,41 +122,41 @@
supported_archs i386 ppc
}
if {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
- configure.args-append --enable-darwin-64bit
+ configure.args-append --enable-darwin-64bit
} else {
- configure.args-append --disable-darwin-64-bit
+ configure.args-append --disable-darwin-64-bit
}
}
-default_variants +ssl
-
variant wxwidgets description {Build wxWidgets support} {
- patchfiles-delete patch-disable_wx.diff
- patchfiles-append patch-lib_wx_configure.in \
- patch-lib_wx_configure
- depends_lib-append port:wxWidgets
- depends_run-append port:tk
+ patchfiles-delete patch-disable_wx.diff
+ patchfiles-append patch-lib_wx_configure.in.diff \
+ patch-lib_wx_configure.diff
+ depends_lib-append port:wxWidgets
+ depends_run-append port:tk
}
variant ssl description {Build SSL support} {
- configure.args-delete --without-ssl
- configure.args-append --with-ssl=${prefix}
- configure.ldflags-append -lz
- depends_lib-append port:openssl
+ configure.args-delete --without-ssl
+ configure.args-append --with-ssl=${prefix}
+ configure.ldflags-append -lz
+ depends_lib-append port:openssl
}
variant nohipe description {Disable HiPE (native-code bytecode compiler)} {
- configure.args-delete --enable-hipe
+ configure.args-delete --enable-hipe
}
variant odbc description {Build ODBC support} {
- depends_lib-append port:unixODBC
- configure.args-delete --without-odbc
- configure.args-append --with-odbc=${prefix}
+ depends_lib-append port:unixODBC
+ configure.args-delete --without-odbc
+ configure.args-append --with-odbc=${prefix}
}
+default_variants +ssl
+
# Livecheck
-livecheck.type regex
-livecheck.version ${version}
-livecheck.url ${homepage}download/
-livecheck.regex "otp_src_(R\[0-9\]+\[AB\]\[0-9\]*(-\[0-9\])?)\\.tar\\.gz"
+livecheck.type regex
+livecheck.version ${version}
+livecheck.url ${homepage}download/
+livecheck.regex "otp_src_(R\[0-9\]+\[AB\]\[0-9\]*(-\[0-9\])?)\\.tar\\.gz"
Deleted: trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c 2013-08-18 12:33:55 UTC (rev 109599)
+++ trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c 2013-08-18 12:59:58 UTC (rev 109600)
@@ -1,13 +0,0 @@
---- lib/ssl/c_src/esock_openssl.c.orig 2008-11-04 12:17:23.000000000 +0100
-+++ lib/ssl/c_src/esock_openssl.c 2008-11-06 07:46:48.000000000 +0100
-@@ -907,8 +907,8 @@
- }
-
- /* info callback */
-- if (debug)
-- SSL_CTX_set_info_callback(ctx, info_callback);
-+ /*if (debug)
-+ SSL_CTX_set_info_callback(ctx, info_callback); */
-
- DEBUGF(("set_ssl_parameters: done\n"));
- /* Free arg list */
Copied: trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c.diff (from rev 109599, trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c)
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c.diff (rev 0)
+++ trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c.diff 2013-08-18 12:59:58 UTC (rev 109600)
@@ -0,0 +1,13 @@
+--- lib/ssl/c_src/esock_openssl.c.orig 2008-11-04 12:17:23.000000000 +0100
++++ lib/ssl/c_src/esock_openssl.c 2008-11-06 07:46:48.000000000 +0100
+@@ -907,8 +907,8 @@
+ }
+
+ /* info callback */
+- if (debug)
+- SSL_CTX_set_info_callback(ctx, info_callback);
++ /*if (debug)
++ SSL_CTX_set_info_callback(ctx, info_callback); */
+
+ DEBUGF(("set_ssl_parameters: done\n"));
+ /* Free arg list */
Deleted: trunk/dports/lang/erlang/files/patch-lib_wx_configure
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_wx_configure 2013-08-18 12:33:55 UTC (rev 109599)
+++ trunk/dports/lang/erlang/files/patch-lib_wx_configure 2013-08-18 12:59:58 UTC (rev 109600)
@@ -1,93 +0,0 @@
---- 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
Copied: trunk/dports/lang/erlang/files/patch-lib_wx_configure.diff (from rev 109599, trunk/dports/lang/erlang/files/patch-lib_wx_configure)
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_wx_configure.diff (rev 0)
+++ trunk/dports/lang/erlang/files/patch-lib_wx_configure.diff 2013-08-18 12:59:58 UTC (rev 109600)
@@ -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
Deleted: trunk/dports/lang/erlang/files/patch-lib_wx_configure.in
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_wx_configure.in 2013-08-18 12:33:55 UTC (rev 109599)
+++ trunk/dports/lang/erlang/files/patch-lib_wx_configure.in 2013-08-18 12:59:58 UTC (rev 109600)
@@ -1,41 +0,0 @@
---- 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"
Copied: trunk/dports/lang/erlang/files/patch-lib_wx_configure.in.diff (from rev 109599, trunk/dports/lang/erlang/files/patch-lib_wx_configure.in)
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_wx_configure.in.diff (rev 0)
+++ trunk/dports/lang/erlang/files/patch-lib_wx_configure.in.diff 2013-08-18 12:59:58 UTC (rev 109600)
@@ -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/20130818/2b8b3025/attachment-0001.html>
More information about the macports-changes
mailing list