Update xpdf to 0.90

- - use t1lib for superior rendering of type1 fonts
- - various improvements to gui: smoother paging, resizing;
    add a couple more widgets to aid paging through large docs

6 files changed, 18 insertions, 59 deletions

diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 9366a30eec3..f9829cedb5b 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,27 +1,29 @@
-# $NetBSD: Makefile,v 1.7 1999/08/01 09:38:38 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1999/09/24 01:30:20 fredb Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
 # 
 
-DISTNAME=	xpdf-0.80
+DISTNAME=	xpdf-0.90
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	tsarna@netbsd.org
+MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 
-DEPENDS=	xpm-3.4k:../../graphics/xpm
+DEPENDS+=	t1lib-0.9.2:../../textproc/t1lib
+DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gzip --with-Xpm-includes=${X11BASE}/include
 USE_X11BASE=	yes
 
 MAN1=		xpdf.1 pdftops.1 pdftotext.1 pdfinfo.1 pdftopbm.1 pdfimages.1
 
 post-install:
-	@(cd ${WRKSRC}/doc; for m in ${MAN1}; \
-	do nroff -man $$m > $${m%.1}.0; done; \
-	${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1; \
-	${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1)
+	@cd ${WRKSRC}/doc; \
+	  for m in ${MAN1}; do \
+	    nroff -Tascii -mandoc $$m > $${m%.1}.0; \
+	  done; \
+	  ${ECHO} ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1; \
+	  ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpdf/files/md5 b/graphics/xpdf/files/md5
index 24009952bd2..0d20fbbc622 100644
--- a/graphics/xpdf/files/md5
+++ b/graphics/xpdf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/12/20 23:05:19 frueauf Exp $
+$NetBSD: md5,v 1.4 1999/09/24 01:30:20 fredb Exp $
 
-MD5 (xpdf-0.80.tgz) = 91d49cfaf1e555a26a9bcd0b57e51f8a
+MD5 (xpdf-0.90.tgz) = a7678b64713a466279b61c28ba01134b
diff --git a/graphics/xpdf/files/patch-sum b/graphics/xpdf/files/patch-sum
deleted file mode 100644
index 0ab814986bf..00000000000
--- a/graphics/xpdf/files/patch-sum
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: patch-sum,v 1.3 1999/08/01 09:39:17 frueauf Exp $
-
-MD5 (patch-aa) = f0a06ec0b128104a68a30b76ec037caa
-MD5 (patch-ab) = 8dc9cfcb1d9fea60160996259d9f1a78
diff --git a/graphics/xpdf/patches/patch-aa b/graphics/xpdf/patches/patch-aa
deleted file mode 100644
index acade7e6b63..00000000000
--- a/graphics/xpdf/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1998/12/20 23:05:19 frueauf Exp $
-
---- Makefile.in.orig	Sat Nov 28 04:40:52 1998
-+++ Makefile.in	Sun Dec 20 23:45:40 1998
-@@ -36,20 +36,12 @@
- dummy:
- 
- install:
--	mkdir -p @bindir@
- 	$(INSTALL) xpdf/xpdf$(EXE) @bindir@/xpdf$(EXE)
- 	$(INSTALL) xpdf/pdftops$(EXE) @bindir@/pdftops$(EXE)
- 	$(INSTALL) xpdf/pdftotext$(EXE) @bindir@/pdftotext$(EXE)
- 	$(INSTALL) xpdf/pdfinfo$(EXE) @bindir@/pdfinfo$(EXE)
- 	$(INSTALL) xpdf/pdftopbm$(EXE) @bindir@/pdftopbm$(EXE)
- 	$(INSTALL) xpdf/pdfimages$(EXE) @bindir@/pdfimages$(EXE)
--	mkdir -p @mandir@/man1
--	$(INSTALL_DATA) $(srcdir)/doc/xpdf.1 @mandir@/man1/xpdf.1
--	$(INSTALL_DATA) $(srcdir)/doc/pdftops.1 @mandir@/man1/pdftops.1
--	$(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 @mandir@/man1/pdftotext.1
--	$(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 @mandir@/man1/pdfinfo.1
--	$(INSTALL_DATA) $(srcdir)/doc/pdftopbm.1 @mandir@/man1/pdftopbm.1
--	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 @mandir@/man1/pdfimages.1
- 
- clean:
- 	-cd goo; $(MAKE) clean
diff --git a/graphics/xpdf/patches/patch-ab b/graphics/xpdf/patches/patch-ab
deleted file mode 100644
index 4e28db8ddb0..00000000000
--- a/graphics/xpdf/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/08/01 09:38:39 frueauf Exp $
-
---- configure-orig	Sun Aug  1 09:56:37 1999
-+++ configure	Sun Aug  1 09:57:31 1999
-@@ -1453,7 +1453,7 @@
- 
-   # It would also be nice to do this for all -L options, not just this one.
-   if test -n "$x_libraries"; then
--    X_LIBS="$X_LIBS -L$x_libraries"
-+    X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
-     case "`(uname -sr) 2>/dev/null`" in
diff --git a/graphics/xpdf/pkg/DESCR b/graphics/xpdf/pkg/DESCR
index da1e48e4d94..9dcff288b26 100644
--- a/graphics/xpdf/pkg/DESCR
+++ b/graphics/xpdf/pkg/DESCR
@@ -1,7 +1,6 @@
-Xpdf is a viewer for Portable Document Format (PDF) files.  (These are
-also sometimes also called 'Acrobat' files, from the name of Adobe's
-PDF software.)  Xpdf runs under UNIX and the X Window System.
+Xpdf is a viewer for Portable Document Format (PDF) files. 
 
-Xpdf is designed to be small and efficient.  It does not use the Motif
-or Xt libraries.  It uses standard X fonts.  Xpdf is quite usable on a
-486-66 PC running FreeBSD.
+Xpdf is designed to be small and efficient. It runs under X, 
+but does not use the Motif or Xt libraries. Use of the T1 library 
+provides superior rendering of type 1 fonts, and also permits 
+run-time configuration of the exact fonts to be used.