From 20d288111d0f452c529dd47bc16ef956632acd7c Mon Sep 17 00:00:00 2001
From: pawel <pawel@FreeBSD.org>
Date: Sun, 2 Feb 2014 14:27:37 +0000
Subject: - Stage support - Fix legal statement, xorg.conf path

PR:		ports/186322
Submitted by:	maintainer
---
 japanese/mikachan-ttfonts/Makefile    | 9 ++++-----
 japanese/mikachan-ttfonts/pkg-install | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'japanese')

diff --git a/japanese/mikachan-ttfonts/Makefile b/japanese/mikachan-ttfonts/Makefile
index 4ac031a481bf..7ac3ccc019e0 100644
--- a/japanese/mikachan-ttfonts/Makefile
+++ b/japanese/mikachan-ttfonts/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Handwritten Japanese TrueType fonts by Mika-chan
 
 EXTRACT_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
-NO_CDROM=	Don't sell distfile
+NO_CDROM=	Do not sell distfile
 EXTRACT_CMD=	lha
 EXTRACT_BEFORE_ARGS=	pq
 EXTRACT_AFTER_ARGS=	> ${WRKSRC}/mika.ttf
@@ -25,12 +25,11 @@ PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 FONTSDIR=	lib/X11/fonts/TrueType
 
-NO_STAGE=	yes
 do-install:
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	${INSTALL_DATA} \
 		${WRKDIR}/mika.ttf ${FILESDIR}/fonts.dir.mika \
-		${PREFIX}/${FONTSDIR}
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+		${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/mikachan-ttfonts/pkg-install b/japanese/mikachan-ttfonts/pkg-install
index b8a31fb1da6e..7d304a9cf669 100644
--- a/japanese/mikachan-ttfonts/pkg-install
+++ b/japanese/mikachan-ttfonts/pkg-install
@@ -4,7 +4,7 @@ if [ "$2" = "PRE-INSTALL" ]; then
   if [ ! -d ${FONTDIR} ]; then
     echo "*********************************************************"
     echo "Please add ${FONTDIR} to your font path"
-    echo "and load 'xtt' module in /etc/XF86Config."
+    echo "and load 'xtt' module in /etc/X11/xorg.conf ."
     echo "*********************************************************"
     mkdir $FONTDIR
   fi
-- 
cgit