svn commit: r316979 - head/japanese/font-kochi

[Hiroki Sato]

Author: hrs
Date: Tue Apr 30 23:57:37 2013
New Revision: 316979
URL: http://svnweb.freebsd.org/changeset/ports/316979

Log:
  - Fix DATADIR.
  - Style clean-ups.

Modified:
  head/japanese/font-kochi/Makefile

Modified: head/japanese/font-kochi/Makefile
==============================================================================
--- head/japanese/font-kochi/Makefile	Tue Apr 30 23:55:58 2013	(r316978)
+++ head/japanese/font-kochi/Makefile	Tue Apr 30 23:57:37 2013	(r316979)
@@ -3,6 +3,7 @@
 
 PORTNAME=	kochi
 PORTVERSION=	20030809
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SFJP/efont/5411/
 PKGNAMEPREFIX=	ja-font-
@@ -19,6 +20,7 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
 SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
+DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
 		LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
 		DATADIR=share/${PORTNAME}
@@ -42,13 +44,13 @@ do-install:
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
 	${LN} -s -f \
 		${DATADIR}/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-kochi.conf \
-		${FILESDIR}/62-fonts-kochi.conf \
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
+		${FILESDIR}/62-fonts-${PORTNAME}.conf \
 		${PREFIX}/etc/fonts/conf.avail
-	${LN} -s -f ../conf.avail/20-unhint-kochi.conf \
-		${PREFIX}/etc/fonts/conf.d/20-unhint-kochi.conf
-	${LN} -s -f ../conf.avail/62-fonts-kochi.conf \
-		${PREFIX}/etc/fonts/conf.d/62-fonts-kochi.conf
+	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
+	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR}