From 583f9cd814110e8f73b7fb76a3c0eb70e1622159 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 1 Jun 2014 16:52:08 +0000
Subject: Install fonts into default installation path. Bump PKGREVISION.

---
 games/nethack-x11/MESSAGE  |  4 ++--
 games/nethack-x11/Makefile | 13 ++++++-------
 games/nethack-x11/PLIST    |  6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'games')

diff --git a/games/nethack-x11/MESSAGE b/games/nethack-x11/MESSAGE
index a08faecdcbc..9419466c3a4 100644
--- a/games/nethack-x11/MESSAGE
+++ b/games/nethack-x11/MESSAGE
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2011/06/01 11:20:30 wiz Exp $
+$NetBSD: MESSAGE,v 1.6 2014/06/01 16:52:08 wiz Exp $
 
 You can run the X11 NetHack by typing "nethack x11".
 
 Two fonts were installed for NetHack.  You must add
-${PREFIX}/lib/X11/fonts/misc to fontpath and set one of
+${PREFIX}/share/fonts/X11/misc to fontpath and set one of
 
 NetHack*map*font: nh10
 NetHack*map*font: -misc-fixed-medium-r-normal-ibmpc-14-120-75-75-c-80-iso8859-1
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 92c0b366f78..9a7b2d552cf 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2011/06/01 11:20:30 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.39 2014/06/01 16:52:08 wiz Exp $
 
 .include "../../games/nethack-lib/Makefile.common"
 
 PKGNAME=		nethack-x11-${NETHACK_VERSION}
-PKGREVISION=		4
+PKGREVISION=		5
 COMMENT=		The X11+tty version of NetHack
 
 CATEGORIES+=		x11
@@ -15,9 +14,9 @@ BUILD_TARGET=		nethack x11tiles rip.xpm
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-x11
 
-FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/misc
+FONTS_DIRS.x11+=	${PREFIX}/share/fonts/X11/misc
 
-INSTALLATION_DIRS=	lib/X11/app-defaults lib/X11/fonts/misc
+INSTALLATION_DIRS=	lib/X11/app-defaults share/fonts/X11/misc
 
 DISTINFO_FILE?=		${.CURDIR}/../nethack-lib/distinfo
 PATCHDIR=		${.CURDIR}/../nethack-lib/patches
@@ -30,9 +29,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/win/X11/NetHack.ad \
 	    ${DESTDIR}${PREFIX}/lib/X11/app-defaults/NetHack
 	${INSTALL_DATA} ${WRKSRC}/win/X11/nh10.bdf \
-	    ${DESTDIR}${PREFIX}/lib/X11/fonts/misc
+	    ${DESTDIR}${PREFIX}/share/fonts/X11/misc
 	${INSTALL_DATA} ${WRKSRC}/win/X11/ibm.bdf \
-	    ${DESTDIR}${PREFIX}/lib/X11/fonts/misc
+	    ${DESTDIR}${PREFIX}/share/fonts/X11/misc
 	${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc \
 	    ${DESTDIR}${GAMEDIR}/nethack.x11.rc
 
diff --git a/games/nethack-x11/PLIST b/games/nethack-x11/PLIST
index 5c3c3937c13..47c3e2c82f0 100644
--- a/games/nethack-x11/PLIST
+++ b/games/nethack-x11/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2011/06/01 11:20:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:52:08 wiz Exp $
 bin/nethack-x11
 lib/X11/app-defaults/NetHack
-lib/X11/fonts/misc/ibm.bdf
-lib/X11/fonts/misc/nh10.bdf
+share/fonts/X11/misc/ibm.bdf
+share/fonts/X11/misc/nh10.bdf
 share/nethackdir340/nethack.x11.rc
 share/nethackdir340/x11tiles
-- 
cgit v1.2.3