summaryrefslogtreecommitdiff
path: root/print/xpdf/patches
diff options
context:
space:
mode:
authorspz <spz@pkgsrc.org>2010-06-13 08:56:04 +0000
committerspz <spz@pkgsrc.org>2010-06-13 08:56:04 +0000
commit813731b2ac18ac68a200d2dfb8281665b5e30212 (patch)
tree84185c7c38c44bf60f4d9dfbcca61313dd423c11 /print/xpdf/patches
parent33e3f112798911302d05a63cbb75f8da459275b8 (diff)
downloadpkgsrc-813731b2ac18ac68a200d2dfb8281665b5e30212.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/patches')
-rw-r--r--print/xpdf/patches/patch-ai30
-rw-r--r--print/xpdf/patches/patch-ak30
-rw-r--r--print/xpdf/patches/patch-al6
3 files changed, 34 insertions, 32 deletions
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