Note: There was a bad value `' for the field `Confidential'.
	It was set to the default value of `yes'.

>Number:         31226
>Category:       pkg
>Synopsis:       update xpdf to 3.01
>Confidential:   yes
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Sep 08 18:50:00 +0000 2005
>Originator:     Brian de Alwis
>Release:        NetBSD 2.0.2_STABLE
>Organization:
  Brian de Alwis | Software Practices Lab | UBC | http://www.cs.ubc.ca/~bsd/
"There is much pleasure to be gained in useless knowledge." - Bertrand Russell
>Environment:
System: NetBSD slab 2.0.2_STABLE NetBSD 2.0.2_STABLE (SLAB) #6: Fri Aug 19 19:15:23 PDT 2005 bsd@slab:/home/scratch/src/src-2.0/sys/arch/i386/compile/SLAB i386
Architecture: i386
Machine: i386
>Description:
	Xpdf 3.01 was released on August 17, 2005. 
>How-To-Repeat:
>Fix:
	I've attached patches to update pkgsrc/print/xpdf to 3.01. 
	I've been using this Xpdf for a day in a variety of PDFs,
	with no problems so far.

	One questionable part of this patch is dealing with the font
	lookup directories in xpdf/GlobalParams.cc.  Two additional
	paths were added to the list for 3.01, but they seemed to be
	trying to compensate for different possible ghostscript
	installation locations.  As we'll be pretty certain to
	be running from packages, I removed the additions to be
	what was there previously.

	The following patches are now obsoleted:

	    patch-ao
	    patch-ap
	    patch-ar
	    patch-as

diff -ruwb /usr/pkgsrc/print/xpdf/Makefile /usr/local/pkgsrc/bda/xpdf/Makefile
--- /usr/pkgsrc/print/xpdf/Makefile	2005-08-13 03:03:40.000000000 -0700
+++ /usr/local/pkgsrc/bda/xpdf/Makefile	2005-09-07 14:16:41.000000000 -0700
@@ -1,19 +1,11 @@
 # $NetBSD: Makefile,v 1.38 2005/08/12 12:27:30 salo Exp $
 
-DISTNAME=	xpdf-3.00
-PKGNAME=	${DISTNAME}pl3
-PKGREVISION=	1
+DISTNAME=	xpdf-3.01
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/} \
 		http://gd.tuwien.ac.at/publishing/xpdf/
 
-PATCHFILES=	xpdf-3.00pl1.patch
-PATCHFILES+=	xpdf-3.00pl2.patch
-PATCHFILES+=	xpdf-3.00pl3.patch
-PATCH_SITES=	${MASTER_SITES}
-PATCH_DIST_ARGS=-d ${WRKSRC}/xpdf --quiet
-
 MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Display tool for PDF files
diff -ruwb /usr/pkgsrc/print/xpdf/distinfo /usr/local/pkgsrc/bda/xpdf/distinfo
--- /usr/pkgsrc/print/xpdf/distinfo	2005-08-13 03:03:41.000000000 -0700
+++ /usr/local/pkgsrc/bda/xpdf/distinfo	2005-09-08 11:47:20.000000000 -0700
@@ -1,17 +1,8 @@
 $NetBSD: distinfo,v 1.20 2005/08/12 12:27:30 salo Exp $
 
-SHA1 (xpdf-3.00.tar.gz) = 080317afce0851274fec2865131f59590b54eb99
-RMD160 (xpdf-3.00.tar.gz) = d98668ac8cd059461107c4dfbd9b3fd3beff6176
-Size (xpdf-3.00.tar.gz) = 534697 bytes
-SHA1 (xpdf-3.00pl1.patch) = b984f64c25310e3b0bdebd9b75088ea46e067735
-RMD160 (xpdf-3.00pl1.patch) = d8cc3c381fca5c388bae9fa1c240548a97241a13
-Size (xpdf-3.00pl1.patch) = 7434 bytes
-SHA1 (xpdf-3.00pl2.patch) = 9b406ea1514b508893460c3ec9cb6131287b1c9c
-RMD160 (xpdf-3.00pl2.patch) = 70fc8d6cccb02adb2ba32ea6911682ead6a1649a
-Size (xpdf-3.00pl2.patch) = 1645 bytes
-SHA1 (xpdf-3.00pl3.patch) = c29b9ea13d1f8567a4521e12d50e497bf1681608
-RMD160 (xpdf-3.00pl3.patch) = 7fb5521b698589245f9e0ccea753a6d4e30badf8
-Size (xpdf-3.00pl3.patch) = 346 bytes
+SHA1 (xpdf-3.01.tar.gz) = 472cbf0f3df4e20a3ab7ada2e704b4e10d1d385b
+RMD160 (xpdf-3.01.tar.gz) = d734065ce12db8d0c37d9d0ac0ca7c287be59442
+Size (xpdf-3.01.tar.gz) = 599778 bytes
 SHA1 (patch-aa) = 3f5d7792b9febecccbce49848755a351465df729
 SHA1 (patch-ab) = 775bfdd4d81ac8b6dd358eeec320097faaecaf90
 SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2
@@ -20,13 +11,9 @@
 SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c
 SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac
 SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a
-SHA1 (patch-ai) = baa4308f9c44c750f54868dc3e355588dfd0dac8
+SHA1 (patch-ai) = 3f4cfc355466cb4df3f19155050f9c35615d9865
 SHA1 (patch-aj) = 428b2da89b1775afbd2752ec105adad966babdf9
-SHA1 (patch-ak) = e09c064906e0695fe31ab9f20fb9b6945b1b25cc
-SHA1 (patch-al) = 785bf1547e0bf5273b66e5b18adbcccaa85aee35
+SHA1 (patch-ak) = 9dc4ab060ac80914288681c8795908c335808acb
+SHA1 (patch-al) = 37dcd5e236bb9b63bcb886c45e3874c2ff735cdc
 SHA1 (patch-am) = 794ff952c749c8dab6f575d55602cdc7e7157fef
 SHA1 (patch-an) = bf579a07e9b9868ed8d6a6450484c47ce9acaef0
-SHA1 (patch-ao) = fd25cab0255d24c4b55907b031f5f4ec68411576
-SHA1 (patch-ap) = 51d05bb8978003308e14274fc1ada4f1ace6d766
-SHA1 (patch-ar) = bd66ea42d4ba11bdcefcfef2988d37559f21e629
-SHA1 (patch-as) = e76bc488bc533ef3784ed863c2c5d4b0967afc29
diff -ruwb /usr/pkgsrc/print/xpdf/patches/patch-ai /usr/local/pkgsrc/bda/xpdf/patches/patch-ai
--- /usr/pkgsrc/print/xpdf/patches/patch-ai	2003-03-25 06:02:42.000000000 -0800
+++ /usr/local/pkgsrc/bda/xpdf/patches/patch-ai	2005-09-08 11:46:00.000000000 -0700
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2003/03/25 14:02:42 salo Exp $
+$NetBSD$
 
---- doc/sample-xpdfrc.orig	2003-03-21 08:01:01.000000000 +0100
-+++ doc/sample-xpdfrc	2003-03-25 12:45:39.000000000 +0100
+--- doc/sample-xpdfrc.orig	2005-08-16 22:34:30.000000000 -0700
++++ doc/sample-xpdfrc	2005-09-07 14:24:51.000000000 -0700
 @@ -4,7 +4,7 @@
  #
  # The Xpdf tools look for a config file in two places:
@@ -11,9 +11,9 @@
  #
  # This sample config file demonstrates some of the more common
  # configuration options.  Everything here is commented out.  You
-@@ -46,20 +46,20 @@
- # this, but you'll need to adjust this to point to wherever
- # ghostscript is installed on your system.
+@@ -29,20 +29,20 @@
+ # installed in a "standard" location, xpdf will find them
+ # automatically.)
  
 -#displayFontT1 Times-Roman		/usr/local/share/ghostscript/fonts/n021003l.pfb
 -#displayFontT1 Times-Italic		/usr/local/share/ghostscript/fonts/n021023l.pfb
@@ -46,7 +46,7 @@
  
  # If you need to display PDF files that refer to non-embedded fonts,
  # you should add one or more fontDir options to point to the
-@@ -67,7 +67,7 @@
+@@ -50,7 +50,7 @@
  # .pfb, and .ttf files in those directories (other files will simply
  # be ignored).
  
diff -ruwb /usr/pkgsrc/print/xpdf/patches/patch-ak /usr/local/pkgsrc/bda/xpdf/patches/patch-ak
--- /usr/pkgsrc/print/xpdf/patches/patch-ak	2004-03-03 02:50:09.000000000 -0800
+++ /usr/local/pkgsrc/bda/xpdf/patches/patch-ak	2005-09-08 11:47:13.000000000 -0700
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2004/03/03 10:50:09 adam Exp $
+$NetBSD$
 
---- doc/xpdfrc.5.orig	2004-01-22 01:26:44.000000000 +0000
-+++ doc/xpdfrc.5
-@@ -7,7 +7,7 @@ All of the Xpdf tools read a single conf
+--- doc/xpdfrc.5.orig	2005-08-16 22:34:30.000000000 -0700
++++ doc/xpdfrc.5	2005-09-07 14:27:22.000000000 -0700
+@@ -7,7 +7,7 @@
  .I .xpdfrc
  file in your home directory, it will be read.  Otherwise, a
  system-wide configuration file will be read from
@@ -11,7 +11,7 @@
  if it exists.  (This is its default location; depending on build
  options, it may be placed elsewhere.)  On Win32 systems, the
  .I xpdfrc
-@@ -405,33 +405,33 @@ The following is a sample xpdfrc file.
+@@ -407,32 +407,32 @@
  .nf
  
  # from the Thai support package
@@ -27,7 +27,6 @@
 +cMapDir      Adobe-Japan1 @PREFIX@/share/xpdf/cmap/Adobe-Japan1
  
  # use the Base-14 Type 1 fonts from ghostscript
- # (note that this overrides the displayFontX command above)
 -displayFontT1 Times-Roman           /usr/local/share/ghostscript/fonts/n021003l.pfb
 -displayFontT1 Times-Italic          /usr/local/share/ghostscript/fonts/n021023l.pfb
 -displayFontT1 Times-Bold            /usr/local/share/ghostscript/fonts/n021004l.pfb
@@ -65,7 +64,7 @@
  
  # set some PostScript options
  psPaperSize          letter
-@@ -458,7 +458,7 @@ urlCommand      "netscape -remote 'openU
+@@ -459,7 +459,7 @@
  .fi
  .SH FILES
  .TP
diff -ruwb /usr/pkgsrc/print/xpdf/patches/patch-al /usr/local/pkgsrc/bda/xpdf/patches/patch-al
--- /usr/pkgsrc/print/xpdf/patches/patch-al	2004-03-03 02:50:59.000000000 -0800
+++ /usr/local/pkgsrc/bda/xpdf/patches/patch-al	2005-09-08 11:46:04.000000000 -0700
@@ -1,16 +1,19 @@
-$NetBSD: patch-al,v 1.1 2004/03/03 10:50:59 adam Exp $
+$NetBSD$
 
---- xpdf/GlobalParams.cc.orig	2004-03-03 10:26:05.000000000 +0000
-+++ xpdf/GlobalParams.cc
-@@ -81,9 +81,9 @@ static struct {
+--- xpdf/GlobalParams.cc.orig	2005-08-16 22:34:31.000000000 -0700
++++ xpdf/GlobalParams.cc	2005-09-07 14:31:50.000000000 -0700
+@@ -106,11 +106,10 @@
  };
- 
+ #else
  static char *displayFontDirs[] = {
 -  "/usr/share/ghostscript/fonts",
++  PREFIX"/share/fonts",
 +  PREFIX"/share/ghostscript/fonts",
    "/usr/local/share/ghostscript/fonts",
 -  "/usr/share/fonts/default/Type1",
+-  "/usr/share/fonts/default/ghostscript",
+-  "/usr/share/fonts/type1/gsfonts",
 +  "/usr/X11R6/lib/X11/fonts/Type1",
    NULL
  };
- 
+ #endif