Changes 3.00:

* New PDF rasterizer ("Splash").
* Added support for PDF 1.5.
* Replaced pdftopbm with pdftoppm (which can generate PBM, PGM, and PPM
  files).

10 files changed, 69 insertions, 45 deletions

diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 6c756167a05..8973cfccfc2 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2004/02/02 13:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/03 10:50:09 adam Exp $
 
-DISTNAME=	xpdf-2.03
+DISTNAME=	xpdf-3.00
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/}
diff --git a/print/xpdf/PLIST b/print/xpdf/PLIST
index 723e0160ca6..2be7be903da 100644
--- a/print/xpdf/PLIST
+++ b/print/xpdf/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.6 2003/03/25 14:02:38 salo Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/03/03 10:50:09 adam Exp $
 bin/pdffonts
 bin/pdfimages
 bin/pdfinfo
-bin/pdftopbm
+bin/pdftoppm
 bin/pdftops
 bin/pdftotext
 bin/xpdf
 man/man1/pdffonts.1
 man/man1/pdfimages.1
 man/man1/pdfinfo.1
-man/man1/pdftopbm.1
+man/man1/pdftoppm.1
 man/man1/pdftops.1
 man/man1/pdftotext.1
 man/man1/xpdf.1
diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo
index f5f8be6cf89..f9a1be0cd28 100644
--- a/print/xpdf/distinfo
+++ b/print/xpdf/distinfo
@@ -1,15 +1,17 @@
-$NetBSD: distinfo,v 1.13 2003/10/24 01:12:52 xtraeme Exp $
+$NetBSD: distinfo,v 1.14 2004/03/03 10:50:09 adam Exp $
 
-SHA1 (xpdf-2.03.tar.gz) = 5c9af4be4b9dbdce19369819411a61f38f86ea98
-Size (xpdf-2.03.tar.gz) = 501007 bytes
-SHA1 (patch-aa) = bf57c8955a25fc723fdcc86acc2055876c39a686
-SHA1 (patch-ab) = e0e7bca53918c125db5dcece7153afbec6e089ce
+SHA1 (xpdf-3.00.tar.gz) = 080317afce0851274fec2865131f59590b54eb99
+Size (xpdf-3.00.tar.gz) = 534697 bytes
+SHA1 (patch-aa) = 3f5d7792b9febecccbce49848755a351465df729
+SHA1 (patch-ab) = 775bfdd4d81ac8b6dd358eeec320097faaecaf90
 SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2
 SHA1 (patch-ad) = 303dbde0636e79601745808c514c77c31ef3d1b5
-SHA1 (patch-ae) = fbce5c68be50431e2b0a375be12a8b03fbf58427
-SHA1 (patch-af) = 156953b1e743cfd681a1f2cee2d68da576a40e7f
+SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143
+SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c
 SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac
 SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a
 SHA1 (patch-ai) = baa4308f9c44c750f54868dc3e355588dfd0dac8
 SHA1 (patch-aj) = 428b2da89b1775afbd2752ec105adad966babdf9
-SHA1 (patch-ak) = 374b7f6086bded7f90b28c04b9d9ca92d3ecafbc
+SHA1 (patch-ak) = e09c064906e0695fe31ab9f20fb9b6945b1b25cc
+SHA1 (patch-al) = 785bf1547e0bf5273b66e5b18adbcccaa85aee35
+SHA1 (patch-am) = 794ff952c749c8dab6f575d55602cdc7e7157fef
diff --git a/print/xpdf/patches/patch-aa b/print/xpdf/patches/patch-aa
index 7ba0e09d3c6..756eb06644f 100644
--- a/print/xpdf/patches/patch-aa
+++ b/print/xpdf/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2002/09/19 01:45:43 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2004/03/03 10:50:09 adam Exp $
 
---- Makefile.in.orig	Mon May 20 23:40:09 2002
+--- Makefile.in.orig	2004-01-22 01:26:44.000000000 +0000
 +++ Makefile.in
 @@ -13,6 +13,7 @@ DESTDIR =
  prefix = @prefix@
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.4 2002/09/19 01:45:43 jlam Exp $
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -79,12 +80,12 @@ install: dummy
+@@ -95,12 +96,12 @@ install: dummy
  	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
  	-mkdir -p $(DESTDIR)@mandir@/man5
  	$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5
