Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 22 Jun 2014 13:17:11 +0000 (UTC)
From:      MANTANI Nobutaka <nobutaka@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r358799 - head/japanese/monafonts-ttf
Message-ID:  <201406221317.s5MDHBRM047249@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406221317.s5MDHBRM047249>