diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-21 23:05:19 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-21 23:05:19 +0000 |
| commit | a5da770e67afce95b829c38c5d5330fe69f7822c (patch) | |
| tree | b9556c9042a9d20d7c71f49869f39f95afc00052 /japanese/font-kochi | |
| parent | 51da733b698e7bbedaac4743f457352334401249 (diff) | |
| download | ports-a5da770e67afce95b829c38c5d5330fe69f7822c.tar.gz ports-a5da770e67afce95b829c38c5d5330fe69f7822c.zip | |
Make fonts repecting XDG
Xorg is now looking in ${LOCALBASE}/share/fonts by default
Xorg now accepts symlinks in etc/X11/fontpath.d (as decribed in Xserver(1))
Large cleanup on lots of font ports
All fonts are now properly dynamically generating fonts.dir and fonts.scale
instead of sometime overwriting existing ones)
All fonts are generating fontconfig's cache
Improve consistency in fonts ports
Notes
Notes:
svn path=/head/; revision=381876
Diffstat (limited to 'japanese/font-kochi')
| -rw-r--r-- | japanese/font-kochi/Makefile | 28 | ||||
| -rw-r--r-- | japanese/font-kochi/files/pkg-install.in | 6 | ||||
| -rw-r--r-- | japanese/font-kochi/pkg-plist | 7 |
3 files changed, 12 insertions, 29 deletions
diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile index 6111a2932558..2a30fb624394 100644 --- a/japanese/font-kochi/Makefile +++ b/japanese/font-kochi/Makefile @@ -3,7 +3,7 @@ PORTNAME= kochi PORTVERSION= 20030809 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese x11-fonts MASTER_SITES= SFJP/efont/5411/ PKGNAMEPREFIX= ja-font- @@ -12,38 +12,26 @@ DISTNAME= ${PORTNAME}-substitute-${PORTVERSION} MAINTAINER= hrs@FreeBSD.org COMMENT= Kochi Japanese TrueType font -RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig - -USES= tar:bzip2 +USES= fonts tar:bzip2 NO_BUILD= yes PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install SUB_FILES= pkg-install -SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR} DATADIR= ${PREFIX}/share/font-${PORTNAME} -PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \ - LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \ - DATADIR=share/font-${PORTNAME} +PLIST_SUB= DATADIR=share/font-${PORTNAME} WRKSRC= ${WRKDIR}/${DISTNAME} -LOCAL_FONTSDIR= share/fonts -X_FONTSDIR= lib/X11/fonts - +FONTNAME= TTF PORTDOCS= README.ja COPYING docs OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \ - ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf . - ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF - cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \ - ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf . + ${MKDIR} ${STAGEDIR}${FONTSDIR} + cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \ + ../../../${DATADIR_REL}/*.ttf . ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ @@ -53,9 +41,7 @@ do-install: ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/japanese/font-kochi/files/pkg-install.in b/japanese/font-kochi/files/pkg-install.in index 48ab317e8a8c..75d5e82733a5 100644 --- a/japanese/font-kochi/files/pkg-install.in +++ b/japanese/font-kochi/files/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # $FreeBSD$ -X_FONTSDIR=%%X_FONTSDIR%%/TTF +FONTSDIR=%%FONTSDIR%% catfontsdir () { @@ -77,7 +77,7 @@ nfonts () case "$2" in POST-INSTALL) - cd ${X_FONTSDIR} + cd ${FONTSDIR} touch fonts.dir (catfontsdir < fonts.dir; addentries) > fonts.dir.tmp nfonts < fonts.dir.tmp > fonts.dir @@ -85,7 +85,7 @@ POST-INSTALL) rm -f fonts.dir.tmp ;; DEINSTALL) - cd ${X_FONTSDIR} + cd ${FONTSDIR} catfontsdir < fonts.dir > fonts.dir.tmp nfonts < fonts.dir.tmp > fonts.dir cat fonts.dir.tmp >> fonts.dir diff --git a/japanese/font-kochi/pkg-plist b/japanese/font-kochi/pkg-plist index 116644c1fbba..3eeae7a35636 100644 --- a/japanese/font-kochi/pkg-plist +++ b/japanese/font-kochi/pkg-plist @@ -1,11 +1,8 @@ %%DATADIR%%/kochi-mincho-subst.ttf %%DATADIR%%/kochi-gothic-subst.ttf -%%LOCAL_FONTSDIR%%/TTF/kochi-mincho-subst.ttf -%%LOCAL_FONTSDIR%%/TTF/kochi-gothic-subst.ttf etc/fonts/conf.avail/20-unhint-kochi.conf etc/fonts/conf.avail/62-fonts-kochi.conf etc/fonts/conf.d/20-unhint-kochi.conf etc/fonts/conf.d/62-fonts-kochi.conf -%%X_FONTSDIR%%/TTF/kochi-mincho-subst.ttf -%%X_FONTSDIR%%/TTF/kochi-gothic-subst.ttf -@fc %%X_FONTSDIR%%/TTF +%%FONTSDIR%%/kochi-mincho-subst.ttf +%%FONTSDIR%%/kochi-gothic-subst.ttf |