Force normal linkage against libcrypto. This allows the crypto module to

be build on amd64 and avoids text relocations elsewhere.
Apply build fix for FreeBSD from PR 38984.
Bump revision.

6 files changed, 62 insertions, 8 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 9d17881b43e..6743dbe40ce 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2008/04/08 13:16:22 martti Exp $
+# $NetBSD: Makefile,v 1.38 2008/06/21 22:13:09 joerg Exp $
 
 DISTNAME=		otp_src_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR}
 PKGNAME=		erlang-${ERLANG_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang
 MASTER_SITES=		http://www.erlang.org/download/
 
diff --git a/lang/erlang/PLIST.common b/lang/erlang/PLIST.common
index ccc46943824..d73cfc7aafc 100644
--- a/lang/erlang/PLIST.common
+++ b/lang/erlang/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.8 2008/04/08 13:22:06 martti Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2008/06/21 22:13:09 joerg Exp $
 bin/dialyzer
 bin/epmd
 bin/erl
@@ -3499,6 +3499,14 @@ lib/erlang/lib/ssl-${VERSION.ssl}/pkix/SSL-PKIX.asn1
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/mk_ssl_pkix_oid.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/ssl_pkix_oid.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/priv/bin/ssl_esock
+lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/Makefile
+lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/debuglog.o
+lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock.o
+lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_openssl.o
+lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_osio.o
+lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_poll.o
+lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_posix_str.o
+lib/erlang/lib/ssl-${VERSION.ssl}/priv/obj/esock_utils.o
 lib/erlang/lib/ssl-${VERSION.ssl}/src/inet_ssl_dist.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_alert.erl
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index e17feddf5d5..b83adf6aea1 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2008/04/08 13:16:22 martti Exp $
+$NetBSD: distinfo,v 1.17 2008/06/21 22:13:09 joerg Exp $
 
 SHA1 (erlang/otp_src_R12B-0.tar.gz) = e2c6e18d22e34a799fc6bc25fa2d25eedb30bccc
 RMD160 (erlang/otp_src_R12B-0.tar.gz) = cb07ea37f2b56e1ea2fc07c9063b647df7635b2b
@@ -6,5 +6,7 @@ Size (erlang/otp_src_R12B-0.tar.gz) = 41074760 bytes
 SHA1 (patch-aa) = 910d2635fdb5332837e2437c4ec88ef88bff6d65
 SHA1 (patch-ab) = f0a148c893693a7877ff4d1678535a78179e32a2
 SHA1 (patch-ac) = ac9af68982593faa6736f70f5c196b6835748f58
-SHA1 (patch-ae) = 59075d269ac05bf029c41e8eab89e7669d80514f
+SHA1 (patch-ae) = 4b338469a00513835c774de001b1c938636df418
 SHA1 (patch-af) = 182b8c1555fc424bbb4fdc44bbb1ac22ba5641f0
+SHA1 (patch-ag) = ca0ac13b64490fc387418192becf8e85fea427b5
+SHA1 (patch-ah) = fc2214abed17eb9ce36c6c33c5ba3988a632d125
diff --git a/lang/erlang/patches/patch-ae b/lang/erlang/patches/patch-ae
index 0b3b289e265..3e3b394475f 100644
--- a/lang/erlang/patches/patch-ae
+++ b/lang/erlang/patches/patch-ae
@@ -1,10 +1,23 @@
-$NetBSD: patch-ae,v 1.2 2008/04/08 13:16:22 martti Exp $
+$NetBSD: patch-ae,v 1.3 2008/06/21 22:13:09 joerg Exp $
 
+Allow the system linker to use the shared library for dynamic modules.
 Fixed Makefile installation.
 
---- lib/crypto/c_src/Makefile.in.orig	2007-06-11 12:59:08.000000000 +0000
+--- lib/crypto/c_src/Makefile.in.orig	2007-11-26 20:01:59.000000000 +0100
 +++ lib/crypto/c_src/Makefile.in
-@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targ
+@@ -91,11 +91,7 @@ endif
+ endif
+ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
+ 
+-ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
+ CRYPTO_LINK_LIB=-L$(SSL_LIBDIR) -lcrypto
+-else
+-CRYPTO_LINK_LIB=$(SSL_LIBDIR)/libcrypto.a 
+-endif
+ 
+ # ----------------------------------------------------
+ # Targets
+@@ -135,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targ
  release_spec: opt
  	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
  	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
diff --git a/lang/erlang/patches/patch-ag b/lang/erlang/patches/patch-ag
new file mode 100644
index 00000000000..3145aae039d
--- /dev/null
+++ b/lang/erlang/patches/patch-ag
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.1 2008/06/21 22:13:09 joerg Exp $
+
+Allow the system linker to use the shared library for dynamic modules.
+
+--- lib/ssl/c_src/Makefile.in.orig	2008-06-20 19:33:40.000000000 +0200
++++ lib/ssl/c_src/Makefile.in
+@@ -87,11 +87,7 @@ PORT_PROGRAM = $(BINDIR)/ssl_esock$(exe)
+ SKIP_BUILDING_BINARIES := false
+ 
+ # Try to be BC for R10
+-ifeq ($(findstring @SSL_,@SSL_DYNAMIC_ONLY@),@SSL_)
+ DYNAMIC_CRYPTO_LIB=yes
+-else
+-DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
+-endif
+ 
+ 
+ ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
diff --git a/lang/erlang/patches/patch-ah b/lang/erlang/patches/patch-ah
new file mode 100644
index 00000000000..314c4601e0a
--- /dev/null
+++ b/lang/erlang/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2008/06/21 22:13:09 joerg Exp $
+
+--- lib/erl_interface/src/connect/ei_resolve.c.orig	2008-06-20 20:15:09.000000000 +0200
++++ lib/erl_interface/src/connect/ei_resolve.c
+@@ -614,7 +614,7 @@ struct hostent *ei_gethostbyname_r(const
+ #ifndef HAVE_GETHOSTBYNAME_R
+   return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
+ #else
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) || defined(__FreeBSD__)
+   struct hostent *result;
+ 
+   gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);