diff options
author | bapt <bapt@FreeBSD.org> | 2015-03-22 07:05:19 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2015-03-22 07:05:19 +0800 |
commit | fe5a7e4bee2fc7a40343278a44de77847b5c91c5 (patch) | |
tree | b9556c9042a9d20d7c71f49869f39f95afc00052 /japanese/font-sazanami | |
parent | 9167139629893ea7664f3b1cf93141ff1eeb82b4 (diff) | |
download | freebsd-ports-gnome-fe5a7e4bee2fc7a40343278a44de77847b5c91c5.tar.gz freebsd-ports-gnome-fe5a7e4bee2fc7a40343278a44de77847b5c91c5.tar.zst freebsd-ports-gnome-fe5a7e4bee2fc7a40343278a44de77847b5c91c5.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
Diffstat (limited to 'japanese/font-sazanami')
-rw-r--r-- | japanese/font-sazanami/Makefile | 27 | ||||
-rw-r--r-- | japanese/font-sazanami/files/pkg-install.in | 6 | ||||
-rw-r--r-- | japanese/font-sazanami/pkg-plist | 7 |
3 files changed, 11 insertions, 29 deletions
diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile index c441f1958865..f20e71263545 100644 --- a/japanese/font-sazanami/Makefile +++ b/japanese/font-sazanami/Makefile @@ -2,7 +2,7 @@ PORTNAME= sazanami PORTVERSION= 20040629 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese x11-fonts MASTER_SITES= SFJP/efont/10087 PKGNAMEPREFIX= ja-font- @@ -10,35 +10,23 @@ PKGNAMEPREFIX= ja-font- MAINTAINER= hrs@FreeBSD.org COMMENT= Sazanami Japanese TrueType fonts -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} -PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \ - LOCAL_FONTSDIR=${LOCAL_FONTSDIR} DATADIR= ${PREFIX}/share/font-${PORTNAME} PORTDOCS= README doc -LOCAL_FONTSDIR= share/fonts -X_FONTSDIR= lib/X11/fonts - +FONTNAME= TTF 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 \ @@ -48,11 +36,8 @@ 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} post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/japanese/font-sazanami/files/pkg-install.in b/japanese/font-sazanami/files/pkg-install.in index 8e2e77ee5ac3..cfc2a9f0ab0f 100644 --- a/japanese/font-sazanami/files/pkg-install.in +++ b/japanese/font-sazanami/files/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # $FreeBSD$ -X_FONTSDIR=%%X_FONTSDIR%%/TTF +FONTSDIR=%%FONTSDIR%%/ catfontsdir () { @@ -73,7 +73,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 @@ -81,7 +81,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-sazanami/pkg-plist b/japanese/font-sazanami/pkg-plist index 773c43f672b2..ed65b0926fa8 100644 --- a/japanese/font-sazanami/pkg-plist +++ b/japanese/font-sazanami/pkg-plist @@ -1,11 +1,8 @@ %%DATADIR%%/sazanami-mincho.ttf %%DATADIR%%/sazanami-gothic.ttf -%%LOCAL_FONTSDIR%%/TTF/sazanami-mincho.ttf -%%LOCAL_FONTSDIR%%/TTF/sazanami-gothic.ttf etc/fonts/conf.avail/20-unhint-sazanami.conf etc/fonts/conf.avail/62-fonts-sazanami.conf etc/fonts/conf.d/20-unhint-sazanami.conf etc/fonts/conf.d/62-fonts-sazanami.conf -%%X_FONTSDIR%%/TTF/sazanami-mincho.ttf -%%X_FONTSDIR%%/TTF/sazanami-gothic.ttf -@fc %%X_FONTSDIR%%/TTF +%%FONTSDIR%%/sazanami-mincho.ttf +%%FONTSDIR%%/sazanami-gothic.ttf |