- Fix DATADIR.

- Style clean-ups.

1 files changed, 8 insertions, 6 deletions

diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index 3ba57bce53be..b15a5b27febd 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -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}