6 files changed, 71 insertions, 63 deletions

diff --git a/lang/erlang14/files/patch-Makefile.in b/lang/erlang14/files/patch-Makefile.in
deleted file mode 100644
index 86bb7e10acf2..000000000000
--- a/lang/erlang14/files/patch-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Tue Sep 14 13:46:54 2004
-+++ Makefile.in	Thu Oct  7 14:36:38 2004
-@@ -528,14 +528,9 @@
- # Erlang base public files
- #
- install.bin:
--	rm -f $(BINDIR)/erl $(BINDIR)/erlc \
--	      $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript
-+	rm -f $(BINDIR)/erl $(BINDIR)/erlc
- 	${LN_S} $(ERLANG_BINDIR)/erl      $(BINDIR)/erl
- 	${LN_S} $(ERLANG_BINDIR)/erlc     $(BINDIR)/erlc
--	${LN_S} $(ERLANG_BINDIR)/ecc      $(BINDIR)/ecc
--	${LN_S} $(ERLANG_BINDIR)/elink    $(BINDIR)/elink
--	${LN_S} $(ERLANG_BINDIR)/ear      $(BINDIR)/ear
--	${LN_S} $(ERLANG_BINDIR)/escript  $(BINDIR)/escript
- 
- #
- # Directories needed before we can install
diff --git a/lang/erlang14/files/patch-erts_configure b/lang/erlang14/files/patch-erts_configure
index 1b67a5a50324..6d776f45c1e0 100644
--- a/lang/erlang14/files/patch-erts_configure
+++ b/lang/erlang14/files/patch-erts_configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- erts/configure.orig
-+++ erts/configure
-@@ -1283,6 +1283,7 @@
+--- erts/configure.orig	Tue May 16 19:39:04 2006
++++ erts/configure	Thu May 18 15:40:47 2006
+@@ -1319,6 +1319,7 @@
  i586)	ARCH=x86;;
  i686)	ARCH=x86;;
  x86_64) ARCH=amd64;;
@@ -11,10 +8,10 @@ $FreeBSD$
  ppc)	ARCH=ppc;;
  ppc64)	ARCH=ppc64;;
  "Power Macintosh")	ARCH=ppc;;
-@@ -5804,7 +5805,9 @@
+@@ -6799,7 +6800,9 @@
  
  echo $ac_n "checking for unreliable floating point execptions""... $ac_c" 1>&6
- echo "configure:5807: checking for unreliable floating point execptions" >&5
+ echo "configure:6802: checking for unreliable floating point execptions" >&5
 -if test "$cross_compiling" = yes; then
 +if test "${ARCH}" = amd64; then
 +  erl_ok=reliable
