From owner-svn-ports-all@FreeBSD.ORG  Mon Apr  6 11:40:49 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE590E33;
 Mon,  6 Apr 2015 11:40:49 +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 B9DA5B6A;
 Mon,  6 Apr 2015 11:40:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36BeniA078497;
 Mon, 6 Apr 2015 11:40:49 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36Bendx078495;
 Mon, 6 Apr 2015 11:40:49 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201504061140.t36Bendx078495@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 6 Apr 2015 11:40:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r383417 - in head/japanese/font-ricty: . files
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-1
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: Mon, 06 Apr 2015 11:40:49 -0000

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@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