Add DESTDIR support.

3 files changed, 34 insertions, 10 deletions

diff --git a/lang/g95/Makefile b/lang/g95/Makefile
index 3996652bff6..919612a67a1 100644
--- a/lang/g95/Makefile
+++ b/lang/g95/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/04/16 18:47:18 wennmach Exp $
+# $NetBSD: Makefile,v 1.6 2008/09/07 01:33:51 dholland Exp $
 
 DISTNAME=		g95_source
 VERSION=		0.91
@@ -16,6 +16,8 @@ MAINTAINER=		wennmach@NetBSD.org
 HOMEPAGE=		http://www.g95.org/
 COMMENT=		Fortran 95 compiler from g95.org
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake gtar
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
@@ -40,8 +42,8 @@ post-build:
 	cd ${WRKSRC}/libf95.a-${VERSION} && ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && ${GMAKE}
 
 post-install:
-	cd ${WRKSRC}/libf95.a-${VERSION} && ${GMAKE} install
-	cd ${PREFIX}/bin && ${LN} -sf ${MACHINE_GNU_PLATFORM:Q}-g95 g95
-	cd ${PREFIX}/bin && ${LN} -sf ${MACHINE_GNU_PLATFORM:Q}-g95 f95
+	cd ${WRKSRC}/libf95.a-${VERSION} && ${GMAKE} install DESTDIR=${DESTDIR:Q}
+	cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ${MACHINE_GNU_PLATFORM:Q}-g95 g95
+	cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ${MACHINE_GNU_PLATFORM:Q}-g95 f95
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/g95/distinfo b/lang/g95/distinfo
index 676bc2429ed..8ae16e633b2 100644
--- a/lang/g95/distinfo
+++ b/lang/g95/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2008/04/04 21:24:48 markd Exp $
+$NetBSD: distinfo,v 1.5 2008/09/07 01:33:51 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) = 539b75f816c68afaad7f740ef1bd451647dba032
+SHA1 (patch-ab) = 5bd01e7a3e40c11cf91ff8efc0c2646901e77089
diff --git a/lang/g95/patches/patch-ab b/lang/g95/patches/patch-ab
index 2f7caf13639..1ecb9c538ec 100644
--- a/lang/g95/patches/patch-ab
+++ b/lang/g95/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2008/04/04 21:24:49 markd Exp $
+$NetBSD: patch-ab,v 1.3 2008/09/07 01:33:51 dholland Exp $
 
---- Makefile.in.orig	2008-01-29 18:01:26.000000000 +1300
-+++ Makefile.in
-@@ -1340,8 +1340,9 @@ install-data-hook:
+--- 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:
+ 	rm -f options.tmp options.c options.h version.c
+ 
+ install-exec-hook:
+-	mv $(bindir)/g95$(EXEEXT) $(bindir)/$(host)-g95$(EXEEXT)
++	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 ; \
  	fi
@@ -14,3 +23,16 @@ $NetBSD: patch-ab,v 1.2 2008/04/04 21:24:49 markd Exp $
  	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 -) ; \
+ 	fi
+ 	if test -n "`ls @GCC_DIR@/g95/gcc/libunwind.*`" ; then \
+ 	   (cd @GCC_DIR@/g95/gcc; tar cf - libunwind.*) | \
+-	   (cd @DEST_LIBDIR@; tar xf -) ; \
++	   (cd ${DESTDIR}@DEST_LIBDIR@; tar xf -) ; \
+ 	fi
+ 	if test -n "`ls @GCC_DIR@/g95/gcc/libgcc_eh.*`" ; then \
+ 	   (cd @GCC_DIR@/g95/gcc; tar cf - libgcc_eh.*) | \
+-	   (cd @DEST_LIBDIR@; tar xf -) ; \
++	   (cd ${DESTDIR}@DEST_LIBDIR@; tar xf -) ; \
+ 	fi
+ 
+ ggc-page.o: ggc-page40.c ggc-page41.c