svn commit: r465516 - in head/japanese/font-kaname12: . files

[MANTANI Nobutaka]

Author: nobutaka
Date: Sun Mar 25 14:07:48 2018
New Revision: 465516
URL: https://svnweb.freebsd.org/changeset/ports/465516

Log:
  - Install font files to ${FONTSDIR} instead of ${DATADIR}.
  - Stop to make symbolic links from the font files to
    ${PREFIX}/share/fonts/misc/, which is found in the default
    font path, because recent libXfont does not follow symbolic
    links.
  - Add pkg-message.in to show additional font path settings.
  - Remove unnecessary pkg-install.in.
  - Bump PORTREVISION.
  
  PR:		225125 [1], 226516 [2]
  Submitted by:	WATANABE Kazuhiro <CQG00620 at nifty.ne.jp> (maintainer) [2]
  Reported by:	Shigeharu TAKENO <shige at iee.niit.ac.jp> [1]

Added:
  head/japanese/font-kaname12/files/pkg-message.in   (contents, props changed)
Deleted:
  head/japanese/font-kaname12/files/pkg-install.in
Modified:
  head/japanese/font-kaname12/Makefile
  head/japanese/font-kaname12/files/Makefile.in
  head/japanese/font-kaname12/pkg-plist

Modified: head/japanese/font-kaname12/Makefile
==============================================================================
--- head/japanese/font-kaname12/Makefile	Sun Mar 25 13:06:55 2018	(r465515)
+++ head/japanese/font-kaname12/Makefile	Sun Mar 25 14:07:48 2018	(r465516)
@@ -3,6 +3,7 @@
 
 PORTNAME=	kaname12
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
@@ -16,27 +17,19 @@ COMMENT=	12-dot Kanji font
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
-FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
-SUB_FILES=	Makefile pkg-install
-SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
+SUB_FILES=	Makefile pkg-message
 MAKEFILE=	${WRKDIR}/Makefile
 PORTDOCS=	readme readme.kaname_bdf kaname.doc \
 		readme.knm gijutsu-siryou.doc
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
 
 OPTIONS_DEFINE=	DOCS
 
 pre-build: apply-slist
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR}
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
 post-install-DOCS-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-doc

Modified: head/japanese/font-kaname12/files/Makefile.in
==============================================================================
--- head/japanese/font-kaname12/files/Makefile.in	Sun Mar 25 13:06:55 2018	(r465515)
+++ head/japanese/font-kaname12/files/Makefile.in	Sun Mar 25 14:07:48 2018	(r465516)
@@ -10,11 +10,11 @@ knmhn12x.pcf.gz: knmhn12x.bdf
 	bdftopcf ${.ALLSRC} | gzip -9 > ${.TARGET}
 
 .for F in ${PCF}
-${DESTDIR}%%DATADIR%%/$F: $F
-	mkdir -p ${DESTDIR}%%DATADIR%%
+${DESTDIR}%%FONTSDIR%%/$F: $F
+	mkdir -p ${DESTDIR}%%FONTSDIR%%
 	${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET}
 
-install: ${DESTDIR}%%DATADIR%%/$F
+install: ${DESTDIR}%%FONTSDIR%%/$F
 all: ${F}
 .endfor
 

Added: head/japanese/font-kaname12/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/font-kaname12/files/pkg-message.in	Sun Mar 25 14:07:48 2018	(r465516)
@@ -0,0 +1,15 @@
+*******************************************************************
+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.
+*******************************************************************

Modified: head/japanese/font-kaname12/pkg-plist
==============================================================================
--- head/japanese/font-kaname12/pkg-plist	Sun Mar 25 13:06:55 2018	(r465515)
+++ head/japanese/font-kaname12/pkg-plist	Sun Mar 25 14:07:48 2018	(r465516)
@@ -1,13 +1,7 @@
-%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/kaname-latin1.pcf.gz
 %%FONTSDIR%%/knm12p.pcf.gz
 %%FONTSDIR%%/knm12pb.pcf.gz
 %%FONTSDIR%%/knmhn12x.pcf.gz
 %%FONTSDIR%%/knmzn12x.pcf.gz
 %%FONTSDIR%%/knmzn12xb.pcf.gz
-%%DATADIR%%/kaname-latin1.pcf.gz
-%%DATADIR%%/knm12p.pcf.gz
-%%DATADIR%%/knm12pb.pcf.gz
-%%DATADIR%%/knmhn12x.pcf.gz
-%%DATADIR%%/knmzn12x.pcf.gz
-%%DATADIR%%/knmzn12xb.pcf.gz