[pkgsrc/trunk]: pkgsrc/misc Fix the mechanism which sets the temporary direct...

[mrauch <mrauch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ba434230e4b
branches:  trunk
changeset: 499134:6ba434230e4b
user:      mrauch <mrauch%pkgsrc.org@localhost>
date:      Sun Sep 11 10:49:35 2005 +0000

description:
Fix the mechanism which sets the temporary directory where
OpenOffice.org will unpack intermediate files during install.
The package default /tmp may have not enough space.
Problem reported by Perry Metzger via mail to tech-pkg.

diffstat:

 misc/openoffice-bin/Makefile |  6 +++---
 misc/openoffice/Makefile     |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 8ee90ad167d9 -r 6ba434230e4b misc/openoffice-bin/Makefile
--- a/misc/openoffice-bin/Makefile      Sun Sep 11 10:39:03 2005 +0000
+++ b/misc/openoffice-bin/Makefile      Sun Sep 11 10:49:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/29 00:54:41 grant Exp $
+# $NetBSD: Makefile,v 1.10 2005/09/11 10:49:35 mrauch Exp $
 
 PKGNAME=               openoffice-bin-${OO_VER}
 PKGREVISION=           1
@@ -34,7 +34,7 @@
 ONLY_FOR_PLATFORM+=    Linux-*-i[3-6]86
 ONLY_FOR_PLATFORM+=    SunOS-*-*
 
-TEMP?=                 ${WRKSRC}
+TEMP?=                 ${WRKDIR}
 CHECK_SHLIBS=          no
 
 .include "../../mk/bsd.prefs.mk"
@@ -81,7 +81,7 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/OpenOffice.org${OO_VER}/program
        ${INSTALL_DATA} ${WRKDIR}/openoffice-linux-112-services.rdb     \
                ${PREFIX}/OpenOffice.org${OO_VER}/program/services.rdb
-       ${SH} -c "cd ${WRKSRC}; ./install --prefix=${PREFIX}"
+       cd ${WRKSRC}; ${SETENV} TEMP=${TEMP} ./install --prefix=${PREFIX}
        ${INSTALL_LIB} ${DISTDIR}/libsot645li.so        \
                ${PREFIX}/OpenOffice.org${OO_VER}/program/libsot645li.so
        ${RM} -f ${PREFIX}/bin/soffice.orig
diff -r 8ee90ad167d9 -r 6ba434230e4b misc/openoffice/Makefile
--- a/misc/openoffice/Makefile  Sun Sep 11 10:39:03 2005 +0000
+++ b/misc/openoffice/Makefile  Sun Sep 11 10:49:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2005/07/16 19:10:39 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2005/09/11 10:49:35 mrauch Exp $
 
 DISTNAME=              openoffice-1.1.4
 PKGREVISION=           2
@@ -42,7 +42,7 @@
 CONFIGURE_ARGS+=       
--with-lang="AFRIK","ARAB","BASQUE","CHINSIM","CHINTRAD","CZECH","DAN","DTCH","ENUS","ESTONIAN","FINN","FREN","GAL","GREEK","HEBREW","HUNG","ITAL","JAPN","KOREAN","LITHUANIAN","NORBOK","NORNYN","NSOTHO","POL","PORT","PORTBR","RUSS","SLOVAK","SLOVENIAN","SPAN","SWED","TURK","WELSH","ZULU"
 CONFIGURE_ARGS+=       --with-dict=ALL
 
-TEMP?=                 ${WRKSRC}
+TEMP?=                 ${WRKDIR}
 UNLIMIT_RESOURCES+=    datasize
 
 PLIST_SRC+=            PLIST.common
@@ -85,7 +85,7 @@
                >${WRKSRC}/../instsetoo/${OPENOFFICE_OUTPATH}.pro/${OPENOFFICE_LANGCODE}/normal/setup.ins
 
 do-install:
-       ${SH} -c "cd ${WRKSRC}/../instsetoo/${OPENOFFICE_OUTPATH}.pro/${OPENOFFICE_LANGCODE}/normal; ./install --prefix=${PREFIX}"
+       cd ${WRKSRC}/../instsetoo/${OPENOFFICE_OUTPATH}.pro/${OPENOFFICE_LANGCODE}/normal; ${SETENV} TEMP=${TEMP} ./install --prefix=${PREFIX}"
        ${TOUCH} ${PREFIX}/${OPENOFFICE_VERSION}/help/${OPENOFFICE_HELPCODE}/common.tree
        ${TOUCH} ${PREFIX}/${OPENOFFICE_VERSION}/help/${OPENOFFICE_HELPCODE}/schart.tree
        ${TOUCH} ${PREFIX}/${OPENOFFICE_VERSION}/help/${OPENOFFICE_HELPCODE}/sdraw.tree