Update xpdf to 0.91. A list of some of the more significant changes since

0.90 follows. A full ChangeLog is viewable online at

http://www.foolabs.com/xpdf/CHANGES

0.91 (2000-aug-14)
------------------
Added TrueType font rendering, using FreeType.
Support for Chinese fonts (Type 0 fonts using the Adobe-GB1-2
  character collection).
Decryption code is included with the main distribution (now that the
  US export regulations are a little bit less irrational).
Added (very basic) support for generating PostScript with Japanese
  fonts -- only tested with ghostscript so far.
Added support for generating EPS files (pdftops -eps).
Much-improved image filtering in xpdf (for downsampling and for
  transforms other than 0/90/180/270-degree rotations).
Implemented a basic full-screen (presentation) mode (xpdf
  -fullscreen).  (There is currently no way to switch between window
  and full-screen modes on the fly -- this will be fixed in a later
  release.)

5 files changed, 49 insertions, 52 deletions

diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 4e7760e516f..c75b8d56116 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,8 +1,37 @@
-# $NetBSD: Makefile,v 1.12 1999/10/25 01:36:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2000/08/21 06:49:13 fredb Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
 # 
 
+DISTNAME=	xpdf-0.91
+CATEGORIES=	graphics print
+MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
+EXTRACT_SUFX=	.tgz
+
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 
-.include "Makefile.common"
+DEPENDS+=	freetype-1.3.1:../../graphics/freetype
+DEPENDS+=	ghostscript-fonts-*:../../print/ghostscript-fonts
+DEPENDS+=	t1lib-1.0.1:../../textproc/t1lib
+DEPENDS+=	xpm-3.4k:../../graphics/xpm
+
+CONFLICTS=	xpdf-crypto-*
+
+USE_X11BASE=	yes
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=--enable-japanese --enable-chinese
+CONFIGURE_ARGS+=--with-freetype-includes=${LOCALBASE}/include
+
+post-install:
+	${SED} 's|@@LOCALBASE@@|${LOCALBASE}|' \
+		< ${FILESDIR}/xpdf-app-defaults \
+		> ${X11BASE}/lib/X11/app-defaults/Xpdf
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
+CONFIGURE_ARGS+= --enable-a4-paper
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpdf/Makefile.common b/graphics/xpdf/Makefile.common
deleted file mode 100644
index c6fa1b4bca8..00000000000
--- a/graphics/xpdf/Makefile.common
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2000/05/09 16:12:42 tron Exp $
-# FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
-# 
-
-#
-# Common Makefile for xpdf and xpdf-crypto pkgs
-#
-
-VERS=		0.90
-DISTNAME=	xpdf-${VERS}
-CATEGORIES=	graphics print
-MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
-EXTRACT_SUFX=	.tgz
-
-DEPENDS+=	t1lib>=1.0:../../textproc/t1lib
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-japanese
-
-MAN1=		xpdf.1 pdftops.1 pdftotext.1 pdfinfo.1 pdftopbm.1 pdfimages.1
-
-post-install:
-	@cd ${WRKSRC}/doc; \
-	case ${OPSYS} in						\
-	SunOS)	mancmd="gnroff -Tascii -mandoc" ;;			\
-	*)	mancmd="nroff -Tascii -mandoc" ;;			\
-	esac;								\
-	for m in ${MAN1}; do						\
-		$$mancmd $$m > `${ECHO} "$$m" | ${SED} -e 's|\.1|\.0|g'`; \
-	done;								\
-	${ECHO} ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1;	\
-	${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1
-
-.include "../../mk/bsd.prefs.mk"
-.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
-CONFIGURE_ARGS+= --enable-a4-paper
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpdf/files/md5 b/graphics/xpdf/files/md5
index 0d20fbbc622..620cf39fe99 100644
--- a/graphics/xpdf/files/md5
+++ b/graphics/xpdf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/09/24 01:30:20 fredb Exp $
+$NetBSD: md5,v 1.5 2000/08/21 06:49:16 fredb Exp $
 
-MD5 (xpdf-0.90.tgz) = a7678b64713a466279b61c28ba01134b
+MD5 (xpdf-0.91.tgz) = dd675fe691ba7341f2f581e67d724bcb
diff --git a/graphics/xpdf/files/xpdf-app-defaults b/graphics/xpdf/files/xpdf-app-defaults
new file mode 100644
index 00000000000..01f401951f0
--- /dev/null
+++ b/graphics/xpdf/files/xpdf-app-defaults
@@ -0,0 +1,14 @@
+xpdf.t1TimesRoman:           @@LOCALBASE@@/share/ghostscript/fonts/n021003l.pfb
+xpdf.t1TimesItalic:          @@LOCALBASE@@/share/ghostscript/fonts/n021023l.pfb
+xpdf.t1TimesBold:            @@LOCALBASE@@/share/ghostscript/fonts/n021004l.pfb
+xpdf.t1TimesBoldItalic:      @@LOCALBASE@@/share/ghostscript/fonts/n021024l.pfb
+xpdf.t1Helvetica:            @@LOCALBASE@@/share/ghostscript/fonts/n019003l.pfb
+xpdf.t1HelveticaOblique:     @@LOCALBASE@@/share/ghostscript/fonts/n019023l.pfb
+xpdf.t1HelveticaBold:        @@LOCALBASE@@/share/ghostscript/fonts/n019004l.pfb
+xpdf.t1HelveticaBoldOblique: @@LOCALBASE@@/share/ghostscript/fonts/n019024l.pfb
+xpdf.t1Courier:              @@LOCALBASE@@/share/ghostscript/fonts/n022003l.pfb
+xpdf.t1CourierOblique:       @@LOCALBASE@@/share/ghostscript/fonts/n022023l.pfb
+xpdf.t1CourierBold:          @@LOCALBASE@@/share/ghostscript/fonts/n022004l.pfb
+xpdf.t1CourierBoldOblique:   @@LOCALBASE@@/share/ghostscript/fonts/n022024l.pfb
+xpdf.t1Symbol:               @@LOCALBASE@@/share/ghostscript/fonts/s050000l.pfb
+xpdf.t1ZapfDingbats:         @@LOCALBASE@@/share/ghostscript/fonts/d050000l.pfb
diff --git a/graphics/xpdf/pkg/PLIST b/graphics/xpdf/pkg/PLIST
index aade533b450..86105a95026 100644
--- a/graphics/xpdf/pkg/PLIST
+++ b/graphics/xpdf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/12/20 23:05:20 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/08/21 06:49:17 fredb Exp $
 bin/xpdf
 bin/pdftops
 bin/pdftotext
@@ -11,9 +11,4 @@ man/man1/pdftotext.1
 man/man1/pdfinfo.1
 man/man1/pdftopbm.1
 man/man1/pdfimages.1
-man/cat1/xpdf.0
-man/cat1/pdftops.0
-man/cat1/pdftotext.0
-man/cat1/pdfinfo.0
-man/cat1/pdftopbm.0
-man/cat1/pdfimages.0
+lib/X11/app-defaults/Xpdf