xpdf hardcodes a path under /usr/local and several that don't exist
on OpenBSD.  Use ${LOCALBASE} and remove the others.

ok?


Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/xpdf/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile    25 Apr 2008 19:19:05 -0000      1.62
+++ Makefile    3 Apr 2009 17:55:01 -0000
@@ -4,8 +4,8 @@ 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=
Index: patches/patch-xpdf_GlobalParams_cc
===================================================================
RCS file: patches/patch-xpdf_GlobalParams_cc
diff -N patches/patch-xpdf_GlobalParams_cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-xpdf_GlobalParams_cc  3 Apr 2009 17:55:01 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- 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
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to