pkg/25755: make xpdf find and use a depoted ghostscript-fonts package.

[Joachim Kuebart <kuebart%mathematik.uni-ulm.de@localhost>]

>Number:         25755
>Category:       pkg
>Synopsis:       make xpdf find and use a depoted ghostscript-fonts package.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 30 14:22:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Joachim Kuebart
>Release:        NetBSD 2.0B from 2. April 2004
>Organization:
>Environment:
        
        
System: NetBSD jaja 2.0B NetBSD 2.0B (ALPHA-$Revision: 1.191 $) #10: Thu Apr 22 
17:37:18 CEST 2004 joki@jaja:/home/joki/NetBSD/compile/JAJA alpha
Architecture: alpha
Machine: alpha
xpdf-3.00
>Description:
When building xpdf with a depoted ghostscript-fonts package, the correct
font path is not compiled into xpdf causing it not to find any of its
fonts.
        
>How-To-Repeat:
Build and install a depoted ghostscript-fonts package. Not that this
package is not yet pkgviews ready, but see my mail to tech-pkg from Sun May 30.
Build and install a depoted xpdf. When starting xpdf, xpdf complains about
not being able to find its fonts.
        
>Fix:
        
Pass in an extra path, GS_PREFIX, to the build process. PREFIX is
inadequate for finding a depoted package under pkgviews.
The buildlink3.mk file for ghostscript-fonts referenced in the Makefile
below is the vanilla one created using createbuildlink -3.

I also need to pass in a different include directory for freetype2 to
configure. Is that just me?

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/xpdf/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile    18 Apr 2004 23:58:29 -0000      1.29
+++ Makefile    30 May 2004 14:19:32 -0000
@@ -9,10 +9,10 @@
 HOMEPAGE=      http://www.foolabs.com/xpdf/
 COMMENT=       Display tool for PDF files
 
-DEPENDS+=      ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
-
 CONFLICTS=     xpdf-crypto-[0-9]*
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 USE_X11=               YES
@@ -20,11 +20,13 @@
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       
--with-freetype2-includes=${BUILDLINK_PREFIX.freetype2}/include/freetype2
+CONFIGURE_ARGS+=       
--with-freetype2-includes=${BUILDLINK_PREFIX.freetype2}/include
 CONFIGURE_ARGS+=       --with-t1-includes=${BUILDLINK_PREFIX.t1lib}/include
 CONFIGURE_ENV+=                CXXFLAGS="${CXXFLAGS}"
 MAKE_ENV+=             SED="${SED}" ECHO="${ECHO}"
 
+CXXFLAGS+=             
-DGS_PREFIX=\\\"${BUILDLINK_PREFIX.ghostscript-fonts}\\\"
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
@@ -45,6 +47,7 @@
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf
 
+.include "../../fonts/ghostscript-fonts/buildlink3.mk"
 .include "../../fonts/t1lib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/xpdf/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo    27 Apr 2004 19:45:32 -0000      1.15
+++ distinfo    30 May 2004 14:19:32 -0000
@@ -13,7 +13,7 @@
 SHA1 (patch-ai) = baa4308f9c44c750f54868dc3e355588dfd0dac8
 SHA1 (patch-aj) = 428b2da89b1775afbd2752ec105adad966babdf9
 SHA1 (patch-ak) = e09c064906e0695fe31ab9f20fb9b6945b1b25cc
-SHA1 (patch-al) = 785bf1547e0bf5273b66e5b18adbcccaa85aee35
+SHA1 (patch-al) = afc31c4446bf3898dc0d21164b25721a1bd6b050
 SHA1 (patch-am) = 794ff952c749c8dab6f575d55602cdc7e7157fef
 SHA1 (patch-an) = bf579a07e9b9868ed8d6a6450484c47ce9acaef0
 SHA1 (patch-ao) = fd25cab0255d24c4b55907b031f5f4ec68411576
cvs server: Diffing patches
Index: patches/patch-al
===================================================================
RCS file: /cvsroot/pkgsrc/print/xpdf/patches/patch-al,v
retrieving revision 1.1
diff -u -r1.1 patch-al
--- patches/patch-al    3 Mar 2004 10:50:59 -0000       1.1
+++ patches/patch-al    30 May 2004 14:19:32 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.1 2004/03/03 10:50:59 adam Exp $
+$NetBSD$
 
---- xpdf/GlobalParams.cc.orig  2004-03-03 10:26:05.000000000 +0000
-+++ xpdf/GlobalParams.cc
-@@ -81,9 +81,9 @@ static struct {
+--- xpdf/GlobalParams.cc.orig  2004-01-22 02:26:45.000000000 +0100
++++ xpdf/GlobalParams.cc       2004-05-29 00:39:12.000000000 +0200
+@@ -81,9 +81,9 @@
  };
  
  static char *displayFontDirs[] = {
 -  "/usr/share/ghostscript/fonts",
-+  PREFIX"/share/ghostscript/fonts",
++  GS_PREFIX"/share/ghostscript/fonts",
    "/usr/local/share/ghostscript/fonts",
 -  "/usr/share/fonts/default/Type1",
 +  "/usr/X11R6/lib/X11/fonts/Type1",
>Release-Note:
>Audit-Trail:
>Unformatted: