Sat Feb 7 21:45:43 2009 UTC ()
Don't leak the workdir for destdir builds. Patches from OpenBSD ports.
Bump revision.


(joerg)
diff -r1.39 -r1.40 pkgsrc/lang/erlang/Makefile
diff -r1.17 -r1.18 pkgsrc/lang/erlang/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/erlang/patches/patch-af
diff -r0 -r1.1 pkgsrc/lang/erlang/patches/patch-ai
cvs diff -r1.39 -r1.40 pkgsrc/lang/erlang/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/erlang/Makefile 2008/08/19 11:04:52 1.39
+++ pkgsrc/lang/erlang/Makefile 2009/02/07 21:45:43 1.40
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.39 2008/08/19 11:04:52 ahoka Exp $ 1# $NetBSD: Makefile,v 1.40 2009/02/07 21:45:43 joerg Exp $
2 2
3DISTNAME= otp_src_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR} 3DISTNAME= otp_src_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR}
4PKGNAME= erlang-${ERLANG_VERSION} 4PKGNAME= erlang-${ERLANG_VERSION}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://www.erlang.org/download/ 7MASTER_SITES= http://www.erlang.org/download/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.erlang.org/ 10HOMEPAGE= http://www.erlang.org/
11COMMENT= Concurrent functional programming language 11COMMENT= Concurrent functional programming language
12 12
13DIST_SUBDIR= erlang 13DIST_SUBDIR= erlang
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
cvs diff -r1.17 -r1.18 pkgsrc/lang/erlang/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/erlang/distinfo 2008/06/21 22:13:09 1.17
+++ pkgsrc/lang/erlang/distinfo 2009/02/07 21:45:43 1.18
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.17 2008/06/21 22:13:09 joerg Exp $ 1$NetBSD: distinfo,v 1.18 2009/02/07 21:45:43 joerg Exp $
2 2
3SHA1 (erlang/otp_src_R12B-0.tar.gz) = e2c6e18d22e34a799fc6bc25fa2d25eedb30bccc 3SHA1 (erlang/otp_src_R12B-0.tar.gz) = e2c6e18d22e34a799fc6bc25fa2d25eedb30bccc
4RMD160 (erlang/otp_src_R12B-0.tar.gz) = cb07ea37f2b56e1ea2fc07c9063b647df7635b2b 4RMD160 (erlang/otp_src_R12B-0.tar.gz) = cb07ea37f2b56e1ea2fc07c9063b647df7635b2b
5Size (erlang/otp_src_R12B-0.tar.gz) = 41074760 bytes 5Size (erlang/otp_src_R12B-0.tar.gz) = 41074760 bytes
6SHA1 (patch-aa) = 910d2635fdb5332837e2437c4ec88ef88bff6d65 6SHA1 (patch-aa) = 910d2635fdb5332837e2437c4ec88ef88bff6d65
7SHA1 (patch-ab) = f0a148c893693a7877ff4d1678535a78179e32a2 7SHA1 (patch-ab) = f0a148c893693a7877ff4d1678535a78179e32a2
8SHA1 (patch-ac) = ac9af68982593faa6736f70f5c196b6835748f58 8SHA1 (patch-ac) = ac9af68982593faa6736f70f5c196b6835748f58
9SHA1 (patch-ae) = 4b338469a00513835c774de001b1c938636df418 9SHA1 (patch-ae) = 4b338469a00513835c774de001b1c938636df418
10SHA1 (patch-af) = 182b8c1555fc424bbb4fdc44bbb1ac22ba5641f0 10SHA1 (patch-af) = 3ad903b5f9fab6ff57084ff1186a4b7a6dce777e
11SHA1 (patch-ag) = ca0ac13b64490fc387418192becf8e85fea427b5 11SHA1 (patch-ag) = ca0ac13b64490fc387418192becf8e85fea427b5
12SHA1 (patch-ah) = fc2214abed17eb9ce36c6c33c5ba3988a632d125 12SHA1 (patch-ah) = fc2214abed17eb9ce36c6c33c5ba3988a632d125
 13SHA1 (patch-ai) = 6ce89f9170d26594c2fce2ec21ab95cef8b08980
cvs diff -r1.1 -r1.2 pkgsrc/lang/erlang/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/lang/erlang/patches/Attic/patch-af 2008/01/04 14:10:06 1.1
+++ pkgsrc/lang/erlang/patches/Attic/patch-af 2009/02/07 21:45:43 1.2
@@ -1,14 +1,32 @@ @@ -1,14 +1,32 @@
1$NetBSD: patch-af,v 1.1 2008/01/04 14:10:06 ghen Exp $ 1$NetBSD: patch-af,v 1.2 2009/02/07 21:45:43 joerg Exp $
2 2
3DESTDIR support. 3DESTDIR support
4 4
5--- Makefile.in.orig 2007-11-26 19:57:49.000000000 +0100 5--- Makefile.in.orig 2007-11-26 19:57:49.000000000 +0100
6+++ Makefile.in 6+++ Makefile.in
7@@ -51,6 +51,7 @@ exec_prefix = @exec_prefix@ 7@@ -51,6 +51,7 @@ exec_prefix = @exec_prefix@
8 # rpms. 8 # rpms.
9 #INSTALL_PREFIX = 9 #INSTALL_PREFIX =
10 # Naah...override `prefix' instead. 10 # Naah...override `prefix' instead.
11+INSTALL_PREFIX=${DESTDIR} 11+INSTALL_PREFIX=${DESTDIR}
12  12
13 # The directory in which user executables (ERL_BASE_PUB_FILES) are put 13 # The directory in which user executables (ERL_BASE_PUB_FILES) are put
14 BINDIR = $(INSTALL_PREFIX)@bindir@ 14 BINDIR = $(INSTALL_PREFIX)@bindir@
 15@@ -707,7 +708,7 @@ else
 16 endif
 17
 18 install.Install:
 19- cd $(ERLANG_LIBDIR) && ./Install -minimal $(ERLANG_LIBDIR)
 20+ cd $(ERLANG_LIBDIR) && ./Install -minimal $(ERLANG_ILIBDIR)
 21
 22 #
 23 # Install erlang base public files
 24@@ -715,7 +716,7 @@ install.Install:
 25 install.bin:
 26 for file in $(ERL_BASE_PUB_FILES); do \
 27 rm -f $(BINDIR)/$$file; \
 28- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \
 29+ ${LN_S} $(ERLANG_ILIBDIR)/bin/$$file $(BINDIR)/$$file; \
 30 done
 31
 32 #
File Added: pkgsrc/lang/erlang/patches/Attic/patch-ai
$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
-
-