[85252] trunk/dports/lang/erlang
bfulgham at macports.org
bfulgham at macports.org
Tue Oct 11 21:54:08 PDT 2011
Revision: 85252
http://trac.macports.org/changeset/85252
Author: bfulgham at macports.org
Date: 2011-10-11 21:54:08 -0700 (Tue, 11 Oct 2011)
Log Message:
-----------
* Update patchfiles to comply with patch naming conventions.
* Update Portfile to remove port lint --nitpick warnings.
Modified Paths:
--------------
trunk/dports/lang/erlang/Portfile
Added Paths:
-----------
trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in.diff
trunk/dports/lang/erlang/files/patch-toolbar.erl.diff
Removed Paths:
-------------
trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in
trunk/dports/lang/erlang/files/patch-toolbar.erl
Modified: trunk/dports/lang/erlang/Portfile
===================================================================
--- trunk/dports/lang/erlang/Portfile 2011-10-12 04:53:41 UTC (rev 85251)
+++ trunk/dports/lang/erlang/Portfile 2011-10-12 04:54:08 UTC (rev 85252)
@@ -1,7 +1,8 @@
+# -*- 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$
-# -*- 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
-PortSystem 1.0
+PortSystem 1.0
+
name erlang
version R14B04
revision 1
@@ -52,8 +53,8 @@
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 \
- patch-erts_emulator_Makefile.in \
+patchfiles patch-toolbar.erl.diff \
+ patch-erts_emulator_Makefile.in.diff \
patch-erts_configure.diff \
patch-disable_wx.diff
@@ -76,7 +77,7 @@
set erts_dir erts-5.8.5
set erl_interface_dir erl_interface-3.7.5
- set wx_dir wx-0.99
+ set wx_dir wx-0.99
reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/erl
reinplace s|${destroot}|| ${destroot}${prefix}/lib/erlang/bin/start
@@ -160,7 +161,7 @@
configure.args-append --with-odbc=${prefix}
}
-# Livecheck
+# Livecheck
livecheck.type regex
livecheck.version ${version}
livecheck.url ${homepage}download/
Deleted: trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in 2011-10-12 04:53:41 UTC (rev 85251)
+++ trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in 2011-10-12 04:54:08 UTC (rev 85252)
@@ -1,25 +0,0 @@
---- 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
-@@ -36,7 +36,12 @@
- M4FLAGS=
- CREATE_DIRS=
-
--LDFLAGS=@LDFLAGS@
-+# On x86_64, the default pagezero_size is 4GB, thus making it
-+# impossible to allocate an mmap between 0.5GB and 2GB, which
-+# is required by hipe.
-+# On i386, the default pagezero_size is 4KB which is what we'll
-+# set here.
-+LDFLAGS=@LDFLAGS@ -pagezero_size 0x400000
-
- ifeq ($(TYPE),debug)
- PURIFY =
-@@ -110,7 +115,7 @@
- override TYPE=opt
- PURIFY =
- TYPEMARKER =
--TYPE_FLAGS = @CFLAGS@
-+TYPE_FLAGS = -Ipcre @CFLAGS@
- endif
- endif
- endif
Copied: trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in.diff (from rev 84973, trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in)
===================================================================
--- trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in.diff (rev 0)
+++ trunk/dports/lang/erlang/files/patch-erts_emulator_Makefile.in.diff 2011-10-12 04:54:08 UTC (rev 85252)
@@ -0,0 +1,25 @@
+--- 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
+@@ -36,7 +36,12 @@
+ M4FLAGS=
+ CREATE_DIRS=
+
+-LDFLAGS=@LDFLAGS@
++# On x86_64, the default pagezero_size is 4GB, thus making it
++# impossible to allocate an mmap between 0.5GB and 2GB, which
++# is required by hipe.
++# On i386, the default pagezero_size is 4KB which is what we'll
++# set here.
++LDFLAGS=@LDFLAGS@ -pagezero_size 0x400000
+
+ ifeq ($(TYPE),debug)
+ PURIFY =
+@@ -110,7 +115,7 @@
+ override TYPE=opt
+ PURIFY =
+ TYPEMARKER =
+-TYPE_FLAGS = @CFLAGS@
++TYPE_FLAGS = -Ipcre @CFLAGS@
+ endif
+ endif
+ endif
Deleted: trunk/dports/lang/erlang/files/patch-toolbar.erl
===================================================================
--- trunk/dports/lang/erlang/files/patch-toolbar.erl 2011-10-12 04:53:41 UTC (rev 85251)
+++ trunk/dports/lang/erlang/files/patch-toolbar.erl 2011-10-12 04:54:08 UTC (rev 85252)
@@ -1,20 +0,0 @@
---- lib/toolbar/src/toolbar.erl.sav 2006-05-22 17:04:22.000000000 -0400
-+++ lib/toolbar/src/toolbar.erl 2006-05-22 17:05:07.000000000 -0400
-@@ -36,7 +36,7 @@
- -export([create_tool_file/0,add_gs_contribs/0]).
-
- %
---define (STARTUP_TIMEOUT, 20000).
-+-define (STARTUP_TIMEOUT, 40000).
-
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-@@ -234,7 +234,7 @@
- about_help ->
- WinObj = toolbar_graphics:get_window(Window),
- Text = ["Help text is on HTML format",
-- "Requires Netscape to be up and running"],
-+ "will be displayed in your default browser"],
- tool_utils:notify(WinObj, Text),
- loop(S,Window,LoopData,TimerRef);
-
Copied: trunk/dports/lang/erlang/files/patch-toolbar.erl.diff (from rev 84973, trunk/dports/lang/erlang/files/patch-toolbar.erl)
===================================================================
--- trunk/dports/lang/erlang/files/patch-toolbar.erl.diff (rev 0)
+++ trunk/dports/lang/erlang/files/patch-toolbar.erl.diff 2011-10-12 04:54:08 UTC (rev 85252)
@@ -0,0 +1,20 @@
+--- lib/toolbar/src/toolbar.erl.sav 2006-05-22 17:04:22.000000000 -0400
++++ lib/toolbar/src/toolbar.erl 2006-05-22 17:05:07.000000000 -0400
+@@ -36,7 +36,7 @@
+ -export([create_tool_file/0,add_gs_contribs/0]).
+
+ %
+--define (STARTUP_TIMEOUT, 20000).
++-define (STARTUP_TIMEOUT, 40000).
+
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+@@ -234,7 +234,7 @@
+ about_help ->
+ WinObj = toolbar_graphics:get_window(Window),
+ Text = ["Help text is on HTML format",
+- "Requires Netscape to be up and running"],
++ "will be displayed in your default browser"],
+ tool_utils:notify(WinObj, Text),
+ loop(S,Window,LoopData,TimerRef);
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111011/7c1fb471/attachment-0001.html>
More information about the macports-changes
mailing list