[PATCH] gcc34-3.4.6nb4 (Re: non-DESTDIR status: 68 to go

[Makoto Fujiwara <makoto%ki.nu@localhost>]

| From: Thomas Klausner <wiz%NetBSD.org@localhost>
| Subject: non-DESTDIR status: 68 to go
| Date: Wed, 1 Jun 2011 08:38:02 +0200

wiz> As of Sunday, the following are still not using DESTDIR:
wiz> gcc34-3.4.6nb4

Followng patch will support user-destdir, I believe

Index: lang/gcc34/Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/lang/gcc34/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- lang/gcc34/Makefile 22 Apr 2011 13:41:55 -0000      1.47
+++ lang/gcc34/Makefile 3 Jun 2011 02:24:25 -0000
@@ -3,7 +3,7 @@
 
 DISTNAME=      gcc-${GCC_VERSION}
 PKGNAME=       gcc34-${GCC_VERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=  .tar.bz2
@@ -12,6 +12,7 @@
 HOMEPAGE=      http://www.gnu.org/software/gcc/gcc.html
 COMMENT=       This is the gcc 3.4 compiler
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2.1
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GCC_VERSION=           3.4.6
 
@@ -50,6 +51,7 @@
 CONFIGURE_ARGS+=       --with-gnu-as
 CONFIGURE_ARGS+=       --with-gnu-ld
 .endif
+MAKEFLAGS+=    DESTDIR=${DESTDIR}
 
 REPLACE_AWK+=          libjava/addr2name.awk
 USE_TOOLS+=            awk:run
@@ -228,7 +230,7 @@
 
 do-install:
        (cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} install \
-        && ${TEST} -f ${GCC_PREFIX}/bin/cc || ${LN} -f ${GCC_PREFIX}/bin/gcc 
${GCC_PREFIX}/bin/cc)
+        && ${TEST} -f ${GCC_PREFIX}/bin/cc || ${LN} -f 
${DESTDIR}${GCC_PREFIX}/bin/gcc ${DESTDIR}${GCC_PREFIX}/bin/cc)
 .if !empty(BUILD_ADA:M[Yy][Ee][Ss])
                (SPECPATH=`${GCC_PREFIX}/bin/gcc -print-file-name=specs` && \
                for EXPANDEDSPECPATH in $${SPECPATH} ; do \
@@ -239,8 +241,8 @@
 .endif
 
 GENERATE_PLIST+=                                                       \
-       ${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print           \
-               | ${SORT} | ${SED} -e "s,${PREFIX}/,,g";
+       ${FIND} ${DESTDIR}${GCC_PREFIX} \( -type f -o -type l \) -print         
\
+               | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g";
 
 .include "../../mk/bsd.prefs.mk"
 .if !empty(BUILD_ADA:M[Yy][Ee][Ss])

---
Makoto Fujiwara
mef%NetBSD.org@localhost