- 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@nifty.ne.jp> [2]
Reported by:	Shigeharu TAKENO <shige@iee.niit.ac.jp> [1]
Approved by:	maintainer
This commit is contained in:
MANTANI Nobutaka 2018-03-25 16:13:31 +00:00
parent e0eee5ee79
commit a7f909bb3c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=465526
5 changed files with 20 additions and 98 deletions

View File

@ -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}

View File

@ -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}

View File

@ -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

View File

@ -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.
*******************************************************************

View File

@ -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