diff --git a/lang/erlang14/files/patch-erts_emulator_hipe_hipe__x86.c b/lang/erlang14/files/patch-erts_emulator_hipe_hipe__x86.c
new file mode 100644
index 000000000000..b7086a076357
--- /dev/null
+++ b/lang/erlang14/files/patch-erts_emulator_hipe_hipe__x86.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- erts/emulator/hipe/hipe_x86.c.orig
++++ erts/emulator/hipe/hipe_x86.c
+@@ -106,7 +106,7 @@
+ 	abort();
+     map_start = mmap(map_hint, map_bytes,
+ 		     PROT_EXEC|PROT_READ|PROT_WRITE,
+-		     MAP_PRIVATE|MAP_ANONYMOUS
++		     MAP_PRIVATE|MAP_ANON
+ #ifdef __x86_64__
+ 		     |MAP_32BIT
+ #endif
diff --git a/lang/erlang14/files/patch-lib_dialyzer_src_Makefile b/lang/erlang14/files/patch-lib_dialyzer_src_Makefile
new file mode 100644
index 000000000000..521909e142a2
--- /dev/null
+++ b/lang/erlang14/files/patch-lib_dialyzer_src_Makefile
@@ -0,0 +1,38 @@
+
+$FreeBSD$
+
+--- lib/dialyzer/src/Makefile.orig
++++ lib/dialyzer/src/Makefile
+@@ -65,7 +65,7 @@
+ 	dialyzer_plt \
+ 	dialyzer_typesig
+ 
+-EXTRA_FILES= dialyzer.hrl ../plt/dialyzer_init_plt	## automatically generated
++EXTRA_FILES= dialyzer.hrl				## automatically generated
+ 
+ ERL_FILES= $(MODULES:%=%.erl)
+ INSTALL_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+@@ -89,7 +89,7 @@
+ # Targets
+ # ----------------------------------------------------
+ 
+-debug opt: $(TARGET_FILES) $(DIALYZER_DIR)/plt/dialyzer_init_plt
++debug opt: $(TARGET_FILES)
+ 
+ docs:
+ 
+@@ -125,7 +125,6 @@
+ dialyzer.hrl: dialyzer.hrl.src ../vsn.mk Makefile
+ 	sed -e "s;%VSN%;$(VSN);" \
+ 	    -e "s;%DEF_LIBS%;\[$(DIALYZER_DEF_LIBS)\];" \
+-	    -e "s;%DIALYZER_DIR%;\"$(DIALYZER_DIR)\";" \
+ 		$< > $@
+ 
+ # ---------------------------------------------------------------------
+@@ -155,6 +154,5 @@
+ 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) $(RELSYSDIR)/plt
+-	$(INSTALL_DATA) ../plt/dialyzer_init_plt $(RELSYSDIR)/plt
+ 
+ release_docs_spec:
diff --git a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer.hrl.src b/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer.hrl.src
new file mode 100644
index 000000000000..698769adb62a
--- /dev/null
+++ b/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer.hrl.src
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lib/dialyzer/src/dialyzer.hrl.src.orig
++++ lib/dialyzer/src/dialyzer.hrl.src
+@@ -22,7 +22,7 @@
+ 
+ %% Values will be set by the Makefile
+ -define(DEFAULT_LIBS, %DEF_LIBS%).
+--define(DIALYZER_DIR, %DIALYZER_DIR%).
++-define(DIALYZER_DIR, code:lib_dir (dialyzer)).
+ 
+ -record(analysis, {analysis_pid, core_transform=cerl_typean,
+ 		   defines=[], doc_plt,
diff --git a/lang/erlang14/files/patch-lib_hipe_cerl_cerl__hipeify.erl b/lang/erlang14/files/patch-lib_hipe_cerl_cerl__hipeify.erl
deleted file mode 100644
index 3f19ff5bfe1d..000000000000
--- a/lang/erlang14/files/patch-lib_hipe_cerl_cerl__hipeify.erl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-$FreeBSD$
-
---- lib/hipe/cerl/cerl_hipeify.erl.orig
-+++ lib/hipe/cerl/cerl_hipeify.erl
-@@ -14,7 +14,7 @@
- %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- %% USA
- %%
--%% $Id$
-+%% $Id: cerl_hipeify.erl,v 1.23 2006/03/10 13:40:37 tobiasl Exp $
- %%
- %% @author Richard Carlsson <richardc@csd.uu.se>
- %% @copyright 2000-2004 Richard Carlsson
-@@ -361,6 +361,19 @@
- 				cerl:atom_val(F),
- 				length(As))
- 		of
-+	        {yes, ?PRIMOP_IS_RECORD} ->
-+		    %% Needs additional testing
-+		    [_, Tag, Arity] = As,
-+		    case (cerl:is_c_atom(Tag) andalso 
-+			  cerl:is_c_int(Arity)) of
-+		        true ->
-+			    %% The primop might need further handling
-+			    N1 = cerl:c_atom(?PRIMOP_IS_RECORD),
-+			    E1 = cerl:update_c_primop(E, N1, As),
-+			    rewrite_primop(E1, N1, As, S);
-+		        false ->
-+			    cerl:update_c_call(E, M, F, As)
-+		    end;
- 		{yes, N} ->
- 		    %% The primop might need further handling
- 		    N1 = cerl:c_atom(N),