vista-fonts: unbreak packaging

[Sergey Svishchev <shattered%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Sergey Svishchev <shattered%NetBSD.org@localhost>
Pushed By:	shattered
Date:		Sat Feb 20 00:21:46 2016 +0300
Changeset:	3d64b81d5802a13edbcbb5a2582c8950763357b0

Modified Files:
	vista-fonts/Makefile
	vista-fonts/PLIST

Log Message:
vista-fonts: unbreak packaging

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3d64b81d5802a13edbcbb5a2582c8950763357b0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vista-fonts/Makefile |  7 +++----
 vista-fonts/PLIST    | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diffs:
diff --git a/vista-fonts/Makefile b/vista-fonts/Makefile
index 52865dc..9fb591b 100644
--- a/vista-fonts/Makefile
+++ b/vista-fonts/Makefile
@@ -3,6 +3,7 @@
 
 DISTNAME=	# empty
 PKGNAME=	vista-fonts-20061028
+PKGREVISION=	1
 CATEGORIES=	fonts
 MASTER_SITES=	http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/
 DISTFILES=	PowerPointViewer.exe
@@ -22,10 +23,8 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-EVAL_PREFIX+=	CABEXTRACT_PREFIX=cabextract
-CABEXTRACT_PREFIX_DEFAULT=${LOCALBASE}
-EXTRACT_CMD=	${CABEXTRACT_PREFIX}/bin/cabextract -q -s $${extract_file} ppviewer.cab
-FONTDIR=	${PREFIX}/lib/X11/fonts/TTF
+EXTRACT_CMD=	${LOCALBASE}/bin/cabextract -q -s $${extract_file} ppviewer.cab
+FONTDIR=	${PREFIX}/share/fonts/X11/TTF
 DOCDIR=		${PREFIX}/share/doc/vista-fonts
 FONTS_DIRS.ttf=	${FONTDIR}
 
diff --git a/vista-fonts/PLIST b/vista-fonts/PLIST
index 1daec26..bf7391f 100644
--- a/vista-fonts/PLIST
+++ b/vista-fonts/PLIST
@@ -1,25 +1,25 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2012/02/04 08:50:00 shattered Exp $
-lib/X11/fonts/TTF/CALIBRI.ttf
-lib/X11/fonts/TTF/CALIBRIB.ttf
-lib/X11/fonts/TTF/CALIBRII.ttf
-lib/X11/fonts/TTF/CALIBRIZ.ttf
-lib/X11/fonts/TTF/CAMBRIAB.ttf
-lib/X11/fonts/TTF/CAMBRIAI.ttf
-lib/X11/fonts/TTF/CAMBRIAZ.ttf
-lib/X11/fonts/TTF/CANDARA.ttf
-lib/X11/fonts/TTF/CANDARAB.ttf
-lib/X11/fonts/TTF/CANDARAI.ttf
-lib/X11/fonts/TTF/CANDARAZ.ttf
-lib/X11/fonts/TTF/CONSOLA.ttf
-lib/X11/fonts/TTF/CONSOLAB.ttf
-lib/X11/fonts/TTF/CONSOLAI.ttf
-lib/X11/fonts/TTF/CONSOLAZ.ttf
-lib/X11/fonts/TTF/CONSTAN.ttf
-lib/X11/fonts/TTF/CONSTANB.ttf
-lib/X11/fonts/TTF/CONSTANI.ttf
-lib/X11/fonts/TTF/CONSTANZ.ttf
-lib/X11/fonts/TTF/CORBEL.ttf
-lib/X11/fonts/TTF/CORBELB.ttf
-lib/X11/fonts/TTF/CORBELI.ttf
-lib/X11/fonts/TTF/CORBELZ.ttf
+share/fonts/X11/TTF/CALIBRI.ttf
+share/fonts/X11/TTF/CALIBRIB.ttf
+share/fonts/X11/TTF/CALIBRII.ttf
+share/fonts/X11/TTF/CALIBRIZ.ttf
+share/fonts/X11/TTF/CAMBRIAB.ttf
+share/fonts/X11/TTF/CAMBRIAI.ttf
+share/fonts/X11/TTF/CAMBRIAZ.ttf
+share/fonts/X11/TTF/CANDARA.ttf
+share/fonts/X11/TTF/CANDARAB.ttf
+share/fonts/X11/TTF/CANDARAI.ttf
+share/fonts/X11/TTF/CANDARAZ.ttf
+share/fonts/X11/TTF/CONSOLA.ttf
+share/fonts/X11/TTF/CONSOLAB.ttf
+share/fonts/X11/TTF/CONSOLAI.ttf
+share/fonts/X11/TTF/CONSOLAZ.ttf
+share/fonts/X11/TTF/CONSTAN.ttf
+share/fonts/X11/TTF/CONSTANB.ttf
+share/fonts/X11/TTF/CONSTANI.ttf
+share/fonts/X11/TTF/CONSTANZ.ttf
+share/fonts/X11/TTF/CORBEL.ttf
+share/fonts/X11/TTF/CORBELB.ttf
+share/fonts/X11/TTF/CORBELI.ttf
+share/fonts/X11/TTF/CORBELZ.ttf
 share/doc/vista-fonts/ms-ttf-license