>Number:         6575
>Category:       pkg
>Synopsis:       Patches attached to upgrade xpdf package to xpdf-0.80
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnats-admin (GNATS administrator)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Dec 13 10:20:01 1998
>Last-Modified:
>Originator:     Frederick Bruckman
>Organization:

>Release:        Dec 13, 1998
>Environment:
	
System: NetBSD fb.sa.enteract.com 1.3I NetBSD 1.3I (FB) #174: 
Wed Dec 9 10:18:25 CST 1998 
fredb@fb.sa.enteract.com:/usr/src/sys/arch/mac68k/compile/FB mac68k


>Description:
	Haven't tested extensively, but it builds on mac68k, and views
	at least one graphics-laden pdf file that caused 7a to dump core.

	Updated home page and ftp site; moved all man page handling into
	the package makefile. Also, made a change to CONFIGURE_ENV so
	that configure would find xpm.h. Uncommented USE_X11, to
	parallel "gv", at least. If anyone has strong reasons for
	installing xpdf into LOCALBASE, I have no objections. It really 
	doesn't matter to me!

>How-To-Repeat:
	Patch to the existing pkgsrc appended. Applies cleanly only if
	xpf/patches already exists. 
>Fix:
--- /usr/pkgsrc/graphics/xpdf/files/md5.orig	Sat Aug  8 06:30:35 1998
+++ /usr/pkgsrc/graphics/xpdf/files/md5	Sun Dec 13 09:10:54 1998
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:38 agc Exp $
+$NetBSD$
 
-MD5 (xpdf-0.7a.tar.gz) = 3b6ed5783d1f7c53a3983d404ec5c818
+MD5 (xpdf-0.80.tgz) = 91d49cfaf1e555a26a9bcd0b57e51f8a
--- /usr/pkgsrc/graphics/xpdf/pkg/PLIST.orig	Sat Aug  8 06:30:35 1998
+++ /usr/pkgsrc/graphics/xpdf/pkg/PLIST	Sun Dec 13 09:13:34 1998
@@ -2,9 +2,18 @@
 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
--- /usr/pkgsrc/graphics/xpdf/patches/patch-aa.orig	Fri Aug 21 06:20:04 1998
+++ /usr/pkgsrc/graphics/xpdf/patches/patch-aa	Sun Dec 13 09:10:54 1998
@@ -0,0 +1,25 @@
+--- Makefile.in.orig	Fri Nov 27 21:40:52 1998
++++ Makefile.in	Sun Dec 13 08:24:39 1998
+@@ -35,22 +35,14 @@
+ 
+ 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
+ 	-cd ltk; $(MAKE) clean
--- /usr/pkgsrc/graphics/xpdf/Makefile.orig	Fri Aug 21 06:20:04 1998
+++ /usr/pkgsrc/graphics/xpdf/Makefile	Sun Dec 13 09:10:54 1998
@@ -2,26 +2,29 @@
 # $NetBSD: Makefile,v 1.3 1998/08/20 15:17:03 tsarna Exp $
 # 
 
-DISTNAME=       xpdf-0.7a
+DISTNAME=       xpdf-0.80
+EXTRACT_SUFX=	.tgz
 CATEGORIES=	graphics print
-MASTER_SITES=	ftp://ftp.aimnet.com/pub/users/derekn/xpdf/
+MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
 MAINTAINER=	tsarna@netbsd.org
-HOMEPAGE=	http://www.aimnet.com/~derekn/xpdf/
+HOMEPAGE=	http://www.foolabs.com/xpdf/
 
 DEPENDS=	xpm-3.4k:../../graphics/xpm
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
 CONFIGURE_ARGS=	--with-gzip
-#USE_X11=	yes
+USE_X11=	yes
 
-MAN1=		xpdf.1 pdftops.1 pdftotext.1
-
-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)
+.if !defined(NOPORTDOCS) && !defined(NOMANINSTALL)
+	@(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)
+.endif
 
 .include "../../mk/bsd.pkg.mk"
>Audit-Trail:
>Unformatted: