From 4d622ee3544d6f4789d6cf59d34e02c5dfe9dd66 Mon Sep 17 00:00:00 2001
From: DPorts Builder <nobody@home.ok>
Date: Thu, 9 Apr 2015 00:41:46 -0700
Subject: [PATCH] Update japanese/font-mplus-ipa to version 1.0.20060520.p1_4

---
 japanese/font-mplus-ipa/Makefile             | 28 +++++---------------
 japanese/font-mplus-ipa/files/pkg-install.in |  9 +++----
 japanese/font-mplus-ipa/pkg-plist            | 19 +++++--------
 3 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 6ece9c1dce2..4be26be0214 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mplus-ipa
 PORTVERSION=	1.0.20060520.p1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
@@ -12,39 +12,27 @@ DISTNAME=	mixfont-mplus-ipa-TrueType-20060520p1
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mixed Japanese font with IPA, M-plus outline, and Bitstream Vera
 
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
 CONFLICTS=	ja-ipa-ttfonts-[0-9]*
 
-USES=	tar:bzip2
+USES=	fonts tar:bzip2
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
-SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
-		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
 		Mplus-LICENSE_J.txt README.txt
 
-LOCAL_FONTSDIR=	share/fonts
-X_FONTSDIR=	lib/X11/fonts
-
+FONTNAME=	TTF
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus && \
 	    ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
-	cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/M+*.ttf .
-	${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
-	cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
-	    ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/M+*.ttf .
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+	    ../../../${DATADIR_REL}/fonts/M+*.ttf .
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -54,11 +42,7 @@ 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
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/font-mplus-ipa/files/pkg-install.in b/japanese/font-mplus-ipa/files/pkg-install.in
index e9381b2c67c..fbc0b98e3d7 100644
--- a/japanese/font-mplus-ipa/files/pkg-install.in
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $FreeBSD: head/japanese/font-mplus-ipa/files/pkg-install.in 340719 2014-01-22 15:52:06Z mat $
+# $FreeBSD: head/japanese/font-mplus-ipa/files/pkg-install.in 381876 2015-03-21 23:05:19Z bapt $
 
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/
 
 catfontsdir ()
 {
@@ -74,7 +74,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${X_FONTSDIR}
+	cd ${FONTSDIR}
 	touch fonts.dir
 	(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
@@ -82,7 +82,7 @@ POST-INSTALL)
 	rm -f fonts.dir.tmp
 	;;
 POST-DEINSTALL)
-	cd ${X_FONTSDIR}
+	cd ${FONTSDIR}
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
@@ -90,6 +90,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
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index b5ab1f635aa..b260ac66b7b 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -60,20 +60,13 @@
 %%DATADIR%%/ChangeLog
 %%DATADIR%%/COPYING
 %%DATADIR%%/AUTHORS
-%%LOCAL_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+1VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+1P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+1P+IPAG-circle.ttf
 etc/fonts/conf.avail/20-unhint-mplus-ipa.conf
 etc/fonts/conf.avail/62-fonts-mplus-ipa.conf
 etc/fonts/conf.d/20-unhint-mplus-ipa.conf
 etc/fonts/conf.d/62-fonts-mplus-ipa.conf
-%%X_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TTF/M+2P+IPAG.ttf
-%%X_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
-%%X_FONTSDIR%%/TTF/M+1VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TTF/M+1P+IPAG.ttf
-%%X_FONTSDIR%%/TTF/M+1P+IPAG-circle.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/M+2VM+IPAG-circle.ttf
+%%FONTSDIR%%/M+2P+IPAG.ttf
+%%FONTSDIR%%/M+2P+IPAG-circle.ttf
+%%FONTSDIR%%/M+1VM+IPAG-circle.ttf
+%%FONTSDIR%%/M+1P+IPAG.ttf
+%%FONTSDIR%%/M+1P+IPAG-circle.ttf
-- 
2.41.0