svn commit: r383417 - in head/japanese/font-ricty: . files

[Baptiste Daroussin]

Author: bapt
Date: Mon Apr  6 11:40:48 2015
New Revision: 383417
URL: https://svnweb.freebsd.org/changeset/ports/383417

Log:
  Fix post install script
  
  PR:		199113
  Reported by:	hiroto.kagotani at gmail.com

Modified:
  head/japanese/font-ricty/Makefile
  head/japanese/font-ricty/files/pkg-install.in

Modified: head/japanese/font-ricty/Makefile
==============================================================================
--- head/japanese/font-ricty/Makefile	Mon Apr  6 11:14:32 2015	(r383416)
+++ head/japanese/font-ricty/Makefile	Mon Apr  6 11:40:48 2015	(r383417)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ricty
 PORTVERSION=	3.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 PKGNAMEPREFIX=	ja-font-
 

Modified: head/japanese/font-ricty/files/pkg-install.in
==============================================================================
--- head/japanese/font-ricty/files/pkg-install.in	Mon Apr  6 11:14:32 2015	(r383416)
+++ head/japanese/font-ricty/files/pkg-install.in	Mon Apr  6 11:40:48 2015	(r383417)
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
-
 catfontsdir ()
 {
     while read _IN
@@ -86,7 +84,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${X_FONTSDIR}
+	cd ${FONTSDIR}
 	touch fonts.dir
 	(sed 1d fonts.dir | catfontsdir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -94,7 +92,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 POST-DEINSTALL)
-	cd ${X_FONTSDIR}
+	cd ${FONTSDIR}
 	sed 1d fonts.dir | catfontsdir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
@@ -102,6 +100,5 @@ POST-DEINSTALL)
 	if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
 		rm -f fonts.dir
 	fi
-	rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
 	;;
 esac