From cd0e57def13ab5307cfa3608d24cb14598240ca4 Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Sat, 9 Feb 2008 13:11:07 +0000
Subject: Try to fix failure of detecting X Window System.

---
 fonts/fontforge/distinfo         |  4 +--
 fonts/fontforge/patches/patch-ae | 55 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 4 deletions(-)

(limited to 'fonts')

diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 2f6154595b3..13e48843c46 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35 2008/01/26 11:27:02 adam Exp $
+$NetBSD: distinfo,v 1.36 2008/02/09 13:11:07 taca Exp $
 
 SHA1 (fontforge_full-20080109.tar.bz2) = e3b21ff8aa18e108eac958e62a01dc3b41a0e99e
 RMD160 (fontforge_full-20080109.tar.bz2) = ad2a07358896de92719bd0416362a3eac5e44cd0
 Size (fontforge_full-20080109.tar.bz2) = 4548471 bytes
 SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 787dd7f105c82f39ac7442a29965246bd92544ed
+SHA1 (patch-ae) = 8888f19041f3bb09aff8294dc30f7af15f43711c
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index aec72b2b7b1..b0d655d6694 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,7 +1,58 @@
-$NetBSD: patch-ae,v 1.9 2008/01/26 11:27:02 adam Exp $
+$NetBSD: patch-ae,v 1.10 2008/02/09 13:11:07 taca Exp $
 
---- configure.orig	2008-01-05 18:58:52.000000000 +0100
+--- configure.orig	2008-01-06 02:58:52.000000000 +0900
 +++ configure
+@@ -22052,7 +22052,7 @@ fi
+ 
+ # Standard set of common directories for X headers.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+-ac_x_header_dirs='
++ac_x_header_dirs="
+ /usr/X11/include
+ /usr/X11R6/include
+ /usr/X11R5/include
+@@ -22063,29 +22063,29 @@ ac_x_header_dirs='
+ /usr/include/X11R5
+ /usr/include/X11R4
+ 
+-/usr/local/X11/include
+-/usr/local/X11R6/include
+-/usr/local/X11R5/include
+-/usr/local/X11R4/include
+-
+-/usr/local/include/X11
+-/usr/local/include/X11R6
+-/usr/local/include/X11R5
+-/usr/local/include/X11R4
++${prefix}/X11/include
++${prefix}/X11R6/include
++${prefix}/X11R5/include
++${prefix}/X11R4/include
++
++${prefix}/include/X11
++${prefix}/include/X11R6
++${prefix}/include/X11R5
++${prefix}/include/X11R4
+ 
+ /usr/X386/include
+ /usr/x386/include
+ /usr/XFree86/include/X11
+ 
+ /usr/include
+-/usr/local/include
++${prefix}/include
+ /usr/unsupported/include
+ /usr/athena/include
+-/usr/local/x11r5/include
++${prefix}/x11r5/include
+ /usr/lpp/Xamples/include
+ 
+ /usr/openwin/include
+-/usr/openwin/share/include'
++/usr/openwin/share/include"
+ 
+ if test "$ac_x_includes" = no; then
+   # Guess where to find include files, by looking for Intrinsic.h.
 @@ -25013,7 +25013,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
   cat </dev/null >$ac_confdir/po/Makefile.in
-- 
cgit v1.2.3