- Add LICENSE.

- Use FONTPATHSPEC and nuke pkg-message for adding FontPath manually.
- Use FONTSDIR consistently.
- Add a Makefie for building.

japanese/font-shinonome/Makefile

@@ -3,64 +3,41 @@
 
 PORTNAME=	shinonome
 PORTVERSION=	0.9.11.p1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://openlab.jp/efont/dist/shinonome/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
 PKGNAMEPREFIX=	ja-font-
-DISTNAME=	${PORTNAME:C/^font-//}-${PORTVERSION:C/.p/p/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.p/p/}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Shinonome Japanese fonts, 12/14/16 dots
 
+LICENSE=	PD
+LICESE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts tar:bzip2
+FONTPATHSPEC=	${FONTNAME}:unscaled:pri=60
 NO_ARCH=	yes
-SUB_FILES=	pkg-message
-WRKSRC=		${WRKDIR}/${PORTNAME:C/^font-//}-${PORTVERSION:C/.p.*$//}
+SUB_FILES=	Makefile
+SUB_LIST=	BDFTOPCF="${LOCALBASE}/bin/bdftopcf" \
+		GZIP_CMD="${GZIP_CMD}" \
+		FONTSDIR="${FONTSDIR}" \
+		STAGEDIR="${STAGEDIR}" \
+		INSTALL_DATA="${INSTALL_DATA}"
+MAKEFILE=	${WRKDIR}/Makefile
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.p.*$//}
 
 PORTDOCS=	AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14	\
-		DESIGN.16 DESIGN.18 INSTALL README THANKS TODO LICENSE
-
-FONTNAMES=\
-	shnm6x12a    shnm6x12ab   shnm6x12ai   shnm6x12abi   \
-	shnm6x12r    shnm6x12rb   shnm6x12ri   shnm6x12rbi   \
-	shnm7x14a    shnm7x14ab   shnm7x14ai   shnm7x14abi   \
-	shnm7x14r    shnm7x14rb   shnm7x14ri   shnm7x14rbi   \
-	shnm8x16a    shnm8x16ab   shnm8x16ai   shnm8x16abi   \
-	shnm8x16r    shnm8x16rb   shnm8x16ri   shnm8x16rbi   \
-	shnm9x18a    shnm9x18ab   shnm9x18ai   shnm9x18abi   \
-	shnm9x18r    shnm9x18rb   shnm9x18ri   shnm9x18rbi   \
-	shnmk12      shnmk12b     shnmk12i     shnmk12bi     \
-	shnmk12p     shnmk12pb    shnmk12pi    shnmk12pbi    \
-	shnmk12min   shnmk12minb  shnmk12mini  shnmk12minbi  \
-	shnmk12maru  shnmk12marub shnmk12marui shnmk12marubi \
-	shnmk14      shnmk14b     shnmk14i     shnmk14bi     \
-	shnmk14min   shnmk14minb  shnmk14mini  shnmk14minbi  \
-	shnmk16      shnmk16b     shnmk16i     shnmk16bi     \
-	shnmk16min   shnmk16minb  shnmk16mini  shnmk16minbi
-
+		DESIGN.16 DESIGN.18 INSTALL README THANKS TODO
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-do-build:
-	@${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:
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${FONTNAMES:C/$/.pcf.gz/} fonts.alias \
-	    ${STAGEDIR}${FONTSDIR}
+pre-build: apply-slist
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

japanese/font-shinonome/files/Makefile.in

@@ -0,0 +1,22 @@
+# $FreeBSD$
+#
+SRCS!=	${MAKE} -VBDFFILES -f Makefile.in
+
+.SUFFIXES:
+.SUFFIXES: .pcf .bdf
+.bdf.pcf:
+	%%BDFTOPCF%% -o ${.TARGET} ${.IMPSRC}
+
+.for S in ${SRCS:S/.bdf$//}
+$S.pcf.gz: $S.pcf
+	%%GZIP_CMD%% ${.ALLSRC} > ${.TARGET}
+.endfor
+
+all: ${SRCS:S/.bdf$/.pcf.gz/}
+
+install:
+	mkdir -p %%STAGEDIR%%%%FONTSDIR%%
+	%%INSTALL_DATA%% ${SRCS:S/.bdf$/.pcf.gz/} \
+	    fonts.alias %%STAGEDIR%%%%FONTSDIR%%
+
+.PATH: bdf

japanese/font-shinonome/files/pkg-message.in

@@ -1,19 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-You can start using the font(s) by following these instructions:
-
-Either type the following in an X terminal:
-
-        xset fp+ %%FONTSDIR%%
-        xset fp rehash
-
-Or, more permanently, add the following line to the "Files" section
-of your X.Org configuration file (typically /etc/X11/xorg.conf):
-
-        FontPath "%%FONTSDIR%%/"
-
-then restart X.
-EOM
-}
-]