summaryrefslogtreecommitdiff
path: root/print/xpdf
diff options
context:
space:
mode:
authorspz <spz>2010-06-13 08:56:04 +0000
committerspz <spz>2010-06-13 08:56:04 +0000
commit9fc1f2354b4bae7ec4a25355c9698d73e103e32f (patch)
tree84185c7c38c44bf60f4d9dfbcca61313dd423c11 /print/xpdf
parenta9b0f60cec502e274093a4a6fe4d4ffb0b258f53 (diff)
downloadpkgsrc-9fc1f2354b4bae7ec4a25355c9698d73e103e32f.tar.gz
the fonts that xpdf uses used to be in ghostscript-fonts, but nowadays
they are present in urw-fonts; fix dependencies and font search paths. Also add X11R7 to the font search paths.
Diffstat (limited to 'print/xpdf')
-rw-r--r--print/xpdf/Makefile6
-rw-r--r--print/xpdf/distinfo8
-rw-r--r--print/xpdf/patches/patch-ai30
-rw-r--r--print/xpdf/patches/patch-ak30
-rw-r--r--print/xpdf/patches/patch-al6
5 files changed, 41 insertions, 39 deletions
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 8cc12ae734a..e61685a91e9 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2009/11/15 22:31:51 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2010/06/13 08:56:04 spz Exp $
DISTNAME= xpdf-3.02
PKGNAME= xpdf-3.02pl4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \
@@ -20,7 +20,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
MAKE_JOBS_SAFE= no
-DEPENDS+= ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
+DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
CONFLICTS= xpdf-crypto-[0-9]*
diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo
index 8cb57705ba3..2a6b0960e81 100644
--- a/print/xpdf/distinfo
+++ b/print/xpdf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2009/11/13 23:12:02 christos Exp $
+$NetBSD: distinfo,v 1.37 2010/06/13 08:56:04 spz Exp $
SHA1 (xpdf-3.02.tar.gz) = f9940698840c8a8045677e8be68ab8580903e20a
RMD160 (xpdf-3.02.tar.gz) = e900cb8670b8c430beaa45895fb474411cb1958d
@@ -23,10 +23,10 @@ SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143
SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c
SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac
SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a
-SHA1 (patch-ai) = 041f0b7afbd46e109a6c38a5edef5bd38bb41034
+SHA1 (patch-ai) = 23bdf2b177b2f189be2bb5834c1d0bbb1e5d2b70
SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860
-SHA1 (patch-ak) = ed9506fd0cba7e350608cd40b1f794253f30e917
-SHA1 (patch-al) = b6e958b0592ac285b3ade90079c83da30db8a8b6
+SHA1 (patch-ak) = 63ce7def09a154f2f11fd9b639393bc6ef5a2038
+SHA1 (patch-al) = c79b5865432ea0519c2124e177a1dbf5b9c09024
SHA1 (patch-am) = 1b498307ce7ffaa7a4e7c6c754c2ce373390ddd8
SHA1 (patch-an) = 94ea208c43f4df1ac3a9bf01cc874d488ae49a9a
SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58
diff --git a/print/xpdf/patches/patch-ai b/print/xpdf/patches/patch-ai
index ec76e278323..f92b0ea3ea9 100644
--- a/print/xpdf/patches/patch-ai
+++ b/print/xpdf/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2005/09/07 15:19:08 adam Exp $
+$NetBSD: patch-ai,v 1.3 2010/06/13 08:56:04 spz Exp $
--- doc/sample-xpdfrc.orig 2005-08-17 05:34:30.000000000 +0000
+++ doc/sample-xpdfrc
@@ -29,20 +29,20 @@ $NetBSD: patch-ai,v 1.2 2005/09/07 15:19:08 adam Exp $
-#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
++#displayFontT1 Times-Roman @PREFIX@/share/fonts/urw/n021003l.pfb
++#displayFontT1 Times-Italic @PREFIX@/share/fonts/urw/n021023l.pfb
++#displayFontT1 Times-Bold @PREFIX@/share/fonts/urw/n021004l.pfb
++#displayFontT1 Times-BoldItalic @PREFIX@/share/fonts/urw/n021024l.pfb
++#displayFontT1 Helvetica @PREFIX@/share/fonts/urw/n019003l.pfb
++#displayFontT1 Helvetica-Oblique @PREFIX@/share/fonts/urw/n019023l.pfb
++#displayFontT1 Helvetica-Bold @PREFIX@/share/fonts/urw/n019004l.pfb
++#displayFontT1 Helvetica-BoldOblique @PREFIX@/share/fonts/urw/n019024l.pfb
++#displayFontT1 Courier @PREFIX@/share/fonts/urw/n022003l.pfb
++#displayFontT1 Courier-Oblique @PREFIX@/share/fonts/urw/n022023l.pfb
++#displayFontT1 Courier-Bold @PREFIX@/share/fonts/urw/n022004l.pfb
++#displayFontT1 Courier-BoldOblique @PREFIX@/share/fonts/urw/n022024l.pfb
++#displayFontT1 Symbol @PREFIX@/share/fonts/urw/s050000l.pfb
++#displayFontT1 ZapfDingbats @PREFIX@/share/fonts/urw/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
diff --git a/print/xpdf/patches/patch-ak b/print/xpdf/patches/patch-ak
index b71a8848b1c..19399f33d7a 100644
--- a/print/xpdf/patches/patch-ak
+++ b/print/xpdf/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.3 2005/09/07 15:19:08 adam Exp $
+$NetBSD: patch-ak,v 1.4 2010/06/13 08:56:04 spz Exp $
--- doc/xpdfrc.5.orig 2005-08-17 05:34:30.000000000 +0000
+++ doc/xpdfrc.5
@@ -41,20 +41,20 @@ $NetBSD: patch-ak,v 1.3 2005/09/07 15:19:08 adam Exp $
-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
++displayFontT1 Times-Roman @PREFIX@/share/fonts/urw/n021003l.pfb
++displayFontT1 Times-Italic @PREFIX@/share/fonts/urw/n021023l.pfb
++displayFontT1 Times-Bold @PREFIX@/share/fonts/urw/n021004l.pfb
++displayFontT1 Times-BoldItalic @PREFIX@/share/fonts/urw/n021024l.pfb
++displayFontT1 Helvetica @PREFIX@/share/fonts/urw/n019003l.pfb
++displayFontT1 Helvetica-Oblique @PREFIX@/share/fonts/urw/n019023l.pfb
++displayFontT1 Helvetica-Bold @PREFIX@/share/fonts/urw/n019004l.pfb
++displayFontT1 Helvetica-BoldOblique @PREFIX@/share/fonts/urw/n019024l.pfb
++displayFontT1 Courier @PREFIX@/share/fonts/urw/n022003l.pfb
++displayFontT1 Courier-Oblique @PREFIX@/share/fonts/urw/n022023l.pfb
++displayFontT1 Courier-Bold @PREFIX@/share/fonts/urw/n022004l.pfb
++displayFontT1 Courier-BoldOblique @PREFIX@/share/fonts/urw/n022024l.pfb
++displayFontT1 Symbol @PREFIX@/share/fonts/urw/s050000l.pfb
++displayFontT1 ZapfDingbats @PREFIX@/share/fonts/urw/d050000l.pfb
# use the Bakoma Type 1 fonts
# (this assumes they happen to be installed in /usr/local/fonts/bakoma)
diff --git a/print/xpdf/patches/patch-al b/print/xpdf/patches/patch-al
index 71a03090096..61b3f87706c 100644
--- a/print/xpdf/patches/patch-al
+++ b/print/xpdf/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2005/09/07 15:19:08 adam Exp $
+$NetBSD: patch-al,v 1.3 2010/06/13 08:56:04 spz Exp $
--- xpdf/GlobalParams.cc.orig 2005-08-17 05:34:31.000000000 +0000
+++ xpdf/GlobalParams.cc
-@@ -106,11 +106,10 @@ static char *displayFontDirs[] = {
+@@ -106,11 +106,12 @@ static char *displayFontDirs[] = {
};
#else
static char *displayFontDirs[] = {
@@ -13,7 +13,9 @@ $NetBSD: patch-al,v 1.2 2005/09/07 15:19:08 adam Exp $
- "/usr/share/fonts/default/ghostscript",
- "/usr/share/fonts/type1/gsfonts",
+ "/usr/X11R6/lib/X11/fonts/Type1",
++ "/usr/X11R7/lib/X11/fonts/Type1",
+ PREFIX"/xorg/lib/X11/fonts/Type1",
++ PREFIX"/share/fonts/urw",
NULL
};
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-17 07:37:06 +0000