pkg/26731: make ghostscript pkgviews ready

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

>Number:         26731
>Category:       pkg
>Synopsis:       make ghostscript and required packages pkgviews ready
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Aug 22 12:26:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Joachim Kuebart
>Release:        NetBSD 2.0B
>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
pkgsrc from around 21 August 2004
>Description:
Make ghostscript[-nox11] and required packages ja-vflib-lib, watanabe-vfont
and ghostscript-fonts ready for pkgviews.
>How-To-Repeat:
ghostscript and friends are overwrite packages.
>Fix:
Add the line

        PKG_INSTALLATION_TYPES= overwrite pkgviews

to the Makefiles of watanabe-vfont, ghostscript-fonts and ghostscript.
Use creatbuildlink -3 to create buildlink3.mk files for the packages
watanabe-vfont and ghostscript-fonts. Apply the following patch
to ja-vflib-lib:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/ja-vflib-lib/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile    10 Apr 2003 01:28:23 -0000      1.4
+++ Makefile    22 Aug 2004 12:00:16 -0000
@@ -5,6 +5,8 @@
 PKGNAME=       ja-vflib-lib-${VFLIB_VERSION}
 COMMENT=       Japanese Vector font library
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 CONFIGURE_ARGS+=       --without-x
 ALL_TARGET=            build-src
 INSTALL_TARGET=                install-src
@@ -13,7 +15,7 @@
 .for FILE in vfontcap vfontcap.bdf
        cd ${WRKSRC};                                                   \
        ${MV} ${FILE} ${FILE}.orig;                                     \
-       ${SED} -e "s|/usr/local/share/fonts|${PREFIX}/share/fonts|g"    \
+       ${SED} -e "s|/usr/local/share/fonts|${LOCALBASE}/share/fonts|g" \
                ${FILE}.orig > ${FILE};                                 \
        ${RM} ${FILE}.orig
 .endfor

To ghostscript-nox11, apply the following patch:

Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/print/ghostscript-nox11/Makefile.common,v
retrieving revision 1.54
diff -u -r1.54 Makefile.common
--- Makefile.common     9 May 2004 04:14:51 -0000       1.54
+++ Makefile.common     22 Aug 2004 11:56:47 -0000
@@ -15,9 +15,6 @@
 CONFLICTS+=            ghostscript-gnu{,-nox11,-x11}-[0-9]*
 CONFLICTS+=            hpijs-[0-9]*
 
-DEPENDS+=              ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
-DEPENDS+=              watanabe-vfont-19930318:../../fonts/watanabe_vfont
-
 WRKSRC=                        ${WRKDIR}/gs${GS_VERS}
 USE_BUILDLINK3=                yes
 USE_GNU_TOOLS+=                make
@@ -27,6 +24,8 @@
 DISTFILES+=            ${GS_SRCS}
 EXTRACT_ONLY=          ${GS_SRCS}
 
+MAKE_ENV+=             
GSFONTSDIR="${BUILDLINK_PREFIX.ghostscript-fonts}/share/ghostscript"
+
 # Adobe's JPEG implementation in their PDF/PS documents is non-standard,
 # so we can't use an already installed libjpeg.so.
 #
@@ -278,6 +277,8 @@
 
 post-build: ${GS_BUILD_PREREQ}
 
+INSTALLATION_DIRS=     share/doc/html share/examples
+
 post-install: ${GS_INSTALL_PREREQ}
 
 post-install:
@@ -300,6 +301,8 @@
        ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/cpem.doc ${DOCDIR}/${MJC_DRV}
        ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOCDIR}/${MJC_DRV}
 
+.include "../../fonts/ghostscript-fonts/buildlink3.mk"
+.include "../../fonts/watanabe_vfont/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../print/ja-vflib-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/ghostscript-nox11/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo    24 Oct 2002 17:16:59 -0000      1.10
+++ distinfo    22 Aug 2004 11:56:47 -0000
@@ -32,6 +32,7 @@
 Size (ghostscript/samsung-gdi-driver.tar.gz) = 8909 bytes
 SHA1 (ghostscript/gs6.01-jpdf-exp.patch.gz) = 
21f427a4c80871edab8c4d748b1fe1b7796cd876
 Size (ghostscript/gs6.01-jpdf-exp.patch.gz) = 59034 bytes
+SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
 SHA1 (patch-ab) = 26cea522dbe2e2cc57a5fdc60130f309c76c6991
 SHA1 (patch-ac) = 576e0bc659d771f9d634921a0cc6752ab9739a92
 SHA1 (patch-ad) = 9b6e66132583a698ebef277caf343c6919f42f72
@@ -50,7 +51,7 @@
 SHA1 (patch-aq) = 5ff3c415eaae3398a2f39037e439955b95161942
 SHA1 (patch-ar) = 71d21692dfcbd95798743169d73f6b0611f4c007
 SHA1 (patch-as) = 9c1581562be288aba109a2c42db50e1923d60f02
-SHA1 (patch-at) = a627398bca6e9fbdc5f881d514de6b10d2c187dd
+SHA1 (patch-at) = 4b94be0bed18f52e4a8e3dfb3ebddf1485aa87c7
 SHA1 (patch-au) = 07c99b2988c34396901594ab635a209e08766303
 SHA1 (patch-av) = 87f3c9e01a4e2fa63c75c348b1a5ec2be07948a5
 SHA1 (patch-aw) = 9855cacc48db068f87aa37568b198e22e6c391a0
Index: patches/patch-at
===================================================================
RCS file: /cvsroot/pkgsrc/print/ghostscript-nox11/patches/patch-at,v
retrieving revision 1.4
diff -u -r1.4 patch-at
--- patches/patch-at    20 Dec 2001 22:31:10 -0000      1.4
+++ patches/patch-at    22 Aug 2004 11:56:48 -0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-at,v 1.4 2001/12/20 22:31:10 jlam Exp $
+$NetBSD$
 
---- src/unix-gcc.mak.orig      Thu Dec 20 00:32:55 2001
-+++ src/unix-gcc.mak
+--- src/unix-gcc.mak.orig      2004-08-21 19:11:26.000000000 +0200
++++ src/unix-gcc.mak   2004-08-21 19:12:50.000000000 +0200
 @@ -30,12 +30,12 @@
  
  BINDIR=./bin
@@ -28,7 +28,7 @@
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
-@@ -69,8 +69,8 @@
+@@ -69,15 +69,15 @@
  gsdir = $(datadir)/ghostscript
  gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
  
@@ -39,6 +39,14 @@
  vfdir=$(gsdatadir)/vflib
  GS_DOCDIR=$(docdir)
  
+ # Define the default directory/ies for the runtime
+ # initialization and font files.  Separate multiple directories with a :.
+ 
+-GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdatadir)/vflib:$(gsdir)/fonts
++GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdatadir)/vflib:$(GSFONTSDIR)/fonts
+ 
+ # Define whether or not searching for initialization files should always
+ # look in the current directory first.  This leads to well-known security
 @@ -156,7 +156,7 @@
  # what its name is.
  # See gs.mak and Make.htm for more information.


Note that I only tested the ghostscript package and it works fine. I don't
see any other packages depend on ghostscript-nox11 explicitly, but lots of
packages depend on ../../mk/ghostscript.mk and I didn't test all of these.
Should I?
>Release-Note:
>Audit-Trail:
>Unformatted: