Update xpdf to 1.00

Implemented the sh (shaded fill) operator for the axial shading type.
Minor fixes to avoid compiler warnings.
Fix an uninitialized var in XOutputDev that caused crashes on Alphas.
Don't incrementally update the display in full-screen mode.
Added a duplex option to PSOutputDev and a -duplex switch to pdftops.
Completely rewrote the code that handles font encodings:
  - everything is Unicode-based
  - 16-bit fonts are handled much more cleanly
  - text output encoding can be set more flexibly
New .xpdfrc config files.
Added key bindings for forward ('v') and backward ('b').
Added the pdffonts program which lists the fonts used in a PDF file.
Fixed several problems in the TrueType font embedding code
Accept named destination on command line.
Added several new items to pdfinfo: file size, PDF version, tagged
  (yes or no), XML metadata (with the -meta option).
Pdftops didn't get the portrait/landscape setting correct for PDF
  files with rotated pages.
The TrueTypeFontFile class (including the Type 42 converter) now
  understands cmap format 6.
The '0' keyboard shortcut didn't update the zoom popup menu.
Handle the complete list of alternate names for the Base14 fonts.
Fixed substitute font scaling in XOutputDev - scale only the width,
  not the height.
Implemented stitching (type 3) functions.
Handle the case of moveto/closepath/clip, which defines an empty
  clipping region.
Move dependences into separate Makefile.dep files; get rid of the
  distdepend target.
Move all of the configure-script-generated -D options out of the
  Makefiles and into a top-level .h file (aconf.h).
Pdfinfo prints dates in a more readable format.
Fixed a bug in the Paeth image predictor.
Handle annotations with multiple states.
The save and restore (q/Q) operators shouldn't save/restore the path.
Performance optimization: disable pattern drawing in TextOutputDev.

4 files changed, 28 insertions, 26 deletions

diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 57201b0c208..372e7ab6c8e 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2001/10/30 06:32:20 simonb Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/03 05:28:51 mjl Exp $
 # 
 
-DISTNAME=	xpdf-0.93
+DISTNAME=	xpdf-1.00
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
diff --git a/print/xpdf/PLIST b/print/xpdf/PLIST
index 0faef9f940f..76c494b1659 100644
--- a/print/xpdf/PLIST
+++ b/print/xpdf/PLIST
@@ -1,14 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:28:14 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/03 05:28:51 mjl Exp $
 bin/xpdf
+bin/pdffonts
 bin/pdftops
 bin/pdftotext
 bin/pdfinfo
 bin/pdftopbm
 bin/pdfimages
+etc/xpdfrc
 man/man1/xpdf.1
+man/man1/pdffonts.1
 man/man1/pdftops.1
 man/man1/pdftotext.1
 man/man1/pdfinfo.1
 man/man1/pdftopbm.1
 man/man1/pdfimages.1
+man/man5/xpdfrc.5
 lib/X11/app-defaults/Xpdf
diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo
index 1e52bf7fd1e..34d44c90438 100644
--- a/print/xpdf/distinfo
+++ b/print/xpdf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/10/30 06:32:20 simonb Exp $
+$NetBSD: distinfo,v 1.3 2002/02/03 05:28:51 mjl Exp $
 
-SHA1 (xpdf-0.93.tgz) = a5762fec0e352a1610c9f0cd8e081ded92246773
-Size (xpdf-0.93.tgz) = 1001491 bytes
-SHA1 (patch-aa) = 633e0574525af90d8ce70be39dece403a564007b
+SHA1 (xpdf-1.00.tar.gz) = 01aae7c29a916b809bc5fc29f279b97cf4b56169
+Size (xpdf-1.00.tar.gz) = 397750 bytes
+SHA1 (patch-aa) = 2b1a36ce71afb4c7ad2a84ac70f46fe5ffea3687
diff --git a/print/xpdf/patches/patch-aa b/print/xpdf/patches/patch-aa
index 68f02af94a0..1366e3e9ca4 100644
--- a/print/xpdf/patches/patch-aa
+++ b/print/xpdf/patches/patch-aa
@@ -1,26 +1,25 @@
-$NetBSD: patch-aa,v 1.2 2001/10/30 06:32:21 simonb Exp $
+$NetBSD: patch-aa,v 1.3 2002/02/03 05:28:51 mjl Exp $
 
-Avoid a toolchain bug on mipsel noted in NetBSD-1.4.2/pmax
-
---- xpdf/Makefile.in.orig	Sat Oct 27 03:52:54 2001
-+++ xpdf/Makefile.in	Tue Oct 30 17:23:05 2001
-@@ -20,6 +20,9 @@
- 
- CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @X_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @freetype_CFLAGS@ @freetype2_CFLAGS@ -DSYSTEM_XPDFRC=\"$(sysconfdir)/xpdfrc\"
+--- xpdf/Makefile.in.orig	Sat Feb  2 00:15:45 2002
++++ xpdf/Makefile.in	Sun Feb  3 06:15:00 2002
+@@ -21,6 +21,8 @@
  
-+CXXFLAGS_NOOPT!=	${ECHO} ${CXXFLAGS} | ${SED} 's/-O[0-9]*//g'
-+
-+
  LDFLAGS = @LDFLAGS@
  
++CXXFLAGS_NOOPT!= ${ECHO} ${CXXFLAGS} | ${SED} 's/-O[0-9]*//g'
++
  XLIBS = @Xpm_LIBS@ @t1_LIBS@ @freetype_LIBS@ @freetype2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@
-@@ -268,6 +271,9 @@
-  Link.h GfxState.h Function.h GfxFont.h FontEncoding.h FontFile.h \
-  Error.h config.h Params.h TextOutputDev.h OutputDev.h XOutputDev.h \
-  T1Font.h SFont.h TTFont.h XOutputFontInfo.h
+ 
+ OTHERLIBS = @LIBS@ @libpaper_LIBS@
+@@ -36,6 +38,11 @@
+ 
+ .cc.o:
+ 	$(CXX) $(CXXFLAGS) -c $<
++
 +.if (${MACHINE_ARCH} == "mipsel")
++XOutputDev.o:	XOutputDev.cc
 +	${CXX}  ${CXXFLAGS_NOOPT} -c XOutputDev.cc
 +.endif
- XRef.o: ./XRef.cc ../goo/gmem.h Object.h ../goo/gtypes.h \
-  ../goo/GString.h Array.h Dict.h Stream.h Lexer.h Parser.h Decrypt.h \
-  Error.h config.h XRef.h
+ 
+ #------------------------------------------------------------------------
+