summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-02-17 19:36:46 +0000
committerwiz <wiz@pkgsrc.org>2006-02-17 19:36:46 +0000
commit8e98e56925989d73e17edfe4e2db84f0190119c7 (patch)
tree7d363d60e6898a286520fb3d0e61197b4f3c4675 /fonts
parent01e382fa7f944040dd8f7bef83d95e3c5ff284d5 (diff)
downloadpkgsrc-8e98e56925989d73e17edfe4e2db84f0190119c7.tar.gz
Fix font handling. Simplify Makefile. Bump PKGREVISION.
Diffstat (limited to 'fonts')
-rw-r--r--fonts/sgi-fonts/Makefile15
-rw-r--r--fonts/sgi-fonts/PLIST4
2 files changed, 7 insertions, 12 deletions
diff --git a/fonts/sgi-fonts/Makefile b/fonts/sgi-fonts/Makefile
index 6fd16bec60f..d655f14015c 100644
--- a/fonts/sgi-fonts/Makefile
+++ b/fonts/sgi-fonts/Makefile
@@ -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 @@ HOMEPAGE= http://oss.sgi.com/projects/sgi_propack/
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 --git a/fonts/sgi-fonts/PLIST b/fonts/sgi-fonts/PLIST
index 036f3ca12ab..90b995f7f0c 100644
--- a/fonts/sgi-fonts/PLIST
+++ b/fonts/sgi-fonts/PLIST
@@ -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/ScrB18.pcf.gz
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