diff options
Diffstat (limited to 'print/xpdf')
| -rw-r--r-- | print/xpdf/Makefile | 22 | ||||
| -rw-r--r-- | print/xpdf/PLIST | 4 | ||||
| -rw-r--r-- | print/xpdf/distinfo | 17 | ||||
| -rw-r--r-- | print/xpdf/patches/patch-ac | 13 | ||||
| -rw-r--r-- | print/xpdf/patches/patch-ad | 13 | ||||
| -rw-r--r-- | print/xpdf/patches/patch-ae | 13 | ||||
| -rw-r--r-- | print/xpdf/patches/patch-af | 13 | ||||
| -rw-r--r-- | print/xpdf/patches/patch-ag | 13 | ||||
| -rw-r--r-- | print/xpdf/patches/patch-ah | 13 | ||||
| -rw-r--r-- | print/xpdf/patches/patch-ai | 57 | ||||
| -rw-r--r-- | print/xpdf/patches/patch-aj | 13 | ||||
| -rw-r--r-- | print/xpdf/patches/patch-ak | 83 |
12 files changed, 260 insertions, 14 deletions
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index 721b7fe829d..b5d625fa3e3 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,16 +1,11 @@ -# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:03 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2003/03/25 14:02:37 salo Exp $ # -DISTNAME= xpdf-2.01 -PKGREVISION= 2 +DISTNAME= xpdf-2.02 CATEGORIES= print MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/} -PATCH_SITES= ftp://ftp.foolabs.com/pub/xpdf/ -PATCHFILES= xpdf-2.01-patch1 -PATCH_DIST_ARGS=-d ${WRKSRC}/xpdf - MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.foolabs.com/xpdf/ COMMENT= Display tool for PDF files @@ -21,7 +16,7 @@ CONFLICTS= xpdf-crypto-[0-9]* USE_BUILDLINK2= YES USE_PKGINSTALL= YES -USE_X11BASE= YES +USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -39,6 +34,17 @@ CONFIGURE_ARGS+= --enable-a4-paper EGDIR= ${PREFIX}/share/examples/xpdf CONF_FILES= ${EGDIR}/xpdfrc ${PKG_SYSCONFDIR}/xpdfrc +post-patch: + @cd ${WRKSRC}/doc && \ + for f in *.1 *.5; do \ + ${MV} $${f} $${f}.orig; \ + ${SED} ${FILES_SUBST_SED} $${f}.orig > $${f}; \ + done + +# Used by supplemental packages. +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf + .include "../../fonts/t1lib/buildlink2.mk" .include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" diff --git a/print/xpdf/PLIST b/print/xpdf/PLIST index 338199a605a..723e0160ca6 100644 --- a/print/xpdf/PLIST +++ b/print/xpdf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/09/19 01:45:42 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/03/25 14:02:38 salo Exp $ bin/pdffonts bin/pdfimages bin/pdfinfo @@ -15,4 +15,6 @@ man/man1/pdftotext.1 man/man1/xpdf.1 man/man5/xpdfrc.5 share/examples/xpdf/xpdfrc +@exec ${MKDIR} %D/share/xpdf +@dirrm share/xpdf @dirrm share/examples/xpdf diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo index 9df7c99aaaa..8c83c582562 100644 --- a/print/xpdf/distinfo +++ b/print/xpdf/distinfo @@ -1,8 +1,15 @@ -$NetBSD: distinfo,v 1.10 2002/12/31 02:31:54 uebayasi Exp $ +$NetBSD: distinfo,v 1.11 2003/03/25 14:02:38 salo Exp $ -SHA1 (xpdf-2.01.tar.gz) = 9c5633b937496bad9ef14031713e6c45b68b066c -Size (xpdf-2.01.tar.gz) = 465004 bytes -SHA1 (xpdf-2.01-patch1) = 031ceb5595ce5f07bc4c6081e46214ef0aea5a9d -Size (xpdf-2.01-patch1) = 1038 bytes +SHA1 (xpdf-2.02.tar.gz) = 482b6a33addc50fd1ec73f676b4db74a17d4dd75 +Size (xpdf-2.02.tar.gz) = 476001 bytes SHA1 (patch-aa) = bf57c8955a25fc723fdcc86acc2055876c39a686 SHA1 (patch-ab) = e0e7bca53918c125db5dcece7153afbec6e089ce +SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2 +SHA1 (patch-ad) = 303dbde0636e79601745808c514c77c31ef3d1b5 +SHA1 (patch-ae) = fbce5c68be50431e2b0a375be12a8b03fbf58427 +SHA1 (patch-af) = 156953b1e743cfd681a1f2cee2d68da576a40e7f +SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac +SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a +SHA1 (patch-ai) = baa4308f9c44c750f54868dc3e355588dfd0dac8 +SHA1 (patch-aj) = 428b2da89b1775afbd2752ec105adad966babdf9 +SHA1 (patch-ak) = 374b7f6086bded7f90b28c04b9d9ca92d3ecafbc diff --git a/print/xpdf/patches/patch-ac b/print/xpdf/patches/patch-ac new file mode 100644 index 00000000000..9e996919aa6 --- /dev/null +++ b/print/xpdf/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.3 2003/03/25 14:02:39 salo Exp $ + +--- doc/pdffonts.1.orig 2003-03-21 08:01:01.000000000 +0100 ++++ doc/pdffonts.1 2003-03-25 12:40:07.000000000 +0100 +@@ -62,7 +62,7 @@ + Pdffonts reads a configuration file at startup. It first tries to + find the user's private config file, ~/.xpdfrc. If that doesn't + exist, it looks for a system-wide config file, typically +-/usr/local/etc/xpdfrc (but this location can be changed when pdffonts ++@PKG_SYSCONFDIR@/xpdfrc (but this location can be changed when pdffonts + is built). See the + .BR xpdfrc (5) + man page for details. diff --git a/print/xpdf/patches/patch-ad b/print/xpdf/patches/patch-ad new file mode 100644 index 00000000000..2d105ce7d61 --- /dev/null +++ b/print/xpdf/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.3 2003/03/25 14:02:40 salo Exp $ + +--- doc/pdfimages.1.orig 2003-03-21 08:01:01.000000000 +0100 ++++ doc/pdfimages.1 2003-03-25 12:40:49.000000000 +0100 +@@ -25,7 +25,7 @@ + Pdfimages reads a configuration file at startup. It first tries to + find the user's private config file, ~/.xpdfrc. If that doesn't + exist, it looks for a system-wide config file, typically +-/usr/local/etc/xpdfrc (but this location can be changed when pdfimages ++@PKG_SYSCONFDIR@/xpdfrc (but this location can be changed when pdfimages + is built). See the + .BR xpdfrc (5) + man page for details. diff --git a/print/xpdf/patches/patch-ae b/print/xpdf/patches/patch-ae new file mode 100644 index 00000000000..f2739d54403 --- /dev/null +++ b/print/xpdf/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2003/03/25 14:02:40 salo Exp $ + +--- doc/pdfinfo.1.orig 2003-03-21 08:01:01.000000000 +0100 ++++ doc/pdfinfo.1 2003-03-25 12:39:27.000000000 +0100 +@@ -56,7 +56,7 @@ + .SH CONFIGURATION FILE + Pdfinfo reads a configuration file at startup. It first tries to find + the user's private config file, ~/.xpdfrc. If that doesn't exist, it +-looks for a system-wide config file, typically /usr/local/etc/xpdfrc ++looks for a system-wide config file, typically @PKG_SYSCONFDIR@/xpdfrc + (but this location can be changed when pdfinfo is built). See the + .BR xpdfrc (5) + man page for details. diff --git a/print/xpdf/patches/patch-af b/print/xpdf/patches/patch-af new file mode 100644 index 00000000000..2f5c9ce2fab --- /dev/null +++ b/print/xpdf/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2003/03/25 14:02:41 salo Exp $ + +--- doc/pdftopbm.1.orig 2003-03-21 08:01:01.000000000 +0100 ++++ doc/pdftopbm.1 2003-03-25 12:41:27.000000000 +0100 +@@ -23,7 +23,7 @@ + Pdftopbm reads a configuration file at startup. It first tries to + find the user's private config file, ~/.xpdfrc. If that doesn't + exist, it looks for a system-wide config file, typically +-/usr/local/etc/xpdfrc (but this location can be changed when pdftopbm ++@PKG_SYSCONFDIR@/xpdfrc (but this location can be changed when pdftopbm + is built). See the + .BR xpdfrc (5) + man page for details. diff --git a/print/xpdf/patches/patch-ag b/print/xpdf/patches/patch-ag new file mode 100644 index 00000000000..36fc8c3445e --- /dev/null +++ b/print/xpdf/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2003/03/25 14:02:41 salo Exp $ + +--- doc/pdftops.1.orig 2003-03-25 12:41:58.000000000 +0100 ++++ doc/pdftops.1 2003-03-25 12:42:20.000000000 +0100 +@@ -31,7 +31,7 @@ + .SH CONFIGURATION FILE + Pdftops reads a configuration file at startup. It first tries to find + the user's private config file, ~/.xpdfrc. If that doesn't exist, it +-looks for a system-wide config file, typically /usr/local/etc/xpdfrc ++looks for a system-wide config file, typically @PKG_SYSCONFDIR@/xpdfrc + (but this location can be changed when pdftops is built). See the + .BR xpdfrc (5) + man page for details. diff --git a/print/xpdf/patches/patch-ah b/print/xpdf/patches/patch-ah new file mode 100644 index 00000000000..86b47f1a2fe --- /dev/null +++ b/print/xpdf/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2003/03/25 14:02:42 salo Exp $ + +--- doc/pdftotext.1.orig 2003-03-21 08:01:01.000000000 +0100 ++++ doc/pdftotext.1 2003-03-25 12:43:07.000000000 +0100 +@@ -29,7 +29,7 @@ + Pdftotext reads a configuration file at startup. It first tries to + find the user's private config file, ~/.xpdfrc. If that doesn't + exist, it looks for a system-wide config file, typically +-/usr/local/etc/xpdfrc (but this location can be changed when pdftotext ++@PKG_SYSCONFDIR@/xpdfrc (but this location can be changed when pdftotext + is built). See the + .BR xpdfrc (5) + man page for details. diff --git a/print/xpdf/patches/patch-ai b/print/xpdf/patches/patch-ai new file mode 100644 index 00000000000..9e1cea0cc2a --- /dev/null +++ b/print/xpdf/patches/patch-ai @@ -0,0 +1,57 @@ +$NetBSD: patch-ai,v 1.1 2003/03/25 14:02:42 salo Exp $ + +--- doc/sample-xpdfrc.orig 2003-03-21 08:01:01.000000000 +0100 ++++ doc/sample-xpdfrc 2003-03-25 12:45:39.000000000 +0100 +@@ -4,7 +4,7 @@ + # + # The Xpdf tools look for a config file in two places: + # 1. ~/.xpdfrc +-# 2. in a system-wide directory, typically /usr/local/etc/xpdfrc ++# 2. in a system-wide directory, typically @PKG_SYSCONFDIR@/xpdfrc + # + # This sample config file demonstrates some of the more common + # configuration options. Everything here is commented out. You +@@ -46,20 +46,20 @@ + # this, but you'll need to adjust this to point to wherever + # ghostscript is installed on your system. + +-#displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb +-#displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb +-#displayFontT1 Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb +-#displayFontT1 Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb +-#displayFontT1 Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb +-#displayFontT1 Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb +-#displayFontT1 Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb +-#displayFontT1 Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb +-#displayFontT1 Courier /usr/local/share/ghostscript/fonts/n022003l.pfb +-#displayFontT1 Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb +-#displayFontT1 Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb +-#displayFontT1 Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb +-#displayFontT1 Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb +-#displayFontT1 ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb ++#displayFontT1 Times-Roman @PREFIX@/share/ghostscript/fonts/n021003l.pfb ++#displayFontT1 Times-Italic @PREFIX@/share/ghostscript/fonts/n021023l.pfb ++#displayFontT1 Times-Bold @PREFIX@/share/ghostscript/fonts/n021004l.pfb ++#displayFontT1 Times-BoldItalic @PREFIX@/share/ghostscript/fonts/n021024l.pfb ++#displayFontT1 Helvetica @PREFIX@/share/ghostscript/fonts/n019003l.pfb ++#displayFontT1 Helvetica-Oblique @PREFIX@/share/ghostscript/fonts/n019023l.pfb ++#displayFontT1 Helvetica-Bold @PREFIX@/share/ghostscript/fonts/n019004l.pfb ++#displayFontT1 Helvetica-BoldOblique @PREFIX@/share/ghostscript/fonts/n019024l.pfb ++#displayFontT1 Courier @PREFIX@/share/ghostscript/fonts/n022003l.pfb ++#displayFontT1 Courier-Oblique @PREFIX@/share/ghostscript/fonts/n022023l.pfb ++#displayFontT1 Courier-Bold @PREFIX@/share/ghostscript/fonts/n022004l.pfb ++#displayFontT1 Courier-BoldOblique @PREFIX@/share/ghostscript/fonts/n022024l.pfb ++#displayFontT1 Symbol @PREFIX@/share/ghostscript/fonts/s050000l.pfb ++#displayFontT1 ZapfDingbats @PREFIX@/share/ghostscript/fonts/d050000l.pfb + + # If you need to display PDF files that refer to non-embedded fonts, + # you should add one or more fontDir options to point to the +@@ -67,7 +67,7 @@ + # .pfb, and .ttf files in those directories (other files will simply + # be ignored). + +-#fontDir /usr/local/fonts/bakoma ++#fontDir @PREFIX@/share/tex-contrib/BaKoMa + + #----- PostScript output control + diff --git a/print/xpdf/patches/patch-aj b/print/xpdf/patches/patch-aj new file mode 100644 index 00000000000..3583afd5cb8 --- /dev/null +++ b/print/xpdf/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2003/03/25 14:02:43 salo Exp $ + +--- doc/xpdf.1.orig 2003-03-21 08:01:01.000000000 +0100 ++++ doc/xpdf.1 2003-03-25 12:33:20.000000000 +0100 +@@ -40,7 +40,7 @@ + .SH CONFIGURATION FILE + Xpdf reads a configuration file at startup. It first tries to find + the user's private config file, ~/.xpdfrc. If that doesn't exist, it +-looks for a system-wide config file, typically /usr/local/etc/xpdfrc ++looks for a system-wide config file, typically @PKG_SYSCONFDIR@/xpdfrc + (but this location can be changed when xpdf is built). See the + .BR xpdfrc (5) + man page for details. diff --git a/print/xpdf/patches/patch-ak b/print/xpdf/patches/patch-ak new file mode 100644 index 00000000000..958d2a4ef71 --- /dev/null +++ b/print/xpdf/patches/patch-ak @@ -0,0 +1,83 @@ +$NetBSD: patch-ak,v 1.1 2003/03/25 14:02:44 salo Exp $ + +--- doc/xpdfrc.5.orig 2003-03-21 08:01:01.000000000 +0100 ++++ doc/xpdfrc.5 2003-03-25 12:38:38.000000000 +0100 +@@ -7,7 +7,7 @@ + .I .xpdfrc + file in your home directory, it will be read. Otherwise, a + system-wide configuration file will be read from +-.IR /usr/local/etc/xpdfrc , ++.IR @PKG_SYSCONFDIR@/xpdfrc , + if it exists. (This is its default location; depending on build + options, it may be placed elsewhere.) On Win32 systems, the + .I xpdfrc +@@ -390,12 +390,12 @@ + .nf + + # from the Thai support package +-nameToUnicode /usr/local/share/xpdf/Thai.nameToUnicode ++nameToUnicode @PREFIX@/share/xpdf/Thai.nameToUnicode + + # from the Japanese support package +-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode +-unicodeMap JISX0208 /usr/local/share/xpdf/JISX0208.unicodeMap +-cMapDir Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1 ++cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/Adobe-Japan1.cidToUnicode ++unicodeMap JISX0208 @PREFIX@/share/xpdf/JISX0208.unicodeMap ++cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/cmap/Adobe-Japan1 + + # use an X server font for Times-Roman + # (this is the built-in default) +@@ -403,27 +403,27 @@ + + # use the Base-14 Type 1 fonts from ghostscript + # (note that this overrides the displayFontX command above) +-displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb +-displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb +-displayFontT1 Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb +-displayFontT1 Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb +-displayFontT1 Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb +-displayFontT1 Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb +-displayFontT1 Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb +-displayFontT1 Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb +-displayFontT1 Courier /usr/local/share/ghostscript/fonts/n022003l.pfb +-displayFontT1 Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb +-displayFontT1 Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb +-displayFontT1 Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb +-displayFontT1 Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb +-displayFontT1 ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb ++displayFontT1 Times-Roman @PREFIX@/share/ghostscript/fonts/n021003l.pfb ++displayFontT1 Times-Italic @PREFIX@/share/ghostscript/fonts/n021023l.pfb ++displayFontT1 Times-Bold @PREFIX@/share/ghostscript/fonts/n021004l.pfb ++displayFontT1 Times-BoldItalic @PREFIX@/share/ghostscript/fonts/n021024l.pfb ++displayFontT1 Helvetica @PREFIX@/share/ghostscript/fonts/n019003l.pfb ++displayFontT1 Helvetica-Oblique @PREFIX@/share/ghostscript/fonts/n019023l.pfb ++displayFontT1 Helvetica-Bold @PREFIX@/share/ghostscript/fonts/n019004l.pfb ++displayFontT1 Helvetica-BoldOblique @PREFIX@/share/ghostscript/fonts/n019024l.pfb ++displayFontT1 Courier @PREFIX@/share/ghostscript/fonts/n022003l.pfb ++displayFontT1 Courier-Oblique @PREFIX@/share/ghostscript/fonts/n022023l.pfb ++displayFontT1 Courier-Bold @PREFIX@/share/ghostscript/fonts/n022004l.pfb ++displayFontT1 Courier-BoldOblique @PREFIX@/share/ghostscript/fonts/n022024l.pfb ++displayFontT1 Symbol @PREFIX@/share/ghostscript/fonts/s050000l.pfb ++displayFontT1 ZapfDingbats @PREFIX@/share/ghostscript/fonts/d050000l.pfb + + # from the Japanese support package + displayCIDFontX Adobe-Japan1 "-*-fixed-medium-r-normal-*-%s-*-*-*-*-*-jisx0208.1983-0" JISX0208 + + # use the Bakoma Type 1 fonts +-# (this assumes they happen to be installed in /usr/local/fonts/bakoma) +-fontDir /usr/local/fonts/bakoma ++# (this assumes they happen to be installed in @PREFIX@/share/tex-contrib/BaKoMa) ++fontDir @PREFIX@/share/tex-contrib/BaKoMa + + # set some PostScript options + psPaperSize letter +@@ -450,7 +450,7 @@ + .fi + .SH FILES + .TP +-.B /usr/local/etc/xpdfrc ++.B @PKG_SYSCONFDIR@/xpdfrc + This is the default location for the system-wide configuration file. + Depending on build options, it may be placed elsewhere. + .TP |