[pkgsrc/trunk]: pkgsrc/print/xpdf the fonts that xpdf uses used to be in ghos...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print/xpdf the fonts that xpdf uses used to be in ghos...
From: spz <spz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:30:58 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/41f73aef4d0d
branches:  trunk
changeset: 576501:41f73aef4d0d
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Jun 13 08:56:04 2010 +0000

description:
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:

 print/xpdf/Makefile         |   6 +++---
 print/xpdf/distinfo         |   8 ++++----
 print/xpdf/patches/patch-ai |  30 +++++++++++++++---------------
 print/xpdf/patches/patch-ak |  30 +++++++++++++++---------------
 print/xpdf/patches/patch-al |   6 ++++--
 5 files changed, 41 insertions(+), 39 deletions(-)

diffs (158 lines):

diff -r b0957cc35a68 -r 41f73aef4d0d print/xpdf/Makefile
--- a/print/xpdf/Makefile       Sat Jun 12 21:46:43 2010 +0000
+++ b/print/xpdf/Makefile       Sun Jun 13 08:56:04 2010 +0000
@@ -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 @@
 
 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 -r b0957cc35a68 -r 41f73aef4d0d print/xpdf/distinfo
--- a/print/xpdf/distinfo       Sat Jun 12 21:46:43 2010 +0000
+++ b/print/xpdf/distinfo       Sun Jun 13 08:56:04 2010 +0000
@@ -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-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 -r b0957cc35a68 -r 41f73aef4d0d print/xpdf/patches/patch-ai
--- a/print/xpdf/patches/patch-ai       Sat Jun 12 21:46:43 2010 +0000
+++ b/print/xpdf/patches/patch-ai       Sun Jun 13 08:56:04 2010 +0000
@@ -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 @@
 -#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 -r b0957cc35a68 -r 41f73aef4d0d print/xpdf/patches/patch-ak
--- a/print/xpdf/patches/patch-ak       Sat Jun 12 21:46:43 2010 +0000
+++ b/print/xpdf/patches/patch-ak       Sun Jun 13 08:56:04 2010 +0000
@@ -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 @@
 -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 -r b0957cc35a68 -r 41f73aef4d0d print/xpdf/patches/patch-al
--- a/print/xpdf/patches/patch-al       Sat Jun 12 21:46:43 2010 +0000
+++ b/print/xpdf/patches/patch-al       Sun Jun 13 08:56:04 2010 +0000
@@ -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 @@
 -  "/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
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/libvideogfx Fix build with latest XShm from x...
Next by Date: [pkgsrc/trunk]: pkgsrc/print/texlive Fix typo. Spotted by Snader_LB @ #pkgsrc.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/libvideogfx Fix build with latest XShm from x...
Next by Thread: [pkgsrc/trunk]: pkgsrc/print/texlive Fix typo. Spotted by Snader_LB @ #pkgsrc.
Indexes:
Home | Main Index | Thread Index | Old Index