From e71b604a5ced7be15529f75b00a68492754ba912 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 4 Apr 2009 14:45:48 +0000
Subject: [PATCH] don't hardcode /usr/local and don't probe paths that don't
 exist on OpenBSD ok steven@, kili@, landry@, sthen@

---
 textproc/xpdf/Makefile                           |  8 ++++----
 textproc/xpdf/patches/patch-xpdf_GlobalParams_cc | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 textproc/xpdf/patches/patch-xpdf_GlobalParams_cc

diff --git a/textproc/xpdf/Makefile b/textproc/xpdf/Makefile
index d4faa0fcad1..4bc48a4b9ae 100644
--- a/textproc/xpdf/Makefile
+++ b/textproc/xpdf/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.62 2008/04/25 19:19:05 deanna Exp $
+# $OpenBSD: Makefile,v 1.63 2009/04/04 14:45:48 naddy Exp $
 
 COMMENT-main=	PDF viewer for X11
 COMMENT-utils=	PDF conversion tools
 
 DISTNAME=	xpdf-3.02
-PKGNAME-main=	xpdf-3.02pl2p4
-PKGNAME-utils=	xpdf-utils-3.02pl2p1
+PKGNAME-main=	xpdf-3.02pl2p5
+PKGNAME-utils=	xpdf-utils-3.02pl2p2
 CATEGORIES=	textproc x11
 
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-multithreaded \
 		 --without-Sgm-library \
 		 --without-libpaper-library
 
-CONFIGURE_ENV=  CPPFLAGS="-I${X11BASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE}/include" \
+CONFIGURE_ENV=  CPPFLAGS='-I${X11BASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE}/include -DLOCALBASE="\"${LOCALBASE}\""' \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lz"
 
 LIB_DEPENDS-utils=
diff --git a/textproc/xpdf/patches/patch-xpdf_GlobalParams_cc b/textproc/xpdf/patches/patch-xpdf_GlobalParams_cc
new file mode 100644
index 00000000000..ef37c665557
--- /dev/null
+++ b/textproc/xpdf/patches/patch-xpdf_GlobalParams_cc
@@ -0,0 +1,16 @@
+$OpenBSD: patch-xpdf_GlobalParams_cc,v 1.1 2009/04/04 14:45:48 naddy Exp $
+--- xpdf/GlobalParams.cc.orig	Fri Apr  3 19:30:57 2009
++++ xpdf/GlobalParams.cc	Fri Apr  3 19:31:18 2009
+@@ -110,11 +110,7 @@ static char *displayFontDirs[] = {
+ };
+ #else
+ static char *displayFontDirs[] = {
+-  "/usr/share/ghostscript/fonts",
+-  "/usr/local/share/ghostscript/fonts",
+-  "/usr/share/fonts/default/Type1",
+-  "/usr/share/fonts/default/ghostscript",
+-  "/usr/share/fonts/type1/gsfonts",
++  LOCALBASE "/share/ghostscript/fonts",
+   NULL
+ };
+ #endif