From 5678a9d202bec2416907834f1688948b03fb706d Mon Sep 17 00:00:00 2001
From: sbd <sbd@pkgsrc.org>
Date: Mon, 26 Dec 2011 02:56:51 +0000
Subject: Remove '-gnu' from MODULE_ARCH in configure so it matches the PLIST
 on linux.

---
 graphics/evas/distinfo                   |  6 +++---
 graphics/evas/patches/patch-configure    | 13 +++++++++++--
 graphics/evas/patches/patch-configure.ac | 11 ++++++++++-
 3 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'graphics')

diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 2864d177238..051bbc010e1 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2011/12/13 20:03:26 marino Exp $
+$NetBSD: distinfo,v 1.10 2011/12/26 02:56:51 sbd Exp $
 
 SHA1 (evas-1.1.0.tar.bz2) = e09daebd5aa14ecdff94bca0ff30a4cf70b3b84b
 RMD160 (evas-1.1.0.tar.bz2) = ebad0e5b4f3987ee9a29b39f329afb650eafeb20
 Size (evas-1.1.0.tar.bz2) = 9235732 bytes
-SHA1 (patch-configure) = 76c1e7dec71cf4505e0ac4b52b7187be1adaeabf
-SHA1 (patch-configure.ac) = ab4c089e250ecc1acfb57e1b949b918bfc590608
+SHA1 (patch-configure) = e8c7965ff313119dafed9e741439056a0b68bf13
+SHA1 (patch-configure.ac) = 7ab470d4c80e60859c3990eccc54633e84d54bda
diff --git a/graphics/evas/patches/patch-configure b/graphics/evas/patches/patch-configure
index a983686fe5e..c7af6374926 100644
--- a/graphics/evas/patches/patch-configure
+++ b/graphics/evas/patches/patch-configure
@@ -1,7 +1,16 @@
-$NetBSD: patch-configure,v 1.3 2011/12/13 20:03:26 marino Exp $
+$NetBSD: patch-configure,v 1.4 2011/12/26 02:56:51 sbd Exp $
 
---- configure.orig	2011-12-13 18:08:17.000000000 +0000
+--- configure.orig	2011-12-02 07:42:00.000000000 +0000
 +++ configure
+@@ -12101,7 +12101,7 @@ case "$host_os" in
+       MODULE_ARCH="$host_os-$host_cpu"
+       ;;
+    *)
+-      MODULE_ARCH="$host_os-$host_cpu-1.1.0"
++      MODULE_ARCH="${host_os%-gnu}-$host_cpu-1.1.0"
+       ;;
+ esac
+ 
 @@ -19846,6 +19846,7 @@ $as_echo_n "checking whether shm_open()
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
diff --git a/graphics/evas/patches/patch-configure.ac b/graphics/evas/patches/patch-configure.ac
index 11e962aedbf..01224fb307c 100644
--- a/graphics/evas/patches/patch-configure.ac
+++ b/graphics/evas/patches/patch-configure.ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-configure.ac,v 1.1 2011/12/13 20:03:26 marino Exp $
+$NetBSD: patch-configure.ac,v 1.2 2011/12/26 02:56:51 sbd Exp $
 
 --- configure.ac.orig	2011-11-17 03:25:24.000000000 +0000
 +++ configure.ac
+@@ -81,7 +81,7 @@ case "$host_os" in
+       MODULE_ARCH="$host_os-$host_cpu"
+       ;;
+    *)
+-      MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
++      MODULE_ARCH="${host_os%-gnu}-$host_cpu-v_maj.v_min.v_mic"
+       ;;
+ esac
+ AC_SUBST(MODULE_ARCH)
 @@ -569,6 +569,7 @@ if test "x${want_evas_cserve}" = "xyes"
     AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
-- 
cgit v1.2.3