- Get rid of a ${WRKDIR} reference in an installed file.

- Fix a bad reference to /bin/bash.
- Work around a non-portable argument to find.

This should address the bash issues reported in PR42092
lang/gcc44 leaves uncorrected reference to /bin/bash

4 files changed, 66 insertions, 4 deletions

diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 9378ba65946..c7353380146 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2009/09/18 12:29:14 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/24 11:50:56 dmcmahill Exp $
 #
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc44-${GCC_VERSION}
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,8 +14,8 @@ COMMENT=		GNU Compiler Collection 4.4
 
 PKG_DESTDIR_SUPPORT=	destdir
 
-USE_TOOLS+=		awk:run bash:build perl chmod \
-			gmake makeinfo msgfmt bison flex gm4 \
+USE_TOOLS+=		awk:run bash:run perl chmod \
+			gmake:run makeinfo msgfmt bison flex gm4 \
 			sed:run unzip
 
 DEPENDS+=		zip-[0-9]*:../../archivers/zip
@@ -47,6 +48,18 @@ UNLIMIT_RESOURCES+=	datasize
 # 		gcc/opth-gen.awk					\
 # 		gcc/opt-functions.awk
 
+REPLACE_BASH+= contrib/dg-cmp-results.sh
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix
+REPLACE_BASH+= contrib/reghunt/bin/reg-hunt
+REPLACE_BASH+= contrib/reghunt/bin/reg-test
+REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic
+REPLACE_BASH+= contrib/reghunt/date_based/reg_search
+REPLACE_BASH+= gcc/dbgcnt.def
+REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests
+REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
+
 # Optional languages - change as required
 # Ada could be added although there is a bootstrapping issue.  See
 # ../gcc34-ada for guidance
@@ -92,6 +105,12 @@ CONFIGURE_ARGS+=	--with-mpfr=${BUILDLINK_PREFIX.mpfr}
 
 CONFIGURE_ENV+=		CONFIG_SHELL=${CONFIG_SHELL:Q}
 
+# ${WRKSRC}/gcc-4.4.1/libjava/contrib/aotcompile.py.in stores the path to
+# a 'make' program so we need to make sure we give it the installed 'make' and not
+# the tool wrapped one.
+CONFIGURE_ENV+=		PKGSRC_MAKE=${TOOLS_PATH.gmake:Q}
+MAKE_ENV+=		PKGSRC_MAKE=${TOOLS_PATH.gmake:Q}
+
 # fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build
 # failure (seen on NetBSD-5.0/i386) when building java.  So in case
 # the fastjar package is installed, make sure the configure script
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 09b402e8f30..9ecb659553c 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/18 11:24:50 dmcmahill Exp $
+$NetBSD: distinfo,v 1.2 2009/09/24 11:50:56 dmcmahill Exp $
 
 SHA1 (gcc-4.4.1.tar.bz2) = 9156ddb7e4cc72288ec31760d6ddc7981123a8a2
 RMD160 (gcc-4.4.1.tar.bz2) = 41cb4c76d1671b1d224d2a6e167ee183dd53d096
@@ -8,3 +8,5 @@ SHA1 (patch-ab) = e254456a6da7090f7ba37d3b55a17be2dd157f88
 SHA1 (patch-ac) = 0af9845a62f9a6f8ec27657d0ae0c16394e9fc12
 SHA1 (patch-ad) = 86dc05e6ea977ad869e5d63beb493750ab01a807
 SHA1 (patch-ae) = 831481496b5b5f246f51d9a4fe9314f07f81a842
+SHA1 (patch-af) = e8707437f416713b6f1e68b992bce7a13466d0f9
+SHA1 (patch-ag) = 077bed181ee4bad36eb23c817a1708950b69a1ad
diff --git a/lang/gcc44/patches/patch-af b/lang/gcc44/patches/patch-af
new file mode 100644
index 00000000000..2621eca2086
--- /dev/null
+++ b/lang/gcc44/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2009/09/24 11:50:57 dmcmahill Exp $
+
+Avoid a reference to the wrapped make in the pkgsrc work directory from showing up
+in an installed file.  See ${WRKDIR}/gcc-4.4.1/libjava/contrib/aotcompile.py.in
+
+--- libjava/configure.orig	2009-07-22 07:43:59.000000000 +0000
++++ libjava/configure	2009-09-23 12:51:11.000000000 +0000
+@@ -28063,5 +28063,5 @@
+ 
+ # needed for aot-compile-rpm
+-MAKE=`which make`
++MAKE=${PKGSRC_MAKE}
+ 
+ 
diff --git a/lang/gcc44/patches/patch-ag b/lang/gcc44/patches/patch-ag
new file mode 100644
index 00000000000..4c4d0e1e83b
--- /dev/null
+++ b/lang/gcc44/patches/patch-ag
@@ -0,0 +1,27 @@
+$NetBSD: patch-ag,v 1.1 2009/09/24 11:50:57 dmcmahill Exp $
+
+No need to use bash for this small script.
+
+Also -print0 is not portable to solaris and perhaps others.
+
+--- libjava/contrib/rebuild-gcj-db.in.orig	2008-07-02 13:17:54.000000000 +0000
++++ libjava/contrib/rebuild-gcj-db.in	2009-09-23 12:53:18.000000000 +0000
+@@ -1,3 +1,3 @@
+-#!/bin/bash
++#!/bin/sh
+ # rebuild-gcj-db
+ 
+@@ -17,5 +17,5 @@
+    dbLocation=`@prefix@/bin/gcj-dbtool -p $base`
+    libdir=$base/gcj
+-   if ! test -d $libdir; then
++   if test ! -d $libdir; then
+       # No shared libraries here.
+       continue
+@@ -23,5 +23,5 @@
+    dirname $dbLocation | xargs mkdir -p
+    @prefix@/bin/gcj-dbtool -n $dbLocation 64
+-   find $libdir -follow -name '*.db' -print0 | \
++   find $libdir -follow -name '*.db' -print | @AWK@ '{printf("%s%c", $1, 0);}' | \
+       @prefix@/bin/gcj-dbtool -0 -m $dbLocation $dbLocation
+ done