From 8ba8d2fc8bd67f1231c36725b8a1bc87202ecc2e Mon Sep 17 00:00:00 2001
From: bsiegert <bsiegert@pkgsrc.org>
Date: Sat, 21 Nov 2015 16:11:27 +0000
Subject: Pullup ticket #4852 - requested by he lang/g95: build fix

Revisions pulled up:
- lang/g95/distinfo                                             1.24
- lang/g95/patches/patch-ac                                     deleted
- lang/g95/patches/patch-configure                              1.1

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sat Nov  7 22:56:13 UTC 2015

   Modified Files:
   	pkgsrc/lang/g95: distinfo
   Added Files:
   	pkgsrc/lang/g95/patches: patch-configure
   Removed Files:
   	pkgsrc/lang/g95/patches: patch-ac

   Log Message:
   Let g95 build for NetBSD powerpc as well: treat NetBSD the same
   as Linux in terms of FPU usage.  Since this is only a build fix
   for the NetBSD powerpc ports, there's no revision bump.
---
 lang/g95/distinfo                |  4 ++--
 lang/g95/patches/patch-ac        | 15 ---------------
 lang/g95/patches/patch-configure | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 17 deletions(-)
 delete mode 100644 lang/g95/patches/patch-ac
 create mode 100644 lang/g95/patches/patch-configure

diff --git a/lang/g95/distinfo b/lang/g95/distinfo
index 9843ad68fbf..55cb117133e 100644
--- a/lang/g95/distinfo
+++ b/lang/g95/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2014/04/17 21:19:02 asau Exp $
+$NetBSD: distinfo,v 1.21.12.1 2015/11/21 16:11:27 bsiegert Exp $
 
 SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff
 RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176
@@ -7,7 +7,7 @@ SHA1 (gcc-core-4.1.2.tar.bz2) = d6875295f6df1bec4a6f4ab8f0da54bfb8d97306
 RMD160 (gcc-core-4.1.2.tar.bz2) = 612cbd5b795f7095fb3f565e6a8eaaee82c472c5
 Size (gcc-core-4.1.2.tar.bz2) = 17485561 bytes
 SHA1 (patch-ab) = 7429a4da26aa573dcdd94bf417da1e009f95d273
-SHA1 (patch-ac) = b20a90cc2f9078cf0048980b75fa6836da0f28a8
+SHA1 (patch-configure) = 48450808201d4ea5ddb993627c4efeaf43d53bd2
 SHA1 (patch-g95spec.c) = d6f434e715835cd39511c45ed18632c8401b78a2
 SHA1 (patch-gcc_Makefile.in) = cc5cc142a85612ebf2d38513e4b05db0ae795268
 SHA1 (patch-gcc_config.gcc) = 77c241a77e1879cd0a73847591d39adac7b13fc3
diff --git a/lang/g95/patches/patch-ac b/lang/g95/patches/patch-ac
deleted file mode 100644
index 3dc12c3c8a5..00000000000
--- a/lang/g95/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2013/02/04 20:31:44 markd Exp $
-
-Use $host_alias in the gcc-libdir path so it matches ${MACHINE_GNU_PLATFORM}
-
---- configure.orig	2010-04-22 04:07:13.000000000 +0000
-+++ configure
-@@ -4647,7 +4647,7 @@ _ACEOF
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_version" >&5
- $as_echo "$gcc_version" >&6; }
- 
--   DEST_LIBDIR=$prefix/lib/gcc-lib/$host/$gcc_version
-+   DEST_LIBDIR=$prefix/lib/gcc-lib/$host_alias/$gcc_version
-    SAVE_DIR=`pwd`
-    PREFIX=$prefix
- 
diff --git a/lang/g95/patches/patch-configure b/lang/g95/patches/patch-configure
new file mode 100644
index 00000000000..aa61ca1d34f
--- /dev/null
+++ b/lang/g95/patches/patch-configure
@@ -0,0 +1,27 @@
+$NetBSD: patch-configure,v 1.1.2.2 2015/11/21 16:11:27 bsiegert Exp $
+
+Use $host_alias in the gcc-libdir path so it matches ${MACHINE_GNU_PLATFORM}
+Treat NetBSD/powerpc as Linux powerpc.
+
+--- configure.orig	2010-04-22 04:07:13.000000000 +0000
++++ configure
+@@ -4647,7 +4647,7 @@ _ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_version" >&5
+ $as_echo "$gcc_version" >&6; }
+ 
+-   DEST_LIBDIR=$prefix/lib/gcc-lib/$host/$gcc_version
++   DEST_LIBDIR=$prefix/lib/gcc-lib/$host_alias/$gcc_version
+    SAVE_DIR=`pwd`
+    PREFIX=$prefix
+ 
+@@ -4911,6 +4911,10 @@ $as_echo "#define FPU_PPC_LINUX 1" >>con
+ 
+      ;;
+ 
++     *netbsd*)
++$as_echo "#define FPU_PPC_LINUX 1" >>confdefs.h
++     ;;
++
+      *)
+        echo host = $host
+        as_fn_error "Unknown powerpc architecture" "$LINENO" 5
-- 
cgit v1.2.3