4 files changed, 273 insertions, 162 deletions

diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index d98501babfd5..284d2a10020d 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -5,28 +5,34 @@
 # $FreeBSD$
 #
 
-PORTNAME=	shinonome
-PORTVERSION=	0.9.11p1
+PORTNAME=	font-shinonome
+PORTVERSION=	0.9.11.p1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://openlab.jp/efont/dist/shinonome/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
+DISTNAME=	${PORTNAME:C/^font-//}-${PORTVERSION:C/.p/p/}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Japanese 12,14,16 dot fonts
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Shinonome Japanese fonts, 12/14/16 dots
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/p.*$//}
-
+WRKSRC=		${WRKDIR}/${PORTNAME:C/^font-//}-${PORTVERSION:C/.p.*$//}
 USE_BZIP2=	yes
+PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
+		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
+SUB_FILES=	pkg-install
+SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
+		FONTSALIAS=${DATADIR}/fonts.alias
+PKGINSTALL=	pkg-install
+PKGDEINSTALL=	pkg-install
 
-PLIST_SUB=	FONTSDIR="${FONTSDIR_REL}"
-
-.include <bsd.port.pre.mk>
+PORTDOCS=	AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14	\
+		DESIGN.16 DESIGN.18 INSTALL README THANKS TODO LICENSE
 
-FONTSDIR=	${PREFIX}/lib/X11/fonts/local
-FONTSDIR_REL=	${FONTSDIR:S,^${PREFIX}/,,}
+LOCAL_FONTSDIR=	share/fonts
+X_FONTSDIR=	lib/X11/fonts
 
 FONTNAMES=\
 	shnm6x12a    shnm6x12ab   shnm6x12ai   shnm6x12abi   \
@@ -45,34 +51,28 @@ FONTNAMES=\
 	shnmk14min   shnmk14minb  shnmk14mini  shnmk14minbi  \
 	shnmk16      shnmk16b     shnmk16i     shnmk16bi     \
 	shnmk16min   shnmk16minb  shnmk16mini  shnmk16minbi
-DOCS=	AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14 \
-	DESIGN.16 DESIGN.18 INSTALL README THANKS TODO LICENSE
 
 do-build:
-	@${ECHO_CMD} -n 'Compressing PCF fonts'
-.for i in ${FONTNAMES}
-	@${ECHO_CMD} -n '.'
-	@cd ${WRKSRC}; bdftopcf bdf/${i}.bdf | ${GZIP_CMD} > ${i}.pcf.gz
-.endfor
-	@${ECHO_CMD} 'Done'
-
-pre-su-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${DOCSDIR}
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
+	@${ECHO_CMD} -n "Compressing PCF fonts"
+	@cd ${WRKSRC} && for F in ${FONTNAMES}; do \
+		${LOCALBASE}/bin/bdftopcf bdf/$${F}.bdf | ${GZIP_CMD} > $${F}.pcf.gz; \
+		${ECHO_CMD} -n "."; \
+	done
+	@${ECHO_CMD} "Done"
 
 do-install:
-# Do not use original install target since it forces to delete fonts.alias
-.for i in ${FONTNAMES}
-	${INSTALL_DATA} ${WRKSRC}/${i}.pcf.gz ${FONTSDIR}
-.endfor
-	@mkfontdir ${FONTSDIR}
-	@${CAT} ${DOCSDIR}/fonts.alias >> ${FONTSDIR}/fonts.alias
+	${MKDIR} ${DATADIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${FONTNAMES:C/$/.pcf.gz/} fonts.alias ${DATADIR}
+	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/shinonome
+	${LN} -s -f ${DATADIR}/*.pcf.gz ${LOCALBASE}/${LOCAL_FONTSDIR}/shinonome/
+	${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc
+	${LN} -s -f ${DATADIR}/*.pcf.gz ${LOCALBASE}/${X_FONTSDIR}/misc/
+
+post-install:
+	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if !defined(NOPORTDOCS)
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/font-shinonome/files/pkg-install.in b/japanese/font-shinonome/files/pkg-install.in
new file mode 100644
index 000000000000..fe75f621c96e
--- /dev/null
+++ b/japanese/font-shinonome/files/pkg-install.in
@@ -0,0 +1,41 @@
+#!/bin/sh
+# $FreeBSD$
+
+X_FONTSDIR=%%X_FONTSDIR%%
+
+case "$2" in
+POST-INSTALL)
+	%%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/misc
+	cd ${X_FONTSDIR}/misc
+	%%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
+	touch fonts.alias
+	grep -v -- "-shinonome-" fonts.alias > fonts.alias.tmp
+	cat fonts.alias.tmp %%FONTSALIAS%% > fonts.alias
+	rm -f fonts.alias.tmp
+	;;
+DEINSTALL)
+	%%LOCALBASE%%/bin/fc-cache -f -v ${X_FONTSDIR}/misc
+	rm -f ${X_FONTSDIR}/misc/fonts.cache-1
+
+	cd ${X_FONTSDIR}/misc
+	%%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
+	if [ -r ${X_FONTSDIR}/misc/fonts.dir -a `/usr/bin/wc -l < ${X_FONTSDIR}/misc/fonts.dir` = 1 ]; then
+		rm -f ${X_FONTSDIR}/misc/fonts.dir
+	fi
+	touch fonts.alias
+	grep -v -- "-shinonome-" fonts.alias > fonts.alias.tmp
+	if [ -s fonts.alias.tmp ]; then
+		mv fonts.alias.tmp fonts.alias
+	else
+		rm -f fonts.alias.tmp fonts.alias
+	fi
+
+	for D in misc
+	do
+		rmdir ${X_FONTSDIR}/${D} > /dev/null 2>&1 || true
+		if [ -d ${X_FONTSDIR}/${D} ]; then
+			%%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/${D} || true
+		fi
+	done
+	;;
+esac
diff --git a/japanese/font-shinonome/pkg-plist b/japanese/font-shinonome/pkg-plist
index 281686a3dfbb..432c89ccde12 100644
--- a/japanese/font-shinonome/pkg-plist
+++ b/japanese/font-shinonome/pkg-plist
@@ -1,84 +1,197 @@
-%%FONTSDIR%%/shnm6x12a.pcf.gz
-%%FONTSDIR%%/shnm6x12ab.pcf.gz
-%%FONTSDIR%%/shnm6x12abi.pcf.gz
-%%FONTSDIR%%/shnm6x12ai.pcf.gz
-%%FONTSDIR%%/shnm6x12r.pcf.gz
-%%FONTSDIR%%/shnm6x12rb.pcf.gz
-%%FONTSDIR%%/shnm6x12rbi.pcf.gz
-%%FONTSDIR%%/shnm6x12ri.pcf.gz
-%%FONTSDIR%%/shnm7x14a.pcf.gz
-%%FONTSDIR%%/shnm7x14ab.pcf.gz
-%%FONTSDIR%%/shnm7x14abi.pcf.gz
-%%FONTSDIR%%/shnm7x14ai.pcf.gz
-%%FONTSDIR%%/shnm7x14r.pcf.gz
-%%FONTSDIR%%/shnm7x14rb.pcf.gz
-%%FONTSDIR%%/shnm7x14rbi.pcf.gz
-%%FONTSDIR%%/shnm7x14ri.pcf.gz
-%%FONTSDIR%%/shnm8x16a.pcf.gz
-%%FONTSDIR%%/shnm8x16ab.pcf.gz
-%%FONTSDIR%%/shnm8x16abi.pcf.gz
-%%FONTSDIR%%/shnm8x16ai.pcf.gz
-%%FONTSDIR%%/shnm8x16r.pcf.gz
-%%FONTSDIR%%/shnm8x16rb.pcf.gz
-%%FONTSDIR%%/shnm8x16rbi.pcf.gz
-%%FONTSDIR%%/shnm8x16ri.pcf.gz
-%%FONTSDIR%%/shnm9x18a.pcf.gz
-%%FONTSDIR%%/shnm9x18ab.pcf.gz
-%%FONTSDIR%%/shnm9x18abi.pcf.gz
-%%FONTSDIR%%/shnm9x18ai.pcf.gz
-%%FONTSDIR%%/shnm9x18r.pcf.gz
-%%FONTSDIR%%/shnm9x18rb.pcf.gz
-%%FONTSDIR%%/shnm9x18rbi.pcf.gz
-%%FONTSDIR%%/shnm9x18ri.pcf.gz
-%%FONTSDIR%%/shnmk12.pcf.gz
-%%FONTSDIR%%/shnmk12b.pcf.gz
-%%FONTSDIR%%/shnmk12bi.pcf.gz
-%%FONTSDIR%%/shnmk12i.pcf.gz
-%%FONTSDIR%%/shnmk12maru.pcf.gz
-%%FONTSDIR%%/shnmk12marub.pcf.gz
-%%FONTSDIR%%/shnmk12marubi.pcf.gz
-%%FONTSDIR%%/shnmk12marui.pcf.gz
-%%FONTSDIR%%/shnmk12min.pcf.gz
-%%FONTSDIR%%/shnmk12minb.pcf.gz
-%%FONTSDIR%%/shnmk12minbi.pcf.gz
-%%FONTSDIR%%/shnmk12mini.pcf.gz
-%%FONTSDIR%%/shnmk12p.pcf.gz
-%%FONTSDIR%%/shnmk12pb.pcf.gz
-%%FONTSDIR%%/shnmk12pbi.pcf.gz
-%%FONTSDIR%%/shnmk12pi.pcf.gz
-%%FONTSDIR%%/shnmk14.pcf.gz
-%%FONTSDIR%%/shnmk14b.pcf.gz
-%%FONTSDIR%%/shnmk14bi.pcf.gz
-%%FONTSDIR%%/shnmk14i.pcf.gz
-%%FONTSDIR%%/shnmk14min.pcf.gz
-%%FONTSDIR%%/shnmk14minb.pcf.gz
-%%FONTSDIR%%/shnmk14minbi.pcf.gz
-%%FONTSDIR%%/shnmk14mini.pcf.gz
-%%FONTSDIR%%/shnmk16.pcf.gz
-%%FONTSDIR%%/shnmk16b.pcf.gz
-%%FONTSDIR%%/shnmk16bi.pcf.gz
-%%FONTSDIR%%/shnmk16i.pcf.gz
-%%FONTSDIR%%/shnmk16min.pcf.gz
-%%FONTSDIR%%/shnmk16minb.pcf.gz
-%%FONTSDIR%%/shnmk16minbi.pcf.gz
-%%FONTSDIR%%/shnmk16mini.pcf.gz
-%%DOCSDIR%%/fonts.alias
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.0
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.12
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.14
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.16
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN.18
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-@dirrm %%DOCSDIR%%
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@exec cat  %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
+@comment $FreeBSD$
+%%DATADIR%%/shnm6x12a.pcf.gz
+%%DATADIR%%/shnm6x12ab.pcf.gz
+%%DATADIR%%/shnm6x12abi.pcf.gz
+%%DATADIR%%/shnm6x12ai.pcf.gz
+%%DATADIR%%/shnm6x12r.pcf.gz
+%%DATADIR%%/shnm6x12rb.pcf.gz
+%%DATADIR%%/shnm6x12rbi.pcf.gz
+%%DATADIR%%/shnm6x12ri.pcf.gz
+%%DATADIR%%/shnm7x14a.pcf.gz
+%%DATADIR%%/shnm7x14ab.pcf.gz
+%%DATADIR%%/shnm7x14abi.pcf.gz
+%%DATADIR%%/shnm7x14ai.pcf.gz
+%%DATADIR%%/shnm7x14r.pcf.gz
+%%DATADIR%%/shnm7x14rb.pcf.gz
+%%DATADIR%%/shnm7x14rbi.pcf.gz
+%%DATADIR%%/shnm7x14ri.pcf.gz
+%%DATADIR%%/shnm8x16a.pcf.gz
+%%DATADIR%%/shnm8x16ab.pcf.gz
+%%DATADIR%%/shnm8x16abi.pcf.gz
+%%DATADIR%%/shnm8x16ai.pcf.gz
+%%DATADIR%%/shnm8x16r.pcf.gz
+%%DATADIR%%/shnm8x16rb.pcf.gz
+%%DATADIR%%/shnm8x16rbi.pcf.gz
+%%DATADIR%%/shnm8x16ri.pcf.gz
+%%DATADIR%%/shnm9x18a.pcf.gz
+%%DATADIR%%/shnm9x18ab.pcf.gz
+%%DATADIR%%/shnm9x18abi.pcf.gz
+%%DATADIR%%/shnm9x18ai.pcf.gz
+%%DATADIR%%/shnm9x18r.pcf.gz
+%%DATADIR%%/shnm9x18rb.pcf.gz
+%%DATADIR%%/shnm9x18rbi.pcf.gz
+%%DATADIR%%/shnm9x18ri.pcf.gz
+%%DATADIR%%/shnmk12.pcf.gz
+%%DATADIR%%/shnmk12b.pcf.gz
+%%DATADIR%%/shnmk12bi.pcf.gz
+%%DATADIR%%/shnmk12i.pcf.gz
+%%DATADIR%%/shnmk12maru.pcf.gz
+%%DATADIR%%/shnmk12marub.pcf.gz
+%%DATADIR%%/shnmk12marubi.pcf.gz
+%%DATADIR%%/shnmk12marui.pcf.gz
+%%DATADIR%%/shnmk12min.pcf.gz
+%%DATADIR%%/shnmk12minb.pcf.gz
+%%DATADIR%%/shnmk12minbi.pcf.gz
+%%DATADIR%%/shnmk12mini.pcf.gz
+%%DATADIR%%/shnmk12p.pcf.gz
+%%DATADIR%%/shnmk12pb.pcf.gz
+%%DATADIR%%/shnmk12pbi.pcf.gz
+%%DATADIR%%/shnmk12pi.pcf.gz
+%%DATADIR%%/shnmk14.pcf.gz
+%%DATADIR%%/shnmk14b.pcf.gz
+%%DATADIR%%/shnmk14bi.pcf.gz
+%%DATADIR%%/shnmk14i.pcf.gz
+%%DATADIR%%/shnmk14min.pcf.gz
+%%DATADIR%%/shnmk14minb.pcf.gz
+%%DATADIR%%/shnmk14minbi.pcf.gz
+%%DATADIR%%/shnmk14mini.pcf.gz
+%%DATADIR%%/shnmk16.pcf.gz
+%%DATADIR%%/shnmk16b.pcf.gz
+%%DATADIR%%/shnmk16bi.pcf.gz
+%%DATADIR%%/shnmk16i.pcf.gz
+%%DATADIR%%/shnmk16min.pcf.gz
+%%DATADIR%%/shnmk16minb.pcf.gz
+%%DATADIR%%/shnmk16minbi.pcf.gz
+%%DATADIR%%/shnmk16mini.pcf.gz
+%%DATADIR%%/fonts.alias
+@dirrm %%DATADIR%%
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12a.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12ab.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12abi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12ai.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12r.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12rb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12rbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm6x12ri.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14a.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14ab.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14abi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14ai.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14r.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14rb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14rbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm7x14ri.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16a.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16ab.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16abi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16ai.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16r.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16rb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16rbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm8x16ri.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18a.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18ab.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18abi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18ai.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18r.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18rb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18rbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnm9x18ri.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12b.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12bi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12i.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12maru.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12marub.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12marubi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12marui.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12min.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12minb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12minbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12mini.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12p.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12pb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12pbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk12pi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14b.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14bi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14i.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14min.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14minb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14minbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk14mini.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16b.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16bi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16i.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16min.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16minb.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16minbi.pcf.gz
+%%LOCAL_FONTSDIR%%/shinonome/shnmk16mini.pcf.gz
+@dirrm %%LOCAL_FONTSDIR%%/shinonome
+@dirrmtry %%LOCAL_FONTSDIR%%
+%%X_FONTSDIR%%/misc/shnm6x12a.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12ab.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12abi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12ai.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12r.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12rb.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12rbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm6x12ri.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14a.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14ab.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14abi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14ai.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14r.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14rb.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14rbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm7x14ri.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16a.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16ab.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16abi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16ai.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16r.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16rb.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16rbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm8x16ri.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18a.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18ab.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18abi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18ai.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18r.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18rb.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18rbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnm9x18ri.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12b.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12bi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12i.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12maru.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12marub.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12marubi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12marui.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12min.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12minb.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12minbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12mini.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12p.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12pb.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12pbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk12pi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14b.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14bi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14i.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14min.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14minb.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14minbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk14mini.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16b.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16bi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16i.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16min.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16minb.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16minbi.pcf.gz
+%%X_FONTSDIR%%/misc/shnmk16mini.pcf.gz
diff --git a/japanese/font-shinonome/pkg-req b/japanese/font-shinonome/pkg-req
deleted file mode 100644
index 59fb70886e11..000000000000
--- a/japanese/font-shinonome/pkg-req
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
-	exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
-	exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
-	echo '**********************************************************************'
-	echo "****** ${FONTDIR}/ doesn't exist."
-	echo "****** Creating ${FONTDIR}/"
-	echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
-	echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
-	echo '**********************************************************************'
-	mkdir ${FONTDIR}
-fi
-
-# font alias entry here!
-FONTS_ALIAS=${PKG_PREFIX}/share/doc/shinonome/fonts.alias
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-if [ "$2" = "DEINSTALL" ] ; then
-	echo "Updating ${FONTDIR}/fonts.alias"
-	cd ${FONTDIR}
-	touch fonts.alias
-	cp fonts.alias fonts.alias.orig
-	grepv ${FONTS_ALIAS} fonts.alias.orig > fonts.alias
-	rm -f fonts.alias.orig 
-fi
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0;