svn commit: r316978 - head/japanese/font-ipaex

[Hiroki Sato]

Author: hrs
Date: Tue Apr 30 23:55:58 2013
New Revision: 316978
URL: http://svnweb.freebsd.org/changeset/ports/316978

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

Modified:
  head/japanese/font-ipaex/Makefile
  head/japanese/font-ipaex/pkg-descr

Modified: head/japanese/font-ipaex/Makefile
==============================================================================
--- head/japanese/font-ipaex/Makefile	Tue Apr 30 23:53:03 2013	(r316977)
+++ head/japanese/font-ipaex/Makefile	Tue Apr 30 23:55:58 2013	(r316978)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ipaex
 PORTVERSION=	00201
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://info.openlab.ipa.go.jp/ipafont/fontdata/7bf84182a04a9632268dbcb03f100d05/
 PKGNAMEPREFIX=	ja-font-
@@ -20,12 +21,17 @@ 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=	IPA_Font_License_Agreement_v1.0.txt \
 		Readme_IPAexfont${PORTVERSION}.txt
 
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-extract:
 	cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done
 
@@ -40,14 +46,14 @@ do-install:
 	${LN} -s -f \
 		${DATADIR}/ipaex*.otf \
 		${PREFIX}/${X_FONTSDIR}/OTF/
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-ipaex.conf \
-		${FILESDIR}/62-fonts-ipaex.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-ipaex.conf \
-		${PREFIX}/etc/fonts/conf.d/20-unhint-ipaex.conf
-	${LN} -s -f ../conf.avail/62-fonts-ipaex.conf \
-		${PREFIX}/etc/fonts/conf.d/62-fonts-ipaex.conf
-.if !defined(NOPORTDOCS)
+	${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} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif

Modified: head/japanese/font-ipaex/pkg-descr
==============================================================================
--- head/japanese/font-ipaex/pkg-descr	Tue Apr 30 23:53:03 2013	(r316977)
+++ head/japanese/font-ipaex/pkg-descr	Tue Apr 30 23:55:58 2013	(r316978)
@@ -8,4 +8,4 @@ printing font tradition, namely, Japanes
 punctuation marks) are full width mono-space pitch, and Western
 characters are proportional pitch.
 
-WWW:	http://ossipedia.ipa.go.jp/ipafont/index.html
+WWW: http://ossipedia.ipa.go.jp/ipafont/index.html