Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/xpdf/Makefile,v
retrieving revision 1.62
diff -N -u Makefile
--- Makefile	25 Apr 2008 19:19:05 -0000	1.62
+++ Makefile	28 Apr 2009 09:15:56 -0000
@@ -1,24 +1,25 @@
-# $OpenBSD: Makefile,v 1.62 2008/04/25 19:19:05 deanna Exp $
+# $OpenBSD: Makefile,v 1.64 2009/04/17 20:55:46 kili 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.02.3
+PKGNAME-utils=	xpdf-utils-3.02.3
 CATEGORIES=	textproc x11
 
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		ftp://gd.tuwien.ac.at/publishing/xpdf/ \
 		ftp://tug.org/xpdf/
-PATCHFILES=	xpdf-3.02pl1.patch xpdf-3.02pl2.patch
+PATCHFILES=	xpdf-3.02pl1.patch xpdf-3.02pl2.patch \
+		xpdf-3.02pl3.patch
 PATCH_DIST_STRIP=-p1
 
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 
 MULTI_PACKAGES=	-main -utils
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -32,7 +33,7 @@
 		 --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: distinfo
===================================================================
RCS file: /cvs/ports/textproc/xpdf/distinfo,v
retrieving revision 1.13
diff -N -u distinfo
--- distinfo	9 Nov 2007 07:15:12 -0000	1.13
+++ distinfo	28 Apr 2009 09:15:56 -0000
@@ -1,15 +1,20 @@
 MD5 (xpdf-3.02.tar.gz) = WZ3EzGWgfuhoz5KmZ6kT0g==
 MD5 (xpdf-3.02pl1.patch) = h3EYeG3+J9G3qlpnWcxuRQ==
 MD5 (xpdf-3.02pl2.patch) = OlyxZa5meB4LIeYhmuBnlQ==
+MD5 (xpdf-3.02pl3.patch) = WBlj7eD7VxXhpp8BtbjOYw==
 RMD160 (xpdf-3.02.tar.gz) = 6QDLhnC4xDC+qkWJX7R0QRyxlY0=
 RMD160 (xpdf-3.02pl1.patch) = XDEPlnYPcunBBisAxXwu0DWsZ1c=
 RMD160 (xpdf-3.02pl2.patch) = ACTj0gPWngc6RYVwzsVnniYK0gQ=
+RMD160 (xpdf-3.02pl3.patch) = hZ7DEx08RSamB17mOcXrcEGUIRs=
 SHA1 (xpdf-3.02.tar.gz) = +ZQGmIQMioBFZ36L5oq4WAkD4go=
 SHA1 (xpdf-3.02pl1.patch) = zTyO1uH9NgYJi4XVzIp9GqMFJm0=
 SHA1 (xpdf-3.02pl2.patch) = 0ILr4NNsrQwEYDlQIW9cUt4cJZM=
+SHA1 (xpdf-3.02pl3.patch) = I/SWgEgCo9pTDx0Lq4lLrj6Tj8I=
 SHA256 (xpdf-3.02.tar.gz) = szp9VvRUwzGuUJlvmJ6GyRZuV6+Xt03ijN3z1RrBHwA=
 SHA256 (xpdf-3.02pl1.patch) = WPYTsAtBSoaqd2t2/NiZu0FeTuTtwhhMinxO0QBNu/M=
 SHA256 (xpdf-3.02pl2.patch) = 0cHYh7C4pSg/BPgl5E8IXy6S2ve1GIiazxvInqB+2dk=
+SHA256 (xpdf-3.02pl3.patch) = WUzo+9I7/ynqzd+uNTPGPH6GtKJPfUXkTxk309GeU0s=
 SIZE (xpdf-3.02.tar.gz) = 674912
 SIZE (xpdf-3.02pl1.patch) = 1050
 SIZE (xpdf-3.02pl2.patch) = 20843
+SIZE (xpdf-3.02pl3.patch) = 30727
Index: patches/patch-xpdf_GlobalParams_cc
===================================================================
RCS file: /cvs/ports/textproc/xpdf/patches/patch-xpdf_GlobalParams_cc,v
diff -N -u patches/patch-xpdf_GlobalParams_cc
--- /dev/null	28 Apr 2009 09:15:57 -0000
+++ patches/patch-xpdf_GlobalParams_cc	28 Apr 2009 09:15:56 -0000
@@ -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
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/textproc/xpdf/pkg/PLIST-main,v
retrieving revision 1.1
diff -N -u pkg/PLIST-main
--- pkg/PLIST-main	13 Feb 2008 16:18:33 -0000	1.1
+++ pkg/PLIST-main	28 Apr 2009 09:15:56 -0000
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2008/02/13 16:18:33 landry Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2009/04/17 20:55:46 kili Exp $
 @pkgpath textproc/xpdf
-bin/pdftoppm
-bin/pdftops
-bin/xpdf
+@bin bin/pdftoppm
+@bin bin/pdftops
+@bin bin/xpdf
 @man man/man1/pdftoppm.1
 @man man/man1/pdftops.1
 @man man/man1/xpdf.1
Index: pkg/PLIST-utils
===================================================================
RCS file: /cvs/ports/textproc/xpdf/pkg/PLIST-utils,v
retrieving revision 1.1
diff -N -u pkg/PLIST-utils
--- pkg/PLIST-utils	13 Feb 2008 16:18:33 -0000	1.1
+++ pkg/PLIST-utils	28 Apr 2009 09:15:56 -0000
@@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST-utils,v 1.1 2008/02/13 16:18:33 landry Exp $
+@comment $OpenBSD: PLIST-utils,v 1.2 2009/04/17 20:55:46 kili Exp $
 @conflict xpdf-<=3.02pl2p0
-bin/pdffonts
-bin/pdfimages
-bin/pdfinfo
-bin/pdftotext
+@bin bin/pdffonts
+@bin bin/pdfimages
+@bin bin/pdfinfo
+@bin bin/pdftotext
 @man man/man1/pdffonts.1
 @man man/man1/pdfimages.1
 @man man/man1/pdfinfo.1