[pkgsrc/trunk]: pkgsrc/fonts/sgi-fonts Fix font handling. Simplify Makefile. ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d1480e68d53e
branches:  trunk
changeset: 508323:d1480e68d53e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Feb 17 19:36:46 2006 +0000

description:
Fix font handling. Simplify Makefile. Bump PKGREVISION.

diffstat:

 fonts/sgi-fonts/Makefile |  15 ++++++---------
 fonts/sgi-fonts/PLIST    |   4 +---
 2 files changed, 7 insertions(+), 12 deletions(-)

diffs (57 lines):

diff -r 7d0cefbed162 -r d1480e68d53e fonts/sgi-fonts/Makefile
--- a/fonts/sgi-fonts/Makefile  Fri Feb 17 19:36:23 2006 +0000
+++ b/fonts/sgi-fonts/Makefile  Fri Feb 17 19:36:46 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:09:11 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/17 19:36:46 wiz Exp $
 #
 
 DISTNAME=      sgi-fonts-1.0-457.src
 PKGNAME=       sgi-fonts-1.0.457
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    fonts
 MASTER_SITES=  http://public.planetmirror.com/pub/suse/i386/8.2/suse/src/
 EXTRACT_SUFX=  .rpm
@@ -13,19 +13,16 @@
 COMMENT=       Linux compatibility package for SGI fonts
 
 BUILD_DEPENDS+=        rpm2pkg>=1.3:../../pkgtools/rpm2pkg
-.if !exists(/usr/bin/bzcat)
-BUILD_DEPENDS+=        bzip2>=1.0.2:../../archivers/bzip2
-.endif
 
 WRKSRC=                ${WRKDIR}/sgi-fonts
 
 USE_IMAKE=     YES
-USE_TOOLS+=    bdftopcf gtar
-
-RPM2PKG=       ${LOCALBASE}/sbin/rpm2pkg
+USE_TOOLS+=    bdftopcf bzcat gtar
+FONTS_DIRS.x11+=       ${PREFIX}/lib/X11/fonts/misc/sgi
+REQD_DIRS+=            ${PREFIX}/lib/X11/fonts/misc/sgi
 
 do-extract:
-       ${RPM2PKG} -d ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
+       ${LOCALBASE}/sbin/rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
        cd ${WRKDIR} && bzcat sgi-fonts.tar.bz2 | ${GTAR} xf -
 
 .include "../../mk/bsd.pkg.mk"
diff -r 7d0cefbed162 -r d1480e68d53e fonts/sgi-fonts/PLIST
--- a/fonts/sgi-fonts/PLIST     Fri Feb 17 19:36:23 2006 +0000
+++ b/fonts/sgi-fonts/PLIST     Fri Feb 17 19:36:46 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/05 14:30:15 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:36:46 wiz Exp $
 lib/X11/fonts/misc/sgi/Scr10.pcf.gz
 lib/X11/fonts/misc/sgi/Scr11.pcf.gz
 lib/X11/fonts/misc/sgi/Scr12.pcf.gz
@@ -21,8 +21,6 @@
 lib/X11/fonts/misc/sgi/ScrB7.pcf.gz
 lib/X11/fonts/misc/sgi/ScrB8.pcf.gz
 lib/X11/fonts/misc/sgi/ScrB9.pcf.gz
-lib/X11/fonts/misc/sgi/fonts.alias
-lib/X11/fonts/misc/sgi/fonts.dir
 lib/X11/fonts/misc/sgi/haeberli12.pcf.gz
 lib/X11/fonts/misc/sgi/haeberli24.pcf.gz
 lib/X11/fonts/misc/sgi/haeberli36.pcf.gz