[109601] trunk/dports/lang/erlang
mojca at macports.org
mojca at macports.org
Sun Aug 18 06:56:04 PDT 2013
Revision: 109601
https://trac.macports.org/changeset/109601
Author: mojca at macports.org
Date: 2013-08-18 06:56:04 -0700 (Sun, 18 Aug 2013)
Log Message:
-----------
erlang: adjust line numbers in patches and remove some unused/outdated ones (some unused still left)
Modified Paths:
--------------
trunk/dports/lang/erlang/Portfile
trunk/dports/lang/erlang/files/patch-disable_wx.diff
trunk/dports/lang/erlang/files/patch-erts_configure.diff
trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in.diff
trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64.c.diff
trunk/dports/lang/erlang/files/patch-erts_emulator_sys_unix_ddll.c.diff
trunk/dports/lang/erlang/files/patch-erts_emulator_sys_unix_sys_float.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-erts_emulator_hipe_hipe_amd64_asm.m4.diff
trunk/dports/lang/erlang/files/patch-lib-erl_interface-include-ei.h.diff
trunk/dports/lang/erlang/files/patch-lib-erl_interface-src-connect-ei_connect.c.diff
trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c.diff
Modified: trunk/dports/lang/erlang/Portfile
===================================================================
--- trunk/dports/lang/erlang/Portfile 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/Portfile 2013-08-18 13:56:04 UTC (rev 109601)
@@ -97,8 +97,6 @@
}
platform darwin 10 {
- 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.
@@ -107,8 +105,6 @@
}
platform darwin 11 {
- #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.
Modified: trunk/dports/lang/erlang/files/patch-disable_wx.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-disable_wx.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-disable_wx.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,6 +1,6 @@
---- lib/configure.orig 2010-12-08 02:07:22.000000000 +1100
-+++ lib/configure 2011-06-18 22:20:13.000000000 +1000
-@@ -278,7 +278,6 @@
+--- lib/configure.orig
++++ lib/configure
+@@ -277,7 +277,6 @@ ac_subdirs_all="$ac_subdirs_all erl_interface/."
ac_subdirs_all="$ac_subdirs_all gs/."
ac_subdirs_all="$ac_subdirs_all megaco/."
ac_subdirs_all="$ac_subdirs_all odbc/."
@@ -8,7 +8,7 @@
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs LIBOBJS LTLIBOBJS'
ac_subst_files=''
-@@ -1289,9 +1289,6 @@
+@@ -1285,9 +1284,6 @@ subdirs="$subdirs megaco/."
test ! -f odbc/configure ||
subdirs="$subdirs odbc/."
@@ -18,14 +18,14 @@
fi
---- lib/Makefile.orig 2010-12-08 02:07:22.000000000 +1100
-+++ lib/Makefile 2011-06-18 22:20:41.000000000 +1000
-@@ -24,7 +24,7 @@
+--- lib/Makefile.orig
++++ lib/Makefile
+@@ -25,7 +25,7 @@ OTHER_SUB_DIRECTORIES = tools test_server common_test runtime_tools \
ifdef BUILD_ALL
OTHER_SUB_DIRECTORIES += \
snmp otp_mibs appmon erl_interface asn1 jinterface \
- wx debugger reltool gs \
+ debugger reltool gs \
ic mnesia crypto orber os_mon parsetools syntax_tools \
- pman public_key ssl toolbar tv observer odbc \
- diameter \
+ pman public_key ssl toolbar tv observer odbc diameter \
+ cosTransactions cosEvent cosTime cosNotification \
Modified: trunk/dports/lang/erlang/files/patch-erts_configure.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_configure.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-erts_configure.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,6 +1,6 @@
---- erts/configure.orig 2010-02-22 20:02:57.000000000 +0100
-+++ erts/configure 2010-03-09 13:02:25.000000000 +0100
-@@ -34187,7 +34187,7 @@
+--- erts/configure.orig
++++ erts/configure
+@@ -35557,7 +35557,7 @@ static __inline__ int check_fpe(double f)
#include <machine/fpu.h>
#endif
#if !(defined(__OpenBSD__) && defined(__x86_64__))
Modified: trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,6 +1,6 @@
---- erts/emulator/Makefile.in.orig 2009-09-18 07:06:45.000000000 -0700
-+++ erts/emulator/Makefile.in 2009-10-03 20:09:16.000000000 -0700
-@@ -44,7 +44,12 @@
+--- erts/emulator/Makefile.in.orig
++++ erts/emulator/Makefile.in
+@@ -46,7 +46,12 @@ THR_DEFS=@EMU_THR_DEFS@
M4FLAGS=
CREATE_DIRS=
@@ -12,9 +12,9 @@
+# set here.
+LDFLAGS=@LDFLAGS@ -pagezero_size 0x400000
ARFLAGS=rc
+ OMIT_OMIT_FP=no
- ifeq ($(TYPE),debug)
-@@ -115,7 +120,7 @@
+@@ -125,7 +130,7 @@ else
override TYPE=opt
PURIFY =
TYPEMARKER =
Modified: trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64.c.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64.c.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64.c.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,5 +1,5 @@
---- erts/emulator/hipe/hipe_amd64.c 2009-03-12 13:16:06.000000000 +0100
-+++ erts/emulator/hipe/hipe_amd64.c 2009-09-02 19:54:51.000000000 +0200
+--- erts/emulator/hipe/hipe_amd64.c.orig
++++ erts/emulator/hipe/hipe_amd64.c
@@ -37,6 +37,10 @@
#undef ERL_FUN_SIZE
#include "hipe_literals.h"
Deleted: trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64_asm.m4.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64_asm.m4.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-erts_emulator_hipe_hipe_amd64_asm.m4.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,31 +0,0 @@
---- erts/emulator/hipe/hipe_amd64_asm.m4 2009-03-12 13:16:06.000000000 +0100
-+++ erts/emulator/hipe/hipe_amd64_asm.m4 2009-09-02 18:31:07.000000000 +0200
-@@ -37,6 +37,28 @@
- `#define LEAF_WORDS 'LEAF_WORDS
-
- /*
-+ * Workarounds for Darwin.
-+ */
-+ifelse(OPSYS,darwin,``
-+/* Darwin */
-+#define TEXT .text
-+#define JOIN(X,Y) X##Y
-+#define CSYM(NAME) JOIN(_,NAME)
-+#define ASYM(NAME) CSYM(NAME)
-+#define GLOBAL(NAME) .globl NAME
-+#define SET_SIZE(NAME) /*empty*/
-+#define TYPE_FUNCTION(NAME) /*empty*/
-+'',``
-+/* Not Darwin */
-+#define TEXT .section ".text"
-+#define CSYM(NAME) NAME
-+#define ASYM(NAME) NAME
-+#define GLOBAL(NAME) .global NAME
-+#define SET_SIZE(NAME) .size NAME,.-NAME
-+#define TYPE_FUNCTION(NAME) .type NAME, at function
-+'')dnl
-+
-+/*
- * Reserved registers.
- */
- `#define P %rbp'
Modified: trunk/dports/lang/erlang/files/patch-erts_emulator_sys_unix_ddll.c.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_emulator_sys_unix_ddll.c.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-erts_emulator_sys_unix_ddll.c.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,6 +1,6 @@
---- erts/emulator/sys/unix/erl_unix_sys_ddll.c.orig 2009-11-04 16:37:36.000000000 +0100
-+++ erts/emulator/sys/unix/erl_unix_sys_ddll.c 2009-11-04 16:38:28.000000000 +0100
-@@ -58,6 +58,12 @@
+--- erts/emulator/sys/unix/erl_unix_sys_ddll.c.orig
++++ erts/emulator/sys/unix/erl_unix_sys_ddll.c
+@@ -49,6 +49,13 @@ static char **errcodes = NULL;
static int num_errcodes = 0;
static int num_errcodes_allocated = 0;
@@ -10,6 +10,7 @@
+{
+ __CFInitialize();
+}
++
+ #define my_strdup(WHAT) my_strdup_in(ERTS_ALC_T_DDLL_ERRCODES, WHAT);
- static char *my_strdup(char *what)
- {
+ static char *my_strdup_in(ErtsAlcType_t type, char *what)
Modified: trunk/dports/lang/erlang/files/patch-erts_emulator_sys_unix_sys_float.c.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_emulator_sys_unix_sys_float.c.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-erts_emulator_sys_unix_sys_float.c.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,6 +1,6 @@
---- erts/emulator/sys/unix/sys_float.c.orig 2009-09-02 16:58:58.000000000 +0200
-+++ erts/emulator/sys/unix/sys_float.c 2009-09-02 16:59:03.000000000 +0200
-@@ -478,7 +478,7 @@
+--- erts/emulator/sys/unix/sys_float.c.orig
++++ erts/emulator/sys/unix/sys_float.c
+@@ -490,7 +490,7 @@ static int mask_fpe(void)
#include <machine/fpu.h>
#endif
#if !(defined(__OpenBSD__) && defined(__x86_64__))
Deleted: trunk/dports/lang/erlang/files/patch-lib-erl_interface-include-ei.h.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib-erl_interface-include-ei.h.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-lib-erl_interface-include-ei.h.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,21 +0,0 @@
---- lib/erl_interface/include/ei.h 2008-04-07 15:58:08.000000000 +0200
-+++ lib/erl_interface/include/ei.h 2009-01-19 14:54:50.000000000 +0100
-@@ -302,8 +302,10 @@
-
- int ei_connect(ei_cnode* ec, char *nodename);
- int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms);
-+int ei_connect_tmo_flags(ei_cnode* ec, char *nodename, unsigned ms, unsigned flags);
- int ei_xconnect(ei_cnode* ec, Erl_IpAddr adr, char *alivename);
- int ei_xconnect_tmo(ei_cnode* ec, Erl_IpAddr adr, char *alivename, unsigned ms);
-+int ei_xconnect_tmo_flags(ei_cnode* ec, Erl_IpAddr adr, char *alivename, unsigned ms, unsigned flags);
-
- int ei_receive(int fd, unsigned char *bufp, int bufsize);
- int ei_receive_tmo(int fd, unsigned char *bufp, int bufsize, unsigned ms);
-@@ -328,6 +330,7 @@
- int ei_publish_tmo(ei_cnode* ec, int port, unsigned ms);
- int ei_accept(ei_cnode* ec, int lfd, ErlConnect *conp);
- int ei_accept_tmo(ei_cnode* ec, int lfd, ErlConnect *conp, unsigned ms);
-+int ei_accept_tmo_flags(ei_cnode* ec, int lfd, ErlConnect *conp, unsigned ms, unsigned flags);
- int ei_unpublish(ei_cnode* ec);
- int ei_unpublish_tmo(const char *alive, unsigned ms);
-
Deleted: trunk/dports/lang/erlang/files/patch-lib-erl_interface-src-connect-ei_connect.c.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib-erl_interface-src-connect-ei_connect.c.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-lib-erl_interface-src-connect-ei_connect.c.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,137 +0,0 @@
---- lib/erl_interface/src/connect/ei_connect.c 2006-05-03 10:03:39.000000000 +0200
-+++ lib/erl_interface/src/connect/ei_connect.c 2009-01-19 14:52:25.000000000 +0100
-@@ -100,6 +100,11 @@
-
- #define COOKIE_FILE "/.erlang.cookie"
- #define EI_MAX_HOME_PATH 1024
-+#define DEFAULT_FLAGS \
-+ (DFLAG_EXTENDED_REFERENCES \
-+ | DFLAG_EXTENDED_PIDS_PORTS \
-+ | DFLAG_FUN_TAGS \
-+ | DFLAG_NEW_FUN_TAGS)
-
- /* FIXME why not macro? */
- static char *null_cookie = "";
-@@ -114,7 +119,7 @@
- static int send_status(int fd, char *status, unsigned ms);
- static int recv_status(int fd, unsigned ms);
- static int send_challenge(int fd, char *nodename,
-- unsigned challenge, unsigned version, unsigned ms);
-+ unsigned challenge, unsigned version, unsigned ms, unsigned flags);
- static int recv_challenge(int fd, unsigned *challenge,
- unsigned *version,
- unsigned *flags, ErlConnect *namebuf, unsigned ms);
-@@ -129,7 +134,7 @@
- unsigned our_challenge,
- char cookie[], unsigned ms);
- static int send_name(int fd, char *nodename,
-- unsigned version, unsigned ms);
-+ unsigned version, unsigned ms, unsigned flags);
-
- /* Common for both handshake types */
- static int recv_name(int fd,
-@@ -566,6 +571,11 @@
- */
- int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms)
- {
-+ return ei_connect_tmo_flags(ec, nodename, ms, DEFAULT_FLAGS);
-+}
-+
-+int ei_connect_tmo_flags(ei_cnode* ec, char *nodename, unsigned ms, unsigned our_flags)
-+{
- char *hostname, alivename[BUFSIZ];
- struct hostent *hp;
- #if !defined (__WIN32__)
-@@ -636,7 +646,7 @@
- }
- }
- #endif /* win32 */
-- return ei_xconnect_tmo(ec, (Erl_IpAddr) *hp->h_addr_list, alivename, ms);
-+ return ei_xconnect_tmo_flags(ec, (Erl_IpAddr) *hp->h_addr_list, alivename, ms, our_flags);
- } /* ei_connect */
-
- int ei_connect(ei_cnode* ec, char *nodename)
-@@ -653,6 +663,11 @@
- */
- int ei_xconnect_tmo(ei_cnode* ec, Erl_IpAddr adr, char *alivename, unsigned ms)
- {
-+ return ei_xconnect_tmo_flags(ec, adr, alivename, ms, DEFAULT_FLAGS);
-+}
-+
-+int ei_xconnect_tmo_flags(ei_cnode* ec, Erl_IpAddr adr, char *alivename, unsigned ms, unsigned our_flags)
-+{
- struct in_addr *ip_addr=(struct in_addr *) adr;
- int rport = 0; /*uint16 rport = 0;*/
- int sockd;
-@@ -690,7 +705,7 @@
- unsigned our_challenge, her_challenge;
- unsigned char our_digest[16];
-
-- if (send_name(sockd, ec->thisnodename, (unsigned) dist, ms))
-+ if (send_name(sockd, ec->thisnodename, (unsigned) dist, ms, our_flags))
- goto error;
- if (recv_status(sockd, ms))
- goto error;
-@@ -749,6 +764,11 @@
-
- int ei_accept_tmo(ei_cnode* ec, int lfd, ErlConnect *conp, unsigned ms)
- {
-+ return ei_accept_tmo_flags(ec, lfd, conp, ms, DEFAULT_FLAGS);
-+}
-+
-+int ei_accept_tmo_flags(ei_cnode* ec, int lfd, ErlConnect *conp, unsigned ms, unsigned our_flags)
-+{
- int fd;
- struct sockaddr_in cli_addr;
- int cli_addr_len=sizeof(struct sockaddr_in);
-@@ -786,7 +806,7 @@
- goto error;
- our_challenge = gen_challenge();
- if (send_challenge(fd, ec->thisnodename,
-- our_challenge, her_version, ms))
-+ our_challenge, her_version, ms, our_flags))
- goto error;
- if (recv_challenge_reply(fd, our_challenge,
- ec->ei_connect_cookie,
-@@ -1288,7 +1308,8 @@
- int f_chall,
- unsigned challenge,
- unsigned version,
-- unsigned ms)
-+ unsigned ms,
-+ unsigned our_flags)
- {
- char *buf;
- unsigned char *s;
-@@ -1308,10 +1329,7 @@
- put16be(s,siz - 2);
- put8(s, 'n');
- put16be(s, version);
-- put32be(s, (DFLAG_EXTENDED_REFERENCES
-- | DFLAG_EXTENDED_PIDS_PORTS
-- | DFLAG_FUN_TAGS
-- | DFLAG_NEW_FUN_TAGS));
-+ put32be(s, our_flags);
- if (f_chall)
- put32be(s, challenge);
- memcpy(s, nodename, strlen(nodename));
-@@ -1563,15 +1581,15 @@
- return -1;
- }
-
--static int send_name(int fd, char *nodename, unsigned version, unsigned ms)
-+static int send_name(int fd, char *nodename, unsigned version, unsigned ms, unsigned flags)
- {
-- return send_name_or_challenge(fd, nodename, 0, 0, version, ms);
-+ return send_name_or_challenge(fd, nodename, 0, 0, version, ms, flags);
- }
-
- static int send_challenge(int fd, char *nodename,
-- unsigned challenge, unsigned version, unsigned ms)
-+ unsigned challenge, unsigned version, unsigned ms, unsigned flags)
- {
-- return send_name_or_challenge(fd, nodename, 1, challenge, version, ms);
-+ return send_name_or_challenge(fd, nodename, 1, challenge, version, ms, flags);
- }
-
- static int recv_name(int fd,
Deleted: trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-lib_ssl_c_src_esock_openssl.c.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -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 */
Modified: trunk/dports/lang/erlang/files/patch-lib_wx_configure.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_wx_configure.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-lib_wx_configure.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,6 +1,6 @@
---- 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 @@
+--- lib/wx/configure.orig
++++ lib/wx/configure
+@@ -6116,10 +6116,10 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
@@ -13,7 +13,7 @@
#endif
-@@ -4945,10 +4945,10 @@
+@@ -6189,10 +6189,10 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
@@ -26,7 +26,7 @@
#endif
-@@ -5018,10 +5018,10 @@
+@@ -6262,10 +6262,10 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
@@ -39,7 +39,7 @@
#endif
-@@ -5091,10 +5091,10 @@
+@@ -6335,10 +6335,10 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
@@ -52,7 +52,7 @@
#endif
-@@ -5164,10 +5164,10 @@
+@@ -6408,10 +6408,10 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
@@ -65,7 +65,7 @@
#endif
-@@ -5237,10 +5237,10 @@
+@@ -6481,10 +6481,10 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
@@ -78,7 +78,7 @@
#endif
-@@ -5320,10 +5320,10 @@
+@@ -6564,10 +6564,10 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef WIN32
# include <windows.h>
# include <gl/glu.h>
Modified: trunk/dports/lang/erlang/files/patch-lib_wx_configure.in.diff
===================================================================
--- trunk/dports/lang/erlang/files/patch-lib_wx_configure.in.diff 2013-08-18 12:59:58 UTC (rev 109600)
+++ trunk/dports/lang/erlang/files/patch-lib_wx_configure.in.diff 2013-08-18 13:56:04 UTC (rev 109601)
@@ -1,6 +1,6 @@
---- 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 @@
+--- lib/wx/configure.in.orig
++++ lib/wx/configure.in
+@@ -545,10 +545,10 @@ AC_CHECK_TYPES([GLintptr, GLintptrARB, GLchar,
[#ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
@@ -13,7 +13,7 @@
#endif
])
-@@ -381,10 +381,10 @@
+@@ -563,10 +563,10 @@ AC_TRY_COMPILE([
#ifdef WIN32
# include <windows.h>
# include <gl/glu.h>
@@ -26,7 +26,7 @@
#endif
#ifndef CALLBACK
# define CALLBACK
-@@ -431,10 +431,10 @@
+@@ -613,10 +613,10 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
#ifdef WIN32
# include <windows.h>
# include <gl/gl.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130818/1060aa89/attachment.html>
More information about the macports-changes
mailing list