mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
- Use ../etc/fonts/conf.d mechanism for font config
- General cleanup PR: ports/102007 Submitted by: Matthew Seaman <m.seaman@infracaninophile.co.uk> (maintainer)
This commit is contained in:
parent
8ca878d00f
commit
b6eaf8156b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=171584
@ -9,6 +9,7 @@
|
||||
|
||||
PORTNAME= gentium
|
||||
PORTVERSION= 1.0.2
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-fonts
|
||||
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_102_L_tar&_sc=1&filename=/
|
||||
DISTNAME= ttf-sil-${PORTNAME}_${PORTVERSION}
|
||||
@ -23,8 +24,8 @@ USE_X_PREFIX= yes
|
||||
NO_BUILD= yes
|
||||
WRKSRC= ${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
|
||||
|
||||
PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
|
||||
FONTNAME=${FONTNAME}
|
||||
PLIST_SUB= FONTSDIR="${FONTSDIR}" \
|
||||
FONTNAME="${FONTNAME}"
|
||||
|
||||
SUB_LIST= "FONTSDIR=${FONTSDIR}"
|
||||
SUB_FILES= pkg-message
|
||||
@ -34,7 +35,8 @@ SUB_FILES= pkg-message
|
||||
#
|
||||
|
||||
FONTNAME= ${PORTNAME}
|
||||
FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
|
||||
FONTSDIR?= lib/X11/fonts/${FONTNAME}
|
||||
FONTSTGT= ${PREFIX}/${FONTSDIR}
|
||||
|
||||
DOCSLIST= FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
|
||||
Gentium-RU-A3Proofs.pdf Gentium-RU-Specimen.pdf \
|
||||
@ -49,18 +51,15 @@ DOCSLIST= FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
|
||||
do-install: install-fonts install-conf install-docs
|
||||
|
||||
install-fonts:
|
||||
${MKDIR} ${FONTSDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
|
||||
${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSDIR}
|
||||
${MKDIR} ${FONTSTGT}
|
||||
${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSTGT}
|
||||
${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSTGT}
|
||||
${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSTGT}
|
||||
|
||||
install-conf:
|
||||
${MKDIR} ${PREFIX}/etc/fonts
|
||||
if [ ! -f ${PREFIX}/etc/fonts/local.conf ]; then \
|
||||
${INSTALL_DATA} ${WRKSRC}/local.conf ${PREFIX}/etc/fonts ; \
|
||||
fi
|
||||
${MKDIR} ${PREFIX}/etc/fonts/conf.d
|
||||
${INSTALL_DATA} ${WRKSRC}/local.conf \
|
||||
${PREFIX}/etc/fonts/local.conf-${FONTNAME}
|
||||
${PREFIX}/etc/fonts/conf.d/${FONTNAME}.conf
|
||||
|
||||
install-docs:
|
||||
.if !defined(NOPORTDOCS)
|
||||
@ -72,7 +71,7 @@ install-docs:
|
||||
|
||||
post-install:
|
||||
${ECHO_MSG} "===> Running fc-cache"
|
||||
-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
|
||||
-${X11BASE}/bin/fc-cache -f -v ${FONTSTGT}
|
||||
${ECHO_MSG}
|
||||
${CAT} ${PKGMESSAGE}
|
||||
${ECHO_MSG}
|
||||
|
@ -1,7 +1,7 @@
|
||||
IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
|
||||
before using. The copyright can be found at
|
||||
|
||||
%%FONTSDIR%%/OFL
|
||||
%%PREFIX%%/%%FONTSDIR%%/OFL
|
||||
|
||||
To use these fonts, follow the instructions below.
|
||||
|
||||
@ -12,4 +12,4 @@ line to the "Modules" section of xorg.conf:
|
||||
|
||||
Add the following line to the "Files" section of xorg.conf:
|
||||
|
||||
FontPath "%%FONTSDIR%%/"
|
||||
FontPath "%%PREFIX%%/%%FONTSDIR%%/"
|
||||
|
@ -1,6 +1,4 @@
|
||||
@unexec if cmp -s %D/etc/fonts/local.conf %D/etc/fonts/local.conf-%%FONTNAME%%; then rm -f %D/etc/fonts/local.conf; fi
|
||||
etc/fonts/local.conf-%%FONTNAME%%
|
||||
@exec [ ! -f %B/local.conf ] && cp %B/%f %B/local.conf
|
||||
etc/fonts/conf.d/%%FONTNAME%%.conf
|
||||
%%FONTSDIR%%/GenAI102.ttf
|
||||
%%FONTSDIR%%/GenAR102.ttf
|
||||
%%FONTSDIR%%/GenI102.ttf
|
||||
@ -19,3 +17,4 @@ etc/fonts/local.conf-%%FONTNAME%%
|
||||
@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
|
||||
@dirrm %%FONTSDIR%%
|
||||
@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
|
||||
@dirrmtry etc/fonts/conf.d
|
||||
|
@ -9,6 +9,7 @@
|
||||
|
||||
PORTNAME= gentium
|
||||
PORTVERSION= 1.0.2
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-fonts
|
||||
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_102_L_tar&_sc=1&filename=/
|
||||
DISTNAME= ttf-sil-${PORTNAME}_${PORTVERSION}
|
||||
@ -23,8 +24,8 @@ USE_X_PREFIX= yes
|
||||
NO_BUILD= yes
|
||||
WRKSRC= ${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
|
||||
|
||||
PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
|
||||
FONTNAME=${FONTNAME}
|
||||
PLIST_SUB= FONTSDIR="${FONTSDIR}" \
|
||||
FONTNAME="${FONTNAME}"
|
||||
|
||||
SUB_LIST= "FONTSDIR=${FONTSDIR}"
|
||||
SUB_FILES= pkg-message
|
||||
@ -34,7 +35,8 @@ SUB_FILES= pkg-message
|
||||
#
|
||||
|
||||
FONTNAME= ${PORTNAME}
|
||||
FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
|
||||
FONTSDIR?= lib/X11/fonts/${FONTNAME}
|
||||
FONTSTGT= ${PREFIX}/${FONTSDIR}
|
||||
|
||||
DOCSLIST= FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
|
||||
Gentium-RU-A3Proofs.pdf Gentium-RU-Specimen.pdf \
|
||||
@ -49,18 +51,15 @@ DOCSLIST= FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
|
||||
do-install: install-fonts install-conf install-docs
|
||||
|
||||
install-fonts:
|
||||
${MKDIR} ${FONTSDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
|
||||
${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSDIR}
|
||||
${MKDIR} ${FONTSTGT}
|
||||
${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSTGT}
|
||||
${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSTGT}
|
||||
${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSTGT}
|
||||
|
||||
install-conf:
|
||||
${MKDIR} ${PREFIX}/etc/fonts
|
||||
if [ ! -f ${PREFIX}/etc/fonts/local.conf ]; then \
|
||||
${INSTALL_DATA} ${WRKSRC}/local.conf ${PREFIX}/etc/fonts ; \
|
||||
fi
|
||||
${MKDIR} ${PREFIX}/etc/fonts/conf.d
|
||||
${INSTALL_DATA} ${WRKSRC}/local.conf \
|
||||
${PREFIX}/etc/fonts/local.conf-${FONTNAME}
|
||||
${PREFIX}/etc/fonts/conf.d/${FONTNAME}.conf
|
||||
|
||||
install-docs:
|
||||
.if !defined(NOPORTDOCS)
|
||||
@ -72,7 +71,7 @@ install-docs:
|
||||
|
||||
post-install:
|
||||
${ECHO_MSG} "===> Running fc-cache"
|
||||
-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
|
||||
-${X11BASE}/bin/fc-cache -f -v ${FONTSTGT}
|
||||
${ECHO_MSG}
|
||||
${CAT} ${PKGMESSAGE}
|
||||
${ECHO_MSG}
|
||||
|
@ -1,7 +1,7 @@
|
||||
IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
|
||||
before using. The copyright can be found at
|
||||
|
||||
%%FONTSDIR%%/OFL
|
||||
%%PREFIX%%/%%FONTSDIR%%/OFL
|
||||
|
||||
To use these fonts, follow the instructions below.
|
||||
|
||||
@ -12,4 +12,4 @@ line to the "Modules" section of xorg.conf:
|
||||
|
||||
Add the following line to the "Files" section of xorg.conf:
|
||||
|
||||
FontPath "%%FONTSDIR%%/"
|
||||
FontPath "%%PREFIX%%/%%FONTSDIR%%/"
|
||||
|
@ -1,6 +1,4 @@
|
||||
@unexec if cmp -s %D/etc/fonts/local.conf %D/etc/fonts/local.conf-%%FONTNAME%%; then rm -f %D/etc/fonts/local.conf; fi
|
||||
etc/fonts/local.conf-%%FONTNAME%%
|
||||
@exec [ ! -f %B/local.conf ] && cp %B/%f %B/local.conf
|
||||
etc/fonts/conf.d/%%FONTNAME%%.conf
|
||||
%%FONTSDIR%%/GenAI102.ttf
|
||||
%%FONTSDIR%%/GenAR102.ttf
|
||||
%%FONTSDIR%%/GenI102.ttf
|
||||
@ -19,3 +17,4 @@ etc/fonts/local.conf-%%FONTNAME%%
|
||||
@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
|
||||
@dirrm %%FONTSDIR%%
|
||||
@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
|
||||
@dirrmtry etc/fonts/conf.d
|
||||
|
Loading…
Reference in New Issue
Block a user