DESTDIR support for Firefox 2.

3 files changed, 19 insertions, 16 deletions

diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common
index c37b8018e07..2a2f0dc790d 100644
--- a/www/firefox/Makefile.common
+++ b/www/firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2006/09/24 16:33:33 salo Exp $
+# $NetBSD: Makefile.common,v 1.11 2006/11/03 07:53:05 joerg Exp $
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		mozilla-${MOZ_DIST_VER}-source
@@ -169,7 +169,7 @@ post-build:
 		${WRKSRC:Q}/dist/bin/chrome/installed-chrome.txt
 
 do-install:
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR:Q}/moz-install
+	${SETENV} ${SCRIPTS_ENV} DESTDIR=${DESTDIR} ${SH} ${FILESDIR:Q}/moz-install
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/www/firefox2/Makefile-firefox.common b/www/firefox2/Makefile-firefox.common
index bef554b6bf2..32cb730be63 100644
--- a/www/firefox2/Makefile-firefox.common
+++ b/www/firefox2/Makefile-firefox.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.2 2006/11/03 07:53:05 joerg Exp $
 
 MOZILLA_BIN=		firefox-bin
 MOZ_VER=		2.0
@@ -13,6 +13,8 @@ MASTER_SITES+=		ftp://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}
 
 HOMEPAGE=		http://www.mozilla.com/en-US/firefox/
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DISTINFO_FILE=		${.CURDIR}/../../www/firefox2/distinfo
 PATCHDIR=		${.CURDIR}/../../www/firefox2/patches
 
diff --git a/www/seamonkey/files/moz-install b/www/seamonkey/files/moz-install
index 56153ba8af6..3ee1849ab82 100755
--- a/www/seamonkey/files/moz-install
+++ b/www/seamonkey/files/moz-install
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: moz-install,v 1.1 2006/09/24 16:21:33 salo Exp $
+# $NetBSD: moz-install,v 1.2 2006/11/03 07:53:05 joerg Exp $
 
-${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${PREFIX}/bin/${MOZILLA}
-${CHOWN} ${BINOWN} ${PREFIX}/bin/${MOZILLA}
-${CHGRP} ${BINGRP} ${PREFIX}/bin/${MOZILLA}
-${CHMOD} ${BINMODE} ${PREFIX}/bin/${MOZILLA}
+${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+${CHOWN} ${BINOWN} ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${MOZILLA}
 
 #
 #	Substitute variables
@@ -17,49 +18,49 @@ ${SED} -e "s/\${MOZILLA}/${MOZILLA}/g" -e "s/\${SO_SUFFIX}/${SO_SUFFIX}/" -e "s/
 
 # make directories 
 for i in `${SED} -n -e '/^@comment begin DIRS$/,/^@comment end DIRS$/p' ${TMP_PLIST} | ${EGREP} ^@dirrm | ${SED} -e 's/^@dirrm//'` ; do
-	${BSD_INSTALL_DATA_DIR} ${PREFIX}/$i
+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/$i
 done
 
 # install programs
 for i in `${SED} -n -e '/^@comment begin PROGRAMS$/,/^@comment end PROGRAMS$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
-	${BSD_INSTALL_PROGRAM} ${WRKSRC}/${src} ${PREFIX}/$i
+	${BSD_INSTALL_PROGRAM} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
 done
 
 # install scripts
 for i in `${SED} -n -e '/^@comment begin SCRIPTS$/,/^@comment end SCRIPTS$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
-	${BSD_INSTALL_SCRIPT} ${WRKSRC}/${src} ${PREFIX}/$i
+	${BSD_INSTALL_SCRIPT} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
 done
 
 # install DSO
 for i in `${SED} -n -e '/^@comment begin DSO$/,/^@comment end DSO$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
-	${MOZ_INSTALL_LIB} ${WRKSRC}/${src} ${PREFIX}/$i
+	${MOZ_INSTALL_LIB} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
 done
 
 # install PKGCONFIG
 for i in `${SED} -n -e '/^@comment begin PKGCONFIG$/,/^@comment end PKGCONFIG$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@lib/pkgconfig@build/unix@"`;
-	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
+	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
 done
 
 # install DATA
 for i in `${SED} -n -e '/^@comment begin DATA$/,/^@comment end DATA$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
-	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
+	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
 done
 
 # install INCLUDE
 for i in `${SED} -n -e '/^@comment begin INCLUDE$/,/^@comment end INCLUDE$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/include@"`;
-	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
+	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
 done
 
 # install INCLUDE-PUBLIC
 for i in `${SED} -n -e '/^@comment begin INCLUDE-PUBLIC$/,/^@comment end INCLUDE-PUBLIC$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/public@"`;
-	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
+	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
 done
 
 ${RM} -f ${TMP_PLIST}