summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fonts/sgi-fonts/Makefile29
-rw-r--r--fonts/sgi-fonts/PLIST3
2 files changed, 19 insertions, 13 deletions
diff --git a/fonts/sgi-fonts/Makefile b/fonts/sgi-fonts/Makefile
index 0b4837f0879..03523045d15 100644
--- a/fonts/sgi-fonts/Makefile
+++ b/fonts/sgi-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/12/17 17:21:18 abs Exp $
+# $NetBSD: Makefile,v 1.14 2011/09/29 12:50:23 ryoon Exp $
#
DISTNAME= sgi-fonts-1.0-457.src
@@ -12,19 +12,26 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://oss.sgi.com/projects/sgi_propack/
COMMENT= Linux compatibility package for SGI fonts
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/sgi-fonts
-PKG_DESTDIR_SUPPORT= user-destdir
+USE_LANGUAGES= # none
+
+USE_X11BASE= yes
+FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/misc/sgi
+
+USE_IMAKE= yes
+USE_TOOLS+= bzcat tar pax
-USE_IMAKE= YES
-USE_TOOLS+= bdftopcf bzcat gtar gzip rpm2pkg
-FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/misc/sgi
-REQD_DIRS+= ${PREFIX}/lib/X11/fonts/misc/sgi
+INSTALLATION_DIRS= lib/X11/fonts/misc/sgi
-do-extract:
- rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
- cd ${WRKDIR} && bzcat sgi-fonts.tar.bz2 | ${GTAR} xf -
+post-extract:
+ cd ${WRKDIR} && bzcat sgi-fonts.tar.bz2 | tar xf -
-post-install:
- ${RM} ${DESTDIR}${PREFIX}/lib/X11/fonts/misc/sgi/fonts.scale
+do-install:
+ cd ${WRKSRC} && pax -rw -pm *pcf.gz \
+ ${DESTDIR}${PREFIX}/lib/X11/fonts/misc/sgi
+ ${INSTALL_DATA} ${WRKSRC}/Scr15.pcf \
+ ${DESTDIR}${PREFIX}/lib/X11/fonts/misc/sgi
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/sgi-fonts/PLIST b/fonts/sgi-fonts/PLIST
index 394579fa8a7..da16effcbd1 100644
--- a/fonts/sgi-fonts/PLIST
+++ b/fonts/sgi-fonts/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/09/29 12:50:23 ryoon 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,7 +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/haeberli12.pcf.gz
lib/X11/fonts/misc/sgi/haeberli24.pcf.gz
lib/X11/fonts/misc/sgi/haeberli36.pcf.gz