Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Sep 2015 23:24:16 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r396789 - in head/japanese/font-kochi: . files
Message-ID:  <201509122324.t8CNOGbB005778@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Sat Sep 12 23:24:15 2015
New Revision: 396789
URL: https://svnweb.freebsd.org/changeset/ports/396789

Log:
  - Use post-install-DOCS-on.
  - Use %%FONTSDIR%% directly.

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

Modified: head/japanese/font-kochi/Makefile
==============================================================================
--- head/japanese/font-kochi/Makefile	Sat Sep 12 23:21:50 2015	(r396788)
+++ head/japanese/font-kochi/Makefile	Sat Sep 12 23:24:15 2015	(r396789)
@@ -41,6 +41,8 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
 	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 

Modified: head/japanese/font-kochi/files/pkg-install.in
==============================================================================
--- head/japanese/font-kochi/files/pkg-install.in	Sat Sep 12 23:21:50 2015	(r396788)
+++ head/japanese/font-kochi/files/pkg-install.in	Sat Sep 12 23:24:15 2015	(r396789)
@@ -1,8 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%
-
 catfontsdir ()
 {
     while read _IN
@@ -77,7 +75,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -85,7 +83,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 DEINSTALL)
-	cd ${FONTSDIR}
+	cd %%FONTSDIR%%
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir



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