3 files changed, 10 insertions, 44 deletions

diff --git a/lang/erlang14/files/patch-lib_kernel_src_application__controller.erl b/lang/erlang14/files/patch-lib_kernel_src_application__controller.erl
deleted file mode 100644
index 2c9afc934e5c..000000000000
--- a/lang/erlang14/files/patch-lib_kernel_src_application__controller.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/kernel/src/application_controller.erl.orig
-+++ lib/kernel/src/application_controller.erl
-@@ -1398,7 +1398,7 @@
-     FName = atom_to_list(Name) ++ ".app",
-     case code:where_is_file(FName) of
- 	non_existing ->
--	    {error, {file:format_error({error,enoent}), FName}};
-+	    {error, {file:format_error(enoent), FName}};
- 	FullName ->
- 	    case file:consult(FullName) of
- 		{ok, [Application]} ->
diff --git a/lang/erlang14/files/patch-lib_odbc_configure b/lang/erlang14/files/patch-lib_odbc_configure
index fdb9d50eac0a..f74d6e1e696f 100644
--- a/lang/erlang14/files/patch-lib_odbc_configure
+++ b/lang/erlang14/files/patch-lib_odbc_configure
@@ -1,11 +1,14 @@
---- lib/odbc/configure.orig	Sat Jun 25 18:33:21 2005
-+++ lib/odbc/configure	Sat Jun 25 18:33:51 2005
-@@ -1096,7 +1096,7 @@
+
+$FreeBSD$
+
+--- lib/odbc/configure.orig
++++ lib/odbc/configure
+@@ -1005,7 +1005,7 @@
  	       echo $ac_n "checking for odbc in standard locations""... $ac_c" 1>&6
- echo "configure:1098: checking for odbc in standard locations" >&5
- 	         for dir in /opt/local/pgm/odbc /usr/local/odbc /usr/odbc \
--		     /usr
-+		     /usr /usr/local
+ echo "configure:1007: checking for odbc in standard locations" >&5
+ 	         for dir in /usr/local/odbc /usr/odbc \
+-		     /usr /opt/local/pgm/odbc 
++		     /usr /opt/local/pgm/odbc /usr/local
  		 do   
  		    if test -f "$dir/include/sql.h"; then
  		      is_odbc_std_location=yes	   
diff --git a/lang/erlang14/files/patch-lib_ssl_src_ssl__prim.erl b/lang/erlang14/files/patch-lib_ssl_src_ssl__prim.erl
deleted file mode 100644
index 94d8323434c0..000000000000
--- a/lang/erlang14/files/patch-lib_ssl_src_ssl__prim.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- lib/ssl/src/ssl_prim.erl.orig
-+++ lib/ssl/src/ssl_prim.erl
-@@ -107,7 +107,7 @@
- peername(St) when record(St, st), St#st.status =:= open  ->
-     case ssl_server:peername_prim(ssl_server_prim, St#st.fd) of
- 	{ok, {Address, Port}} ->
--	    {ok, At} = inet:getaddr(Address, inet),
-+	    {ok, At} = inet_parse:ipv4_address(Address),
- 	    {ok, {At, Port}};
- 	Error ->
- 	    Error
-@@ -119,7 +119,7 @@
- sockname(St) when record(St, st), St#st.status =:= open  ->
-     case ssl_server:sockname_prim(ssl_server_prim, St#st.fd) of
- 	{ok, {Address, Port}} ->
--	    {ok, At} = inet:getaddr(Address, inet),
-+	    {ok, At} = inet_parse:ipv4_address(Address),
- 	    {ok, {At, Port}};
- 	Error ->
- 	    Error