Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 12 Sep 2015 22:26:36 +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: r396783 - in head/japanese/font-shinonome: . files
Message-ID:  <201509122226.t8CMQaAV080764@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: hrs
Date: Sat Sep 12 22:26:35 2015
New Revision: 396783
URL: https://svnweb.freebsd.org/changeset/ports/396783

Log:
  Fix fonts.alias.  It was totally broken since r381876.

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

Modified: head/japanese/font-shinonome/Makefile
==============================================================================
--- head/japanese/font-shinonome/Makefile	Sat Sep 12 20:47:51 2015	(r396782)
+++ head/japanese/font-shinonome/Makefile	Sat Sep 12 22:26:35 2015	(r396783)
@@ -3,7 +3,7 @@
 
 PORTNAME=	shinonome
 PORTVERSION=	0.9.11.p1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://openlab.jp/efont/dist/shinonome/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
@@ -44,7 +44,7 @@ FONTNAMES=\
 	shnmk16      shnmk16b     shnmk16i     shnmk16bi     \
 	shnmk16min   shnmk16minb  shnmk16mini  shnmk16minbi
 
-FONTNAME=	shinonome
+FONTNAME=	misc
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
@@ -65,6 +65,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
 	    ../../../${DATADIR_REL}/*.pcf.gz .
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 

Modified: head/japanese/font-shinonome/files/pkg-install.in
==============================================================================
--- head/japanese/font-shinonome/files/pkg-install.in	Sat Sep 12 20:47:51 2015	(r396782)
+++ head/japanese/font-shinonome/files/pkg-install.in	Sat Sep 12 22:26:35 2015	(r396783)
@@ -1,16 +1,17 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%
-
 case "$2" in
 POST-INSTALL)
+	cd %%FONTSDIR%%
 	touch fonts.alias
 	grep -v -- "-shinonome-" fonts.alias > fonts.alias.tmp
-	(cat fonts.alias.tmp; grep -v "^!!" %%FONTSALIAS%%) > fonts.alias
+	(cat fonts.alias.tmp; grep -- "-shinonome-" %%FONTSALIAS%%) \
+	    > fonts.alias
 	rm -f fonts.alias.tmp
 	;;
 POST-DEINSTALL)
+	cd %%FONTSDIR%%
 	touch fonts.alias
 	grep -v -- "-shinonome-" fonts.alias > fonts.alias.tmp
 	if [ -s fonts.alias.tmp ]; then

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