From a7f909bb3c351ac3f339fa3871136d8486e42349 Mon Sep 17 00:00:00 2001 From: MANTANI Nobutaka Date: Sun, 25 Mar 2018 16:13:31 +0000 Subject: - 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 [2] Reported by: Shigeharu TAKENO [1] Approved by: maintainer --- japanese/font-kappa20/Makefile | 13 +------ japanese/font-kappa20/files/Makefile.in | 4 +- japanese/font-kappa20/files/pkg-install.in | 26 ------------- japanese/font-kappa20/files/pkg-message.in | 15 ++++++++ japanese/font-kappa20/pkg-plist | 60 +----------------------------- 5 files changed, 20 insertions(+), 98 deletions(-) delete mode 100644 japanese/font-kappa20/files/pkg-install.in create mode 100644 japanese/font-kappa20/files/pkg-message.in (limited to 'japanese') diff --git a/japanese/font-kappa20/Makefile b/japanese/font-kappa20/Makefile index 543d249035b7..f24ed0b95e16 100644 --- a/japanese/font-kappa20/Makefile +++ b/japanese/font-kappa20/Makefile @@ -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,14 +16,10 @@ 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 @@ -31,11 +27,6 @@ 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} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} diff --git a/japanese/font-kappa20/files/Makefile.in b/japanese/font-kappa20/files/Makefile.in index d33b15809a21..ca525d9ac388 100644 --- a/japanese/font-kappa20/files/Makefile.in +++ b/japanese/font-kappa20/files/Makefile.in @@ -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} diff --git a/japanese/font-kappa20/files/pkg-install.in b/japanese/font-kappa20/files/pkg-install.in deleted file mode 100644 index 7c1d22761134..000000000000 --- a/japanese/font-kappa20/files/pkg-install.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -grepv() { - awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 -} - -case $2 in -POST-INSTALL) - cd %%FONTSDIR%% - touch fonts.alias - cp fonts.alias fonts.alias.orig - (grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \ - > fonts.alias - rm -f fonts.alias.orig -;; -DEINSTALL) - cd %%FONTSDIR%% - touch fonts.alias - cp fonts.alias fonts.alias.orig - grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias - rm -f fonts.alias.orig - if [ ! -s fonts.alias ]; then - rm -f fonts.alias - fi -;; -esac diff --git a/japanese/font-kappa20/files/pkg-message.in b/japanese/font-kappa20/files/pkg-message.in new file mode 100644 index 000000000000..059c75d35d44 --- /dev/null +++ b/japanese/font-kappa20/files/pkg-message.in @@ -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. +******************************************************************* diff --git a/japanese/font-kappa20/pkg-plist b/japanese/font-kappa20/pkg-plist index e9c6572223a9..b3f5c3bfb875 100644 --- a/japanese/font-kappa20/pkg-plist +++ b/japanese/font-kappa20/pkg-plist @@ -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 -- cgit v1.2.3