Don't leak the workdir for destdir builds. Patches from OpenBSD ports.

Bump revision.

4 files changed, 102 insertions, 6 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 58da394ed9d..8e42299d9b7 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2008/08/19 11:04:52 ahoka Exp $
+# $NetBSD: Makefile,v 1.40 2009/02/07 21:45:43 joerg Exp $
 
 DISTNAME=		otp_src_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR}
 PKGNAME=		erlang-${ERLANG_VERSION}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		lang
 MASTER_SITES=		http://www.erlang.org/download/
 
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index b83adf6aea1..6ea106dcc38 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2008/06/21 22:13:09 joerg Exp $
+$NetBSD: distinfo,v 1.18 2009/02/07 21:45:43 joerg Exp $
 
 SHA1 (erlang/otp_src_R12B-0.tar.gz) = e2c6e18d22e34a799fc6bc25fa2d25eedb30bccc
 RMD160 (erlang/otp_src_R12B-0.tar.gz) = cb07ea37f2b56e1ea2fc07c9063b647df7635b2b
@@ -7,6 +7,7 @@ SHA1 (patch-aa) = 910d2635fdb5332837e2437c4ec88ef88bff6d65
 SHA1 (patch-ab) = f0a148c893693a7877ff4d1678535a78179e32a2
 SHA1 (patch-ac) = ac9af68982593faa6736f70f5c196b6835748f58
 SHA1 (patch-ae) = 4b338469a00513835c774de001b1c938636df418
-SHA1 (patch-af) = 182b8c1555fc424bbb4fdc44bbb1ac22ba5641f0
+SHA1 (patch-af) = 3ad903b5f9fab6ff57084ff1186a4b7a6dce777e
 SHA1 (patch-ag) = ca0ac13b64490fc387418192becf8e85fea427b5
 SHA1 (patch-ah) = fc2214abed17eb9ce36c6c33c5ba3988a632d125
+SHA1 (patch-ai) = 6ce89f9170d26594c2fce2ec21ab95cef8b08980
diff --git a/lang/erlang/patches/patch-af b/lang/erlang/patches/patch-af
index 9942982a9a5..6a7258de640 100644
--- a/lang/erlang/patches/patch-af
+++ b/lang/erlang/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2008/01/04 14:10:06 ghen Exp $
+$NetBSD: patch-af,v 1.2 2009/02/07 21:45:43 joerg Exp $
 
-DESTDIR support.
+DESTDIR support
 
 --- Makefile.in.orig	2007-11-26 19:57:49.000000000 +0100
 +++ Makefile.in
@@ -12,3 +12,21 @@ DESTDIR support.
  
  # The directory in which user executables (ERL_BASE_PUB_FILES) are put
  BINDIR      = $(INSTALL_PREFIX)@bindir@
+@@ -707,7 +708,7 @@ else
+ endif
+ 
+ install.Install:
+-	cd $(ERLANG_LIBDIR) && ./Install -minimal $(ERLANG_LIBDIR)
++	cd $(ERLANG_LIBDIR) && ./Install -minimal $(ERLANG_ILIBDIR)
+ 
+ #
+ # Install erlang base public files
+@@ -715,7 +716,7 @@ install.Install:
+ install.bin:
+ 	for file in $(ERL_BASE_PUB_FILES); do \
+ 		rm -f $(BINDIR)/$$file; \
+-		${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \
++		${LN_S} $(ERLANG_ILIBDIR)/bin/$$file $(BINDIR)/$$file; \
+ 	done
+ 
+ #
diff --git a/lang/erlang/patches/patch-ai b/lang/erlang/patches/patch-ai
new file mode 100644
index 00000000000..d719b10b13c
--- /dev/null
+++ b/lang/erlang/patches/patch-ai
@@ -0,0 +1,77 @@
+$NetBSD: patch-ai,v 1.1 2009/02/07 21:45:43 joerg Exp $
+
+DESTDIR support
+
+--- erts/etc/unix/Install.src.orig	2009-02-07 22:21:21.000000000 +0100
++++ erts/etc/unix/Install.src
+@@ -8,7 +8,8 @@ while [ $# -ne 0 ]; do
+ 	case $1 in
+ 		-minimal) start_option=minimal ;;
+ 		-sasl)    start_option=sasl    ;;
+-		*)        ERL_ROOT=$1          ;;
++		*)        ERL_ROOT=$DESTDIR/$1;
++		          ERL_IROOT=$1          ;;
+ 	esac
+ 	shift
+ done
+@@ -35,7 +36,7 @@ fi
+ if [ -d $ERL_ROOT/erts-%I_VSN%/obj ]
+ then
+ 	cd $ERL_ROOT/erts-%I_VSN%/obj
+-	sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" Makefile.src > Makefile
++	sed -e "s;%FINAL_ROOTDIR%;$ERL_IROOT;" Makefile.src > Makefile
+ fi
+ 
+ if [ ! -d $ERL_ROOT/bin ]
+@@ -59,14 +60,14 @@ esac
+ 
+ cd $ERL_ROOT/erts-%I_VSN%/bin
+ 
+-sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" erl.src > erl
++sed -e "s;%FINAL_ROOTDIR%;$ERL_IROOT;" erl.src > erl
+ chmod 755 erl
+ 
+ #
+ # Create start file for embedded system use,
+ #
+ (cd $ERL_ROOT/erts-%I_VSN%/bin;
+-  sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" start.src > start;
++  sed -e "s;%FINAL_ROOTDIR%;$ERL_IROOT;" start.src > start;
+   chmod 755 start)
+ 
+ cd $ERL_ROOT/bin
+@@ -87,7 +88,7 @@ if [ -h epmd ]; then
+   /bin/rm -f epmd
+ fi
+ 
+-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd
++ln -s ../erts-%I_VSN%/bin/epmd epmd
+ 
+ cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl .
+ cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl .
+@@ -97,7 +98,7 @@ chmod 755 start_erl
+ echo ""
+ 
+ echo %I_VSN% %I_SYSTEM_VSN% > $ERL_ROOT/releases/start_erl.data
+-sed -e "s;%ERL_ROOT%;$ERL_ROOT;" $ERL_ROOT/releases/RELEASES.src > $ERL_ROOT/releases/RELEASES
++sed -e "s;%ERL_ROOT%;$ERL_IROOT;" $ERL_ROOT/releases/RELEASES.src > $ERL_ROOT/releases/RELEASES
+ 
+ if [ "$start_option" = "query" ]
+ then
+@@ -136,16 +137,3 @@ if [ "X$TARGET" != "Xsunos5" -a -d $ERL_
+ 	(ranlib $library) > /dev/null 2>&1
+     done
+ fi
+-
+-
+-#
+-# Fixing the man pages
+-#
+-
+-if [ -d $ERL_ROOT/man ]
+-then
+-    cd $ERL_ROOT
+-    ./misc/format_man_pages $ERL_ROOT
+-fi
+-
+-