Add some bits to the previous commit's destdir support, so install now

works consistently. Should fix broken bulk builds.
Update PLIST accordingly && PKGREVISION++.

4 files changed, 25 insertions, 13 deletions

diff --git a/lang/g95/Makefile b/lang/g95/Makefile
index 919612a67a1..00f131e77f9 100644
--- a/lang/g95/Makefile
+++ b/lang/g95/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/09/07 01:33:51 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2008/09/07 01:59:26 dholland Exp $
 
 DISTNAME=		g95_source
 VERSION=		0.91
 PKGNAME=		g95-${VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang
 EXTRACT_SUFX.g95_source=	.tgz
 DIST_SUBDIR=		${PKGNAME_NOREV}
diff --git a/lang/g95/PLIST b/lang/g95/PLIST
index 238d0161213..6332081aa8e 100644
--- a/lang/g95/PLIST
+++ b/lang/g95/PLIST
@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/21 13:44:14 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/09/07 01:59:26 dholland Exp $
 bin/g95
 bin/f95
 bin/${MACHINE_GNU_PLATFORM}-g95
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/cc1
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/f951
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/libgcc_eh.a
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/libgcc_s.so
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/libgcc_s.so.1
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/libgcc.a
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/libf95.a
 share/doc/g95/INSTALL
diff --git a/lang/g95/distinfo b/lang/g95/distinfo
index 8ae16e633b2..d3cf3cd9cdd 100644
--- a/lang/g95/distinfo
+++ b/lang/g95/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/09/07 01:33:51 dholland Exp $
+$NetBSD: distinfo,v 1.6 2008/09/07 01:59:26 dholland Exp $
 
 SHA1 (g95-0.91/g95_source.tgz) = aa58510c04e357439a4bf34c54d380e9079395d5
 RMD160 (g95-0.91/g95_source.tgz) = f0a8325c0e930d69d2def16eaa3c6c21dfd2b5a8
@@ -6,4 +6,4 @@ Size (g95-0.91/g95_source.tgz) = 1298703 bytes
 SHA1 (g95-0.91/gcc-core-4.0.3.tar.gz) = 2694281fa05ae0e39cd871fcc52745e35a2dfefc
 RMD160 (g95-0.91/gcc-core-4.0.3.tar.gz) = fd960201a888537ad84e71b72b6b1170ad94eaa0
 Size (g95-0.91/gcc-core-4.0.3.tar.gz) = 20137297 bytes
-SHA1 (patch-ab) = 5bd01e7a3e40c11cf91ff8efc0c2646901e77089
+SHA1 (patch-ab) = c056926665736e2c2f724121e64d996961a789fe
diff --git a/lang/g95/patches/patch-ab b/lang/g95/patches/patch-ab
index 1ecb9c538ec..860e7681eca 100644
--- a/lang/g95/patches/patch-ab
+++ b/lang/g95/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2008/09/07 01:33:51 dholland Exp $
+$NetBSD: patch-ab,v 1.4 2008/09/07 01:59:26 dholland Exp $
 
 --- Makefile.in.orig	2008-01-29 00:01:26.000000000 -0500
-+++ Makefile.in	2008-09-06 20:55:28.000000000 -0400
-@@ -1329,7 +1329,7 @@ clean-local:
++++ Makefile.in	2008-09-06 21:47:38.000000000 -0400
+@@ -1329,30 +1329,31 @@ clean-local:
  	rm -f options.tmp options.c options.h version.c
  
  install-exec-hook:
@@ -10,10 +10,17 @@ $NetBSD: patch-ab,v 1.3 2008/09/07 01:33:51 dholland Exp $
 +	mv ${DESTDIR}$(bindir)/g95$(EXEEXT) ${DESTDIR}$(bindir)/$(host)-g95$(EXEEXT)
  
  install-data-hook:
- 	-ln -sf f951$(EXEEXT) @DEST_LIBDIR@/cc1
-@@ -1340,19 +1340,20 @@ install-data-hook:
- 	  ranlib @DEST_LIBDIR@/libgcc_eh.a ; \
- 	  ranlib @DEST_LIBDIR@/libgcc.a ; \
+-	-ln -sf f951$(EXEEXT) @DEST_LIBDIR@/cc1
++	-ln -sf f951$(EXEEXT) ${DESTDIR}@DEST_LIBDIR@/cc1
+ 	if test "`uname`" = "Darwin" ; then \
+ 	  ar x /usr/lib/libgcc.a darwin-fpsave.o ; \
+-	  ar rs @DEST_LIBDIR@/libgcc.a darwin-fpsave.o ; \
++	  ar rs ${DESTDIR}@DEST_LIBDIR@/libgcc.a darwin-fpsave.o ; \
+ 	  rm ./darwin-fpsave.o ; \
+-	  ranlib @DEST_LIBDIR@/libgcc_eh.a ; \
+-	  ranlib @DEST_LIBDIR@/libgcc.a ; \
++	  ranlib ${DESTDIR}@DEST_LIBDIR@/libgcc_eh.a ; \
++	  ranlib ${DESTDIR}@DEST_LIBDIR@/libgcc.a ; \
  	fi
 -	cp INSTALL @DEST_LIBDIR@/../../../..
 -	cp G95Manual.pdf @DEST_LIBDIR@/../../../..
@@ -22,7 +29,8 @@ $NetBSD: patch-ab,v 1.3 2008/09/07 01:33:51 dholland Exp $
 +	$(INSTALL_DATA) G95Manual.pdf $(DESTDIR)$(docdir)
  	if test -n "`ls @GCC_DIR@/g95/gcc/libgcc_s.*`" ; then \
  	   (cd @GCC_DIR@/g95/gcc; tar cf - libgcc_s.*) | \
-            (cd @DEST_LIBDIR@; tar xf -) ; \
+-           (cd @DEST_LIBDIR@; tar xf -) ; \
++           (cd ${DESTDIR}@DEST_LIBDIR@; tar xf -) ; \
  	fi
  	if test -n "`ls @GCC_DIR@/g95/gcc/libunwind.*`" ; then \
  	   (cd @GCC_DIR@/g95/gcc; tar cf - libunwind.*) | \