Add nsswitch support, required when running on -CURRENT.

Obtained from:	Daniel Néri <dne@mayonnaise.net>

6 files changed, 48 insertions, 2 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index efe5f199653a..c1a21a35ebf8 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	r9c0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.erlang.org/pub/download/     \
diff --git a/lang/erlang/files/patch-lib_kernel_src_inet__config.erl b/lang/erlang/files/patch-lib_kernel_src_inet__config.erl
new file mode 100644
index 000000000000..362a217ce495
--- /dev/null
+++ b/lang/erlang/files/patch-lib_kernel_src_inet__config.erl
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- lib/kernel/src/inet_config.erl.orig	Mon Jul  7 14:06:28 2003
++++ lib/kernel/src/inet_config.erl	Fri Sep 19 14:21:14 2003
+@@ -78,7 +78,12 @@
+ 			    error("can't set lookup to native: ~p", [Reason])
+ 		    end;
+ 		freebsd -> %% we may have to check version (2.2.2)
+-		    load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd);
++		    case os:version() of
++			{Major,_,_} when Major >= 5 ->
++			    load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf);
++			_ ->
++			    load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd)
++		    end;
+ 		'bsd/os' ->
+ 		    load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos);
+ 		linux ->
diff --git a/lang/erlang/pkg-message b/lang/erlang/pkg-message
index 97bf3e663e09..1fd1cd3c4338 100644
--- a/lang/erlang/pkg-message
+++ b/lang/erlang/pkg-message
@@ -1,4 +1,8 @@
 ===========================================================================
+This package requires a properly configured nsswitch.conf on FreeBSD
+5.x, else nameserver queries (and the distribution protocol) will
+not work.
+
 Installation tips:
 
 You can find an emacs mode for Erlang here:
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index efe5f199653a..c1a21a35ebf8 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	r9c0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.erlang.org/pub/download/     \
diff --git a/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl b/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl
new file mode 100644
index 000000000000..362a217ce495
--- /dev/null
+++ b/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- lib/kernel/src/inet_config.erl.orig	Mon Jul  7 14:06:28 2003
++++ lib/kernel/src/inet_config.erl	Fri Sep 19 14:21:14 2003
+@@ -78,7 +78,12 @@
+ 			    error("can't set lookup to native: ~p", [Reason])
+ 		    end;
+ 		freebsd -> %% we may have to check version (2.2.2)
+-		    load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd);
++		    case os:version() of
++			{Major,_,_} when Major >= 5 ->
++			    load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf);
++			_ ->
++			    load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd)
++		    end;
+ 		'bsd/os' ->
+ 		    load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos);
+ 		linux ->
diff --git a/lang/erlang14/pkg-message b/lang/erlang14/pkg-message
index 97bf3e663e09..1fd1cd3c4338 100644
--- a/lang/erlang14/pkg-message
+++ b/lang/erlang14/pkg-message
@@ -1,4 +1,8 @@
 ===========================================================================
+This package requires a properly configured nsswitch.conf on FreeBSD
+5.x, else nameserver queries (and the distribution protocol) will
+not work.
+
 Installation tips:
 
 You can find an emacs mode for Erlang here: