svn commit: r465526 - in head/japanese/font-kappa20: . files

[MANTANI Nobutaka]

Author: nobutaka
Date: Sun Mar 25 16:13:31 2018
New Revision: 465526
URL: https://svnweb.freebsd.org/changeset/ports/465526

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], 226518 [2]
  Submitted by:	WATANABE Kazuhiro <CQG00620 at nifty.ne.jp> [2]
  Reported by:	Shigeharu TAKENO <shige at iee.niit.ac.jp> [1]
  Approved by:	maintainer

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

Modified: head/japanese/font-kappa20/Makefile
==============================================================================
--- head/japanese/font-kappa20/Makefile	Sun Mar 25 15:36:43 2018	(r465525)
+++ head/japanese/font-kappa20/Makefile	Sun Mar 25 16:13:31 2018	(r465526)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kappa20
 PORTVERSION=	0.396
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
@@ -16,25 +16,16 @@ BUILD_DEPENDS=	mkitalic:x11-fonts/mkbold-mkitalic \
 		bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts tar:bzip2
-FONTNAME=	misc
 NO_ARCH=	yes
 MAKE_ARGS=	FONTSDIR="${FONTSDIR:S,${PREFIX},,}"
 MAKEFILE=	${WRKDIR}/Makefile
-SUB_FILES=	Makefile pkg-install
-SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	Makefile pkg-message
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
 pre-build: apply-slist
 	cd ${WRKSRC} && ${SH} makebdf.sh
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/japanese/font-kappa20/files/Makefile.in
==============================================================================
--- head/japanese/font-kappa20/files/Makefile.in	Sun Mar 25 15:36:43 2018	(r465525)
+++ head/japanese/font-kappa20/files/Makefile.in	Sun Mar 25 16:13:31 2018	(r465526)
@@ -55,8 +55,8 @@ fonts.alias: Makefile
 	) | sort > $@
 
 install:
-	mkdir -p ${DESTDIR}%%DATADIR%%
-	${BSD_INSTALL_DATA} ${PCF_ALL} fonts.alias ${DESTDIR}%%DATADIR%%
+	mkdir -p ${DESTDIR}%%FONTSDIR%%
+	${BSD_INSTALL_DATA} ${PCF_ALL} fonts.alias ${DESTDIR}%%FONTSDIR%%
 
 clean::
 	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}

Added: head/japanese/font-kappa20/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/font-kappa20/files/pkg-message.in	Sun Mar 25 16:13:31 2018	(r465526)
@@ -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-kappa20/pkg-plist
==============================================================================
--- head/japanese/font-kappa20/pkg-plist	Sun Mar 25 15:36:43 2018	(r465525)
+++ head/japanese/font-kappa20/pkg-plist	Sun Mar 25 16:13:31 2018	(r465526)
@@ -1,62 +1,4 @@
-%%DATADIR%%/10x20L10b.pcf.gz
-%%DATADIR%%/10x20L10bi.pcf.gz
-%%DATADIR%%/10x20L10m.pcf.gz
-%%DATADIR%%/10x20L10mi.pcf.gz
-%%DATADIR%%/10x20L2b.pcf.gz
-%%DATADIR%%/10x20L2bi.pcf.gz
-%%DATADIR%%/10x20L2m.pcf.gz
-%%DATADIR%%/10x20L2mi.pcf.gz
-%%DATADIR%%/10x20L3b.pcf.gz
-%%DATADIR%%/10x20L3bi.pcf.gz
-%%DATADIR%%/10x20L3m.pcf.gz
-%%DATADIR%%/10x20L3mi.pcf.gz
-%%DATADIR%%/10x20L4b.pcf.gz
-%%DATADIR%%/10x20L4bi.pcf.gz
-%%DATADIR%%/10x20L4m.pcf.gz
-%%DATADIR%%/10x20L4mi.pcf.gz
-%%DATADIR%%/10x20L5b.pcf.gz
-%%DATADIR%%/10x20L5bi.pcf.gz
-%%DATADIR%%/10x20L5m.pcf.gz
-%%DATADIR%%/10x20L5mi.pcf.gz
-%%DATADIR%%/10x20L6b.pcf.gz
-%%DATADIR%%/10x20L6bi.pcf.gz
-%%DATADIR%%/10x20L6m.pcf.gz
-%%DATADIR%%/10x20L6mi.pcf.gz
-%%DATADIR%%/10x20L7b.pcf.gz
-%%DATADIR%%/10x20L7bi.pcf.gz
-%%DATADIR%%/10x20L7m.pcf.gz
-%%DATADIR%%/10x20L7mi.pcf.gz
-%%DATADIR%%/10x20L8b.pcf.gz
-%%DATADIR%%/10x20L8bi.pcf.gz
-%%DATADIR%%/10x20L8m.pcf.gz
-%%DATADIR%%/10x20L8mi.pcf.gz
-%%DATADIR%%/10x20L9b.pcf.gz
-%%DATADIR%%/10x20L9bi.pcf.gz
-%%DATADIR%%/10x20L9m.pcf.gz
-%%DATADIR%%/10x20L9mi.pcf.gz
-%%DATADIR%%/10x20b.pcf.gz
-%%DATADIR%%/10x20bi.pcf.gz
-%%DATADIR%%/10x20m.pcf.gz
-%%DATADIR%%/10x20mi.pcf.gz
-%%DATADIR%%/10x20rkb.pcf.gz
-%%DATADIR%%/10x20rkbi.pcf.gz
-%%DATADIR%%/10x20rkm.pcf.gz
-%%DATADIR%%/10x20rkmi.pcf.gz
-%%DATADIR%%/ipa-10x20b.pcf.gz
-%%DATADIR%%/ipa-10x20bi.pcf.gz
-%%DATADIR%%/ipa-10x20m.pcf.gz
-%%DATADIR%%/ipa-10x20mi.pcf.gz
-%%DATADIR%%/k20b.pcf.gz
-%%DATADIR%%/k20bi.pcf.gz
-%%DATADIR%%/k20m.pcf.gz
-%%DATADIR%%/k20mi.pcf.gz
-%%DATADIR%%/nk20b-1.pcf.gz
-%%DATADIR%%/nk20bi-1.pcf.gz
-%%DATADIR%%/vk20b.pcf.gz
-%%DATADIR%%/vk20bi.pcf.gz
-%%DATADIR%%/vk20m.pcf.gz
-%%DATADIR%%/vk20mi.pcf.gz
-%%DATADIR%%/fonts.alias
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/10x20L10b.pcf.gz
 %%FONTSDIR%%/10x20L10bi.pcf.gz
 %%FONTSDIR%%/10x20L10m.pcf.gz