[pkgsrc/trunk]: pkgsrc/emulators/xbeeb Install fonts into default installatio...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1a2317a6dc2
branches:  trunk
changeset: 635213:a1a2317a6dc2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jun 01 16:48:31 2014 +0000

description:
Install fonts into default installation path. Bump PKGREVISION.

diffstat:

 emulators/xbeeb/Makefile |  13 ++++++-------
 emulators/xbeeb/PLIST    |  20 ++++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diffs (71 lines):

diff -r 2b39950a40ce -r a1a2317a6dc2 emulators/xbeeb/Makefile
--- a/emulators/xbeeb/Makefile  Sun Jun 01 16:45:35 2014 +0000
+++ b/emulators/xbeeb/Makefile  Sun Jun 01 16:48:31 2014 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2012/10/03 12:55:21 asau Exp $
-#
+# $NetBSD: Makefile,v 1.29 2014/06/01 16:48:31 wiz Exp $
 
 DISTNAME=      xbeeb-0.4.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    emulators x11
 MASTER_SITES=  http://bbc.nvg.org/emul/Xbeeb/
 EXTRACT_SUFX=  .tgz
@@ -19,8 +18,8 @@
 MESSAGE_SUBST+=        XBEEBROOT=${XBEEBROOT}
 PLIST_SUBST+=  XBEEBROOT=${XBEEBROOT:Q}
 
-FONTS_DIRS.x11=        ${PREFIX}/lib/X11/fonts/xbeeb
-REQD_DIRS=     ${PREFIX}/lib/X11/fonts/xbeeb
+FONTS_DIRS.x11=        ${PREFIX}/share/fonts/X11/xbeeb
+REQD_DIRS=     ${PREFIX}/share/fonts/X11/xbeeb
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
@@ -58,7 +57,7 @@
 SUBST_FILES.beebroot=  src/Config.h
 SUBST_SED.beebroot=    -e "s|^\\(\#define[      ]*XBEEBROOT[    ]*\\)[^         ].*\$$|\\1\"${PREFIX}/${XBEEBROOT}/\"|"
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${XBEEBROOT}/roms ${XBEEBROOT}/docs lib/X11/fonts/xbeeb
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${XBEEBROOT}/roms ${XBEEBROOT}/docs share/fonts/X11/xbeeb
 
 # xbeeb build starts in the source directory
 do-configure:
@@ -82,7 +81,7 @@
        ${INSTALL_MAN} ${MAN_PAGE} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xbeeb.1
        ${INSTALL_DATA} ${WRKSRC}/roms/xdfs0.90.rom ${DESTDIR}${PREFIX}/${XBEEBROOT}/roms/xdfs0.90.rom
        cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DESTDIR}${PREFIX}/${XBEEBROOT}/docs
-       cd ${WRKSRC}/fonts && ${INSTALL_DATA} *.pcf ${DESTDIR}${PREFIX}/lib/X11/fonts/xbeeb
+       cd ${WRKSRC}/fonts && ${INSTALL_DATA} *.pcf ${DESTDIR}${PREFIX}/share/fonts/X11/xbeeb
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff -r 2b39950a40ce -r a1a2317a6dc2 emulators/xbeeb/PLIST
--- a/emulators/xbeeb/PLIST     Sun Jun 01 16:45:35 2014 +0000
+++ b/emulators/xbeeb/PLIST     Sun Jun 01 16:48:31 2014 +0000
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:51:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/06/01 16:48:31 wiz Exp $
 bin/xbeeb
-lib/X11/fonts/xbeeb/ttext-grc-ldh.pcf
-lib/X11/fonts/xbeeb/ttext-grc-udh.pcf
-lib/X11/fonts/xbeeb/ttext-grc.pcf
-lib/X11/fonts/xbeeb/ttext-grs-ldh.pcf
-lib/X11/fonts/xbeeb/ttext-grs-udh.pcf
-lib/X11/fonts/xbeeb/ttext-grs.pcf
-lib/X11/fonts/xbeeb/ttext-std-ldh.pcf
-lib/X11/fonts/xbeeb/ttext-std-udh.pcf
-lib/X11/fonts/xbeeb/ttext-std.pcf
+share/fonts/X11/xbeeb/ttext-grc-ldh.pcf
+share/fonts/X11/xbeeb/ttext-grc-udh.pcf
+share/fonts/X11/xbeeb/ttext-grc.pcf
+share/fonts/X11/xbeeb/ttext-grs-ldh.pcf
+share/fonts/X11/xbeeb/ttext-grs-udh.pcf
+share/fonts/X11/xbeeb/ttext-grs.pcf
+share/fonts/X11/xbeeb/ttext-std-ldh.pcf
+share/fonts/X11/xbeeb/ttext-std-udh.pcf
+share/fonts/X11/xbeeb/ttext-std.pcf
 man/man1/xbeeb.1
 ${XBEEBROOT}/docs/64doc
 ${XBEEBROOT}/docs/Changes-v0.3