Update xpdf to 0.80.

There are several bugfixes and feature additions since 0.7a, to
much to quote from the CHANGES file.

5 files changed, 52 insertions, 15 deletions

diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 845a70e7d5d..8a04e565c36 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,27 +1,30 @@
+# $NetBSD: Makefile,v 1.4 1998/12/20 23:05:19 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:17:03 tsarna Exp $
 # 
 
-DISTNAME=       xpdf-0.7a
+DISTNAME=	xpdf-0.80
 CATEGORIES=	graphics print
-MASTER_SITES=	ftp://ftp.aimnet.com/pub/users/derekn/xpdf/
+MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@netbsd.org
-HOMEPAGE=	http://www.aimnet.com/~derekn/xpdf/
+HOMEPAGE=	http://www.foolabs.com/xpdf/
 
 DEPENDS=	xpm-3.4k:../../graphics/xpm
 
+CONFLICTS=	xpdf-0.7a
+
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
 CONFIGURE_ARGS=	--with-gzip
-#USE_X11=	yes
-
-MAN1=		xpdf.1 pdftops.1 pdftotext.1
+USE_X11=	yes
 
-post-build:
-	@(cd ${WRKSRC}; for m in ${MAN1} ; \
-	do nroff -man $$m > $${m%.1}.0; done);
+MAN1=		xpdf.1 pdftops.1 pdftotext.1 pdfinfo.1 pdftopbm.1 pdfimages.1
 
 post-install:
-	@(cd ${WRKSRC}; ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1)
+	@(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)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpdf/files/md5 b/graphics/xpdf/files/md5
index 01a4bee3b1e..24009952bd2 100644
--- a/graphics/xpdf/files/md5
+++ b/graphics/xpdf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:38 agc Exp $
+$NetBSD: md5,v 1.3 1998/12/20 23:05:19 frueauf Exp $
 
-MD5 (xpdf-0.7a.tar.gz) = 3b6ed5783d1f7c53a3983d404ec5c818
+MD5 (xpdf-0.80.tgz) = 91d49cfaf1e555a26a9bcd0b57e51f8a
diff --git a/graphics/xpdf/patches/patch-aa b/graphics/xpdf/patches/patch-aa
new file mode 100644
index 00000000000..acade7e6b63
--- /dev/null
+++ b/graphics/xpdf/patches/patch-aa
@@ -0,0 +1,25 @@
+$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/pkg/COMMENT b/graphics/xpdf/pkg/COMMENT
index 145bc09305d..bbae295bd81 100644
--- a/graphics/xpdf/pkg/COMMENT
+++ b/graphics/xpdf/pkg/COMMENT
@@ -1 +1 @@
-Display tool for PDF files
+Display tool for PDF files.
diff --git a/graphics/xpdf/pkg/PLIST b/graphics/xpdf/pkg/PLIST
index b74f5725b96..aade533b450 100644
--- a/graphics/xpdf/pkg/PLIST
+++ b/graphics/xpdf/pkg/PLIST
@@ -1,10 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 1998/08/07 20:14:22 tsarna Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/12/20 23:05:20 frueauf Exp $
 bin/xpdf
 bin/pdftops
 bin/pdftotext
+bin/pdfinfo
+bin/pdftopbm
+bin/pdfimages
 man/man1/xpdf.1
 man/man1/pdftops.1
 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