diff --git a/print/xpdf/patches/patch-ab b/print/xpdf/patches/patch-ab
index e4a4a17f914..e8c27a21159 100644
--- a/print/xpdf/patches/patch-ab
+++ b/print/xpdf/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2002/11/08 02:46:30 dillo Exp $
+$NetBSD: patch-ab,v 1.4 2004/03/03 10:50:09 adam Exp $
 
---- xpdf/XPDFViewer.cc.orig	Sun Nov  3 23:15:37 2002
+--- xpdf/XPDFViewer.cc.orig	2004-01-22 01:26:45.000000000 +0000
 +++ xpdf/XPDFViewer.cc
-@@ -143,9 +143,12 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, GS
+@@ -181,9 +181,12 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, GS
  
  XPDFViewer::~XPDFViewer() {
    delete core;
diff --git a/print/xpdf/patches/patch-ae b/print/xpdf/patches/patch-ae
index f2739d54403..6b9a4e3dc8b 100644
--- a/print/xpdf/patches/patch-ae
+++ b/print/xpdf/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2003/03/25 14:02:40 salo Exp $
+$NetBSD: patch-ae,v 1.2 2004/03/03 10:50:09 adam Exp $
 
---- doc/pdfinfo.1.orig	2003-03-21 08:01:01.000000000 +0100
-+++ doc/pdfinfo.1	2003-03-25 12:39:27.000000000 +0100
-@@ -56,7 +56,7 @@
+--- doc/pdfinfo.1.orig	2004-01-22 01:26:44.000000000 +0000
++++ doc/pdfinfo.1
+@@ -71,7 +71,7 @@ metadata (only if requested)
  .SH CONFIGURATION FILE
  Pdfinfo reads a configuration file at startup.  It first tries to find
  the user's private config file, ~/.xpdfrc.  If that doesn't exist, it
diff --git a/print/xpdf/patches/patch-af b/print/xpdf/patches/patch-af
index 2f5c9ce2fab..481c3f0c1de 100644
--- a/print/xpdf/patches/patch-af
+++ b/print/xpdf/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2003/03/25 14:02:41 salo Exp $
+$NetBSD: patch-af,v 1.2 2004/03/03 10:50:09 adam Exp $
 
---- doc/pdftopbm.1.orig	2003-03-21 08:01:01.000000000 +0100
-+++ doc/pdftopbm.1	2003-03-25 12:41:27.000000000 +0100
-@@ -23,7 +23,7 @@
- Pdftopbm reads a configuration file at startup.  It first tries to
+--- doc/pdftoppm.1.orig	2004-01-22 01:26:44.000000000 +0000
++++ doc/pdftoppm.1
+@@ -25,7 +25,7 @@ is the page number.
+ Pdftoppm reads a configuration file at startup.  It first tries to
  find the user's private config file, ~/.xpdfrc.  If that doesn't
  exist, it looks for a system-wide config file, typically
--/usr/local/etc/xpdfrc (but this location can be changed when pdftopbm
-+@PKG_SYSCONFDIR@/xpdfrc (but this location can be changed when pdftopbm
+-/usr/local/etc/xpdfrc (but this location can be changed when pdftoppm
++@PKG_SYSCONFDIR@/etc/xpdfrc (but this location can be changed when pdftoppm
  is built).  See the
  .BR xpdfrc (5)
  man page for details.
diff --git a/print/xpdf/patches/patch-ak b/print/xpdf/patches/patch-ak
index 958d2a4ef71..29261aebecf 100644
--- a/print/xpdf/patches/patch-ak
+++ b/print/xpdf/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2003/03/25 14:02:44 salo Exp $
+$NetBSD: patch-ak,v 1.2 2004/03/03 10:50:09 adam Exp $
 
---- doc/xpdfrc.5.orig	2003-03-21 08:01:01.000000000 +0100
-+++ doc/xpdfrc.5	2003-03-25 12:38:38.000000000 +0100
-@@ -7,7 +7,7 @@
+--- 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
  .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 @@ $NetBSD: patch-ak,v 1.1 2003/03/25 14:02:44 salo Exp $
  if it exists.  (This is its default location; depending on build
  options, it may be placed elsewhere.)  On Win32 systems, the
  .I xpdfrc
-@@ -390,12 +390,12 @@
+@@ -405,33 +405,33 @@ The following is a sample xpdfrc file.
  .nf
  
  # from the Thai support package
@@ -26,10 +26,6 @@ $NetBSD: patch-ak,v 1.1 2003/03/25 14:02:44 salo Exp $
 +unicodeMap   JISX0208     @PREFIX@/share/xpdf/JISX0208.unicodeMap
 +cMapDir      Adobe-Japan1 @PREFIX@/share/xpdf/cmap/Adobe-Japan1
  
- # use an X server font for Times-Roman
- # (this is the built-in default)
-@@ -403,27 +403,27 @@
- 
  # 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
@@ -61,18 +57,15 @@ $NetBSD: patch-ak,v 1.1 2003/03/25 14:02:44 salo Exp $
 +displayFontT1 Symbol                @PREFIX@/share/ghostscript/fonts/s050000l.pfb
 +displayFontT1 ZapfDingbats          @PREFIX@/share/ghostscript/fonts/d050000l.pfb
  
- # from the Japanese support package
- displayCIDFontX Adobe-Japan1 "-*-fixed-medium-r-normal-*-%s-*-*-*-*-*-jisx0208.1983-0" JISX0208
- 
  # use the Bakoma Type 1 fonts
 -# (this assumes they happen to be installed in /usr/local/fonts/bakoma)
 -fontDir /usr/local/fonts/bakoma
-+# (this assumes they happen to be installed in @PREFIX@/share/tex-contrib/BaKoMa)
-+fontDir @PREFIX@/share/tex-contrib/BaKoMa
++# (this assumes they happen to be installed in @PREFIX@/share/tex-contrib/fonts/BaKoMa)
++fontDir @PREFIX@/share/tex-contrib/fonts/BaKoMa
  
  # set some PostScript options
  psPaperSize          letter
-@@ -450,7 +450,7 @@
+@@ -458,7 +458,7 @@ urlCommand      "netscape -remote 'openU
  .fi
  .SH FILES
  .TP
diff --git a/print/xpdf/patches/patch-al b/print/xpdf/patches/patch-al
new file mode 100644
index 00000000000..762d132860f
--- /dev/null
+++ b/print/xpdf/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.1 2004/03/03 10:50:59 adam Exp $
+
+--- xpdf/GlobalParams.cc.orig	2004-03-03 10:26:05.000000000 +0000
++++ xpdf/GlobalParams.cc
+@@ -81,9 +81,9 @@ static struct {
+ };
+ 
+ static char *displayFontDirs[] = {
+-  "/usr/share/ghostscript/fonts",
++  PREFIX"/share/ghostscript/fonts",
+   "/usr/local/share/ghostscript/fonts",
+-  "/usr/share/fonts/default/Type1",
++  "/usr/X11R6/lib/X11/fonts/Type1",
+   NULL
+ };
+ 
diff --git a/print/xpdf/patches/patch-am b/print/xpdf/patches/patch-am
new file mode 100644
index 00000000000..89e167a67be
--- /dev/null
+++ b/print/xpdf/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2004/03/03 10:50:59 adam Exp $
+
+--- xpdf/Makefile.in.orig	2004-01-22 01:26:45.000000000 +0000
++++ xpdf/Makefile.in
+@@ -19,7 +19,7 @@ FOFILIBDIR = ../fofi
+ SPLASHSRCDIR = $(srcdir)/../splash
+ SPLASHLIBDIR = ../splash
+ 
+-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
++CXXFLAGS = @CXXFLAGS@ @DEFS@ -DPREFIX="\"@prefix@\"" -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
+ 
+ LDFLAGS = @LDFLAGS@
+