From owner-svn-ports-all@FreeBSD.ORG  Sun Jun 22 13:17:12 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1019AF99;
 Sun, 22 Jun 2014 13:17:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D73B7251D;
 Sun, 22 Jun 2014 13:17:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MDHBEZ047251;
 Sun, 22 Jun 2014 13:17:11 GMT
 (envelope-from nobutaka@svn.freebsd.org)
Received: (from nobutaka@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MDHBRM047249;
 Sun, 22 Jun 2014 13:17:11 GMT
 (envelope-from nobutaka@svn.freebsd.org)
Message-Id: <201406221317.s5MDHBRM047249@svn.freebsd.org>
From: MANTANI Nobutaka <nobutaka@FreeBSD.org>
Date: Sun, 22 Jun 2014 13:17:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r358799 - head/japanese/monafonts-ttf
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jun 2014 13:17:12 -0000

Author: nobutaka
Date: Sun Jun 22 13:17:11 2014
New Revision: 358799
URL: http://svnweb.freebsd.org/changeset/ports/358799
QAT: https://qat.redports.org/buildarchive/r358799/

Log:
  Support staging.
  Update message in pkg-install.

Modified:
  head/japanese/monafonts-ttf/Makefile
  head/japanese/monafonts-ttf/pkg-install

Modified: head/japanese/monafonts-ttf/Makefile
==============================================================================
--- head/japanese/monafonts-ttf/Makefile	Sun Jun 22 13:11:17 2014	(r358798)
+++ head/japanese/monafonts-ttf/Makefile	Sun Jun 22 13:17:11 2014	(r358799)
@@ -18,10 +18,8 @@ FONTSDIR=	lib/X11/fonts/TrueType
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
-NO_STAGE=	yes
 do-install:
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	${INSTALL_DATA} ${WRKDIR}/mona.ttf ${FILESDIR}/fonts.dir.mona ${PREFIX}/${FONTSDIR}
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${WRKDIR}/mona.ttf ${FILESDIR}/fonts.dir.mona ${STAGEDIR}${PREFIX}/${FONTSDIR}
 
 .include <bsd.port.mk>

Modified: head/japanese/monafonts-ttf/pkg-install
==============================================================================
--- head/japanese/monafonts-ttf/pkg-install	Sun Jun 22 13:11:17 2014	(r358798)
+++ head/japanese/monafonts-ttf/pkg-install	Sun Jun 22 13:17:11 2014	(r358799)
@@ -2,11 +2,10 @@
 FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
 if [ "$2" = "PRE-INSTALL" ]; then
   if [ ! -d ${FONTDIR} ]; then
-    echo "*********************************************************"
+    echo "**************************************************************"
     echo "Please add ${FONTDIR} to your font path"
-    echo "and load 'xtt' module in /etc/XF86Config."
-    echo "*********************************************************"
-    mkdir $FONTDIR
+    echo "in /etc/X11/xorg.conf."
+    echo "**************************************************************"
   fi
   exit 0
 fi