svn commit: r392404 - in head/japanese: kanji18 kanji18/files kanji26/files

[MIHIRA Sanpei Yoshiro]

Author: sanpei
Date: Sat Jul 18 02:10:55 2015
New Revision: 392404
URL: https://svnweb.freebsd.org/changeset/ports/392404

Log:
  fix issues related with USES=fonts
  
  PR:		200064, 200065
  Submitted by:	WATANABE Kazuhiro

Modified:
  head/japanese/kanji18/Makefile
  head/japanese/kanji18/files/DEINSTALL.tmpl
  head/japanese/kanji18/files/INSTALL.tmpl
  head/japanese/kanji26/files/DEINSTALL.tmpl
  head/japanese/kanji26/files/INSTALL.tmpl

Modified: head/japanese/kanji18/Makefile
==============================================================================
--- head/japanese/kanji18/Makefile	Sat Jul 18 01:43:05 2015	(r392403)
+++ head/japanese/kanji18/Makefile	Sat Jul 18 02:10:55 2015	(r392404)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kanji
 PORTVERSION?=	1.0
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=   PORTS_JP/${DISTNAME}
 PKGNAMESUFFIX?=	18

Modified: head/japanese/kanji18/files/DEINSTALL.tmpl
==============================================================================
--- head/japanese/kanji18/files/DEINSTALL.tmpl	Sat Jul 18 01:43:05 2015	(r392403)
+++ head/japanese/kanji18/files/DEINSTALL.tmpl	Sat Jul 18 02:10:55 2015	(r392404)
@@ -5,8 +5,7 @@ grepv() {
 }
 
 if [ "x$2" = "xPOST-DEINSTALL" ]; then
-	FONTDIR=${PKG_PREFIX}/%%FONTSDIR%%
-	cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir
+	FONTDIR=%%FONTSDIR%%
 
 	# font alias entry here!
 	TMPFILE=/tmp/install-fonts-alias-$$
@@ -43,9 +42,6 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then
 	 echo "to enable this update."
 	 echo "**********************************************************"
 	)
-	if [ "`wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'`" = 2 ]; then 
-		rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
-	fi
 fi
 
 

Modified: head/japanese/kanji18/files/INSTALL.tmpl
==============================================================================
--- head/japanese/kanji18/files/INSTALL.tmpl	Sat Jul 18 01:43:05 2015	(r392403)
+++ head/japanese/kanji18/files/INSTALL.tmpl	Sat Jul 18 02:10:55 2015	(r392404)
@@ -5,8 +5,7 @@ grepv() {
 }
 
 if [ "x$2" = "xPOST-INSTALL" ]; then
-	FONTDIR=${PKG_PREFIX}/%%FONTSDIR%%
-	cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir
+	FONTDIR=%%FONTSDIR%%
 
 	# font alias entry here!
 	TMPFILE=/tmp/install-fonts-alias-$$

Modified: head/japanese/kanji26/files/DEINSTALL.tmpl
==============================================================================
--- head/japanese/kanji26/files/DEINSTALL.tmpl	Sat Jul 18 01:43:05 2015	(r392403)
+++ head/japanese/kanji26/files/DEINSTALL.tmpl	Sat Jul 18 02:10:55 2015	(r392404)
@@ -5,8 +5,7 @@ grepv() {
 }
 
 if [ "x$2" = "xPOST-DEINSTALL" ]; then
-	FONTDIR=${PKG_PREFIX}/%%FONTSDIR%%
-	cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir
+	FONTDIR=%%FONTSDIR%%
 
 	# font alias entry here!
 	TMPFILE=/tmp/install-fonts-alias-$$
@@ -43,9 +42,6 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then
 	 echo "to enable this update."
 	 echo "**********************************************************"
 	)
-	if [ "`wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'`" = 2 ]; then 
-		rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
-	fi
 fi
 
 

Modified: head/japanese/kanji26/files/INSTALL.tmpl
==============================================================================
--- head/japanese/kanji26/files/INSTALL.tmpl	Sat Jul 18 01:43:05 2015	(r392403)
+++ head/japanese/kanji26/files/INSTALL.tmpl	Sat Jul 18 02:10:55 2015	(r392404)
@@ -5,8 +5,7 @@ grepv() {
 }
 
 if [ "x$2" = "xPOST-INSTALL" ]; then
-	FONTDIR=${PKG_PREFIX}/%%FONTSDIR%%
-	cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir
+	FONTDIR=%%FONTSDIR%%
 
 	# font alias entry here!
 	TMPFILE=/tmp/install-fonts-alias-$$