Attachment #122566 for bug #165781

View | Details | Raw Unified | Return to bug 165781
Collapse All | Expand All

Lines 1368-1374 Link Here

(-)Mk/bsd.port.mk (-2 / +2 lines)
1368	.include "${PORTSDIR}/Mk/bsd.linux-apps.mk"	1368	.include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
1369	.endif	1369	.endif
1370		1370
1371	.if defined(USE_XORG) \|\| defined(XORG_CAT)	1371	.if defined(USE_XORG) \|\| defined(XORG_CAT) \|\| defined(INSTALLS_FONTS)
1372	.include "${PORTSDIR}/Mk/bsd.xorg.mk"	1372	.include "${PORTSDIR}/Mk/bsd.xorg.mk"
1373	.endif	1373	.endif
1374		1374
Lines 1997-2003 Link Here
1997	.include "${PORTSDIR}/Mk/bsd.local.mk"	1997	.include "${PORTSDIR}/Mk/bsd.local.mk"
1998	.endif	1998	.endif
1999		1999
2000	.if defined(USE_XORG) \|\| defined(XORG_CAT)	2000	.if defined(USE_XORG) \|\| defined(XORG_CAT) \|\| defined(INSTALLS_FONTS)
2001	.include "${PORTSDIR}/Mk/bsd.xorg.mk"	2001	.include "${PORTSDIR}/Mk/bsd.xorg.mk"
2002	.endif	2002	.endif
2003		2003




Xorg_Pre_Include=		bsd.xorg.mk

# Some notes:
#
# app - requires pkgconfig, don't install shared libraries (I guess)
# data - nothing I could factorize
# doc - no particular notes

# lib - various dependencies, install .pc file
# proto - install .pc file, no dependencies, needed only at build time for most of them
# xserver - there's only one atm, I guess everything can fit into the port itself
#
# To create a port dealing with fonts, define:
# - XORG_CAT=font, if it's part of X.Org;
# - INSTALLS_FONTS=yes, otherwise.
# Here is a quick reference of the variables and features available to
# maintainers (for extensive documentation, refer to the Porter's Handbook).
# FONTDIR		- Directory/ies relative to ${FONTROOTDIR} in which fonts are
#				  installed. When there are multiple installation directories,
#				  set it to a reverse alphabetical ordered list of these
#				  directories (still relative to ${FONTROOTDIR}).
#				  Default: ${PORTNAME} without some common suffixes like -ttf
#				  or -fonts, a bit more complicated when
#				  ${XORG_CAT} == "font".
# FONTROOTDIR	- Common fonts installation prefix. A relative version exists:
#				  ${FONTROOTDIR_REL}. You don't need to change these.
#				  Default: ${PREFIX}/lib/X11/fonts when ${XORG_CAT} == "fonts",
#				  ${PREFIX}/share/fonts otherwise.
# Remember: fonts MUST be installed in the directory/ies determined by
# ${FONTROOTDIR} and ${FONTDIR}. You may modify ${FONTDIR} to ensure this, but
# DO NOT change ${FONTROOTDIR}. Make sure the port always adapts to
# ${FONTROOTDIR}. Patch it if needed.
# Additionally, ${FONTDIR} and ${FONTROOTDIR} are passed to ${SUB_LIST} and
# ${PLIST_SUB} (respectively with and without ${PREFIX}). In this case,
# %%FONTDIR%% expands to ${FONTROOTDIR}/${FONTDIR} (and
# ${FONTROOTDIR_REL}/${FONTDIR}). Therefore, if ${FONTDIR} is a list this
# substitution is useless. Use %%FONTROOTDIR%%/<hardcodeddirectoryname>, then.
# Dependency on fontconfig, mkfontscale and mkfontdir is automatically handled,
# as well as post-install/post-deinstall targets using those tools (via
# @fontdir directive). To provide a customized fonts.dir/fonts.scale, install it
# as fonts.dir.fixed/fonts.scale.fixed.
# ${FONTROOTDIR}, and ${FONTDIR} under it (single or multiple), are
# automatically created and removed: no need to ${MKDIR} or @dirrm.
# A pkg-message notifying about FontPath addition to xorg.conf(5) is installed
# automatically when no existing one is found.

.if defined(XORG_CAT)
# Default variables, common to all new modular xorg ports.

. endif

. if ${XORG_CAT} == "font"
INSTALLS_FONTS=	yes
FONTDIR?=		${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
FONTROOTDIR?=	${XORGFONTDIR}
.  if ${PORTNAME} == "encodings" || ${PORTNAME} == "font-alias" || ${PORTNAME} == "font-util"
# These ports do not install any fonts, they just need FONTROOTDIR,
# CONFIGURE_ARGS, CONFIGURE_ENV and PLIST_SUB (some are defined below).
.   undef INSTALLS_FONTS
.  elif ${PORTNAME:M*type1*} == "" && ${PORTNAME:M*ttf*} == "" && ${PORTNAME:M*ethiopic*} == "" && ${PORTNAME:M*meltho*} == ""
# We add this dependency to non-Type1/TTF fonts, i.e., bitmap fonts.
.  elif ${PORTNAME:M*encodings*}x != x
# This is terrific, we want mkfontscale at build time, but don't use it like for the other ports.
NEED_MKFONTFOO=	no
BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
INSTALLS_TTF?=	no
.  else
INSTALLS_TTF?=	no
.  endif

.  if ${PORTNAME:M*font-util*}x != x
USE_GNOME+=	gnomehack
NEED_MKFONTFOO=	no
.  elif ${INSTALLS_TTF} == "yes"
USE_GNOME+=	pkgconfig
BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
.  else
BUILD_DEPENDS+=	${LOCALBASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
.  endif

.  if ${NEED_MKFONTFOO} == "yes"
BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
				${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
RUN_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
				${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
.  endif

post-install:
.  if ${INSTALLS_TTF} == "yes"
.   for _fontdir in ${FONTDIR}
	@${ECHO_CMD} "@exec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
.   endfor
.  endif
.  for _fontdir in ${FONTDIR}
.   if ${NEED_MKFONTFOO} == "yes"
	@${ECHO_CMD} "@exec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.scale -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.scale 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.scale; fi" >> ${TMPPLIST}
	@${ECHO_CMD} "@exec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.dir -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.dir 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.dir; fi" >> ${TMPPLIST}
.   endif
	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
.  endfor
. endif

. if ${XORG_CAT} == "lib"


.endif

.if defined(INSTALLS_FONTS)
# We will set USE_GNOME in post-makefile section, so we need this.
WANT_GNOME=	yes
.endif

.endif

.if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)

		done
.endif

# We check fot XORG_CAT as this section is for those ports (listed above) with
# XORG_CAT set to "font" which don't set INSTALLS_FONTS.
.if defined(XORG_CAT) && ${XORG_CAT} == "font" || defined(INSTALLS_FONTS)
# Default X.Org font installation directory.
XORGFONTDIR?=	${PREFIX}/lib/X11/fonts
FONTROOTDIR_REL?=	${FONTROOTDIR:S,^${PREFIX}/,,}
CONFIGURE_ARGS+=	--with-fontrootdir=${FONTROOTDIR}
CONFIGURE_ENV+=	FONTROOTDIR=${FONTROOTDIR}
# When FONTDIR is set to multiple directories, we can't use it in
# plist: use FONTROOTDIR then, and hardcode remaining path.
PLIST_SUB+=		FONTDIR="${FONTROOTDIR_REL}/${FONTDIR}" \
				FONTROOTDIR="${FONTROOTDIR_REL}"
.endif

.if defined(INSTALLS_FONTS)
FONTDIR?=		${PORTNAME:C/[-_][ot]tf$//:C/[-_]([ot]t)?fonts?$//}
# Non-X.Org fonts go here.
FONTROOTDIR?=	${PREFIX}/share/fonts
USE_GNOME+=		pkgconfig
FONT_DEPENDS=	${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
				${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
				${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig
BUILD_DEPENDS+=	${FONT_DEPENDS}
RUN_DEPENDS+=	${FONT_DEPENDS}
# The same logic of PLIST_SUB applies.
SUB_LIST+=		FONTDIR="${FONTROOTDIR}/${FONTDIR}" \
				FONTROOTDIR="${FONTROOTDIR}"
.endif

.if defined(INSTALLS_FONTS)
# Install a default pkg-message in non-X.Org ports which don't provide
# one already.
. if !defined(XORG_CAT) && !exists(${PKGMESSAGE}) && (!exists(${FILESDIR}/pkg-message.in) || defined(SUB_FILES) && ${SUB_FILES:Mpkg-message} == "")
FONTPKGMESSAGE=	yes
PKGMESSAGE=		${WRKDIR}/pkg-message
. else
FONTPKGMESSAGE=	no
. endif

. if defined(XORG_CAT)
pre-configure: fonts-pre-configure

# Keep X.Org ports from running mkfontscale, mkfontdir and fc-cache: we'll do
# that later.
fonts-pre-configure:
	-@${REINPLACE_CMD} -e '/MKFONTSCALE/ d; /MKFONTDIR/ d; /FCCACHE/ d' \
		${WRKSRC}/Makefile.in
. endif

pre-install: fonts-pre-install
post-install: fonts-post-install
# fonts-post-install would be better, but would "fail" if fonts.dir.fixed is
# installed in post-install, so we create a target which comes later.
add-plist-post: add-plist-fontdirs

fonts-pre-install:
. if ${FONTPKGMESSAGE} == yes
	@${ECHO_CMD} 'To use these fonts, add the following line(s) to the "Files" section' > ${PKGMESSAGE}
	@${ECHO_CMD} "of xorg.conf(5):" >> ${PKGMESSAGE}
	@${ECHO_CMD} >> ${PKGMESSAGE}
. endif
. for _fontdir in ${FONTDIR:O:S,^,${FONTROOTDIR}/,}
	@${MKDIR} ${_fontdir}
.  if ${FONTPKGMESSAGE} == yes
	@${ECHO_CMD} "	FontPath \"${_fontdir}/\"" >> ${PKGMESSAGE}
.  endif
. endfor

fonts-post-install:
. if ${FONTPKGMESSAGE} == yes
	@${CAT} ${PKGMESSAGE}
. endif

add-plist-fontdirs:
. for _fontdir in ${FONTDIR:S,^,${FONTROOTDIR_REL}/,}
	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
.  if defined(WITH_PKGNG)
	@${ECHO_CMD} "@fontdir ${_fontdir}" >> ${TMPPLIST}
.  endif
	@${ECHO_MSG} "===>   Updating font cache"
.  for t in scale dir
	@${ECHO_CMD} "mkfont${t} ${PREFIX}/${_fontdir}"
	@if [ -e ${PREFIX}/${_fontdir}/fonts.${t}.fixed ]; then \
		${CP} ${PREFIX}/${_fontdir}/fonts.${t}.fixed ${PREFIX}/${_fontdir}/fonts.${t}; \
	else \
		mkfont${t} ${PREFIX}/${_fontdir}; \
	fi
	@if [ -e ${PREFIX}/${_fontdir}/fonts.${t} -a "`stat -f '%z' ${PREFIX}/${_fontdir}/fonts.${t}`" = '2' ]; then ${RM} ${PREFIX}/${_fontdir}/fonts.${t}; fi
.   if !defined(WITH_PKGNG)
	@${ECHO_CMD} "@exec if [ -e %D/${_fontdir}/fonts.${t}.fixed ]; then ${CP} %D/${_fontdir}/fonts.${t}.fixed %D/${_fontdir}/fonts.${t}; else mkfont${t} %D/${_fontdir}; fi" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec mkfont${t} %D/${_fontdir}" >> ${TMPPLIST}
.    for cmd in exec unexec
	@${ECHO_CMD} "@${cmd} if [ -e %D/${_fontdir}/fonts.${t} -a \"\`stat -f '%%z' %D/${_fontdir}/fonts.${t}\`\" = '2' ]; then ${RM} %D/${_fontdir}/fonts.${t}; fi" >> ${TMPPLIST}
.    endfor
.   endif
.  endfor
	fc-cache -s ${PREFIX}/${_fontdir}
.  if !defined(WITH_PKGNG)
	@${ECHO_CMD} "@exec fc-cache -s %D/${_fontdir}" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec fc-cache -s %D/${_fontdir}" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec ${RMDIR} %D/${_fontdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
.  endif
. endfor
. if !defined(XORG_CAT)
.  if defined(WITH_PKGNG)
	@${ECHO_CMD} "@dirrmtry ${FONTROOTDIR_REL}" >> ${TMPPLIST}
.  else
	@${ECHO_CMD} "@unexec ${RMDIR} %D/${FONTROOTDIR_REL} 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
.  endif
. endif
.endif

.endif




actions: [dirrmtry,]
post-install: |
  for t in scale dir; do
    index=%D/%@/fonts.$t
    if [ -e $index.fixed ]; then
      cp $index.fixed $index
    else
      mkfont$t %D/%@
      [ -e $index -a "`stat -f '%z' $index`" = '2' ] &&
        rm -f $index
    fi
  done
  fc-cache -s %D/%@
post-deinstall: |
  for t in scale dir; do
    index=%D/%@/fonts.$t
    mkfont$t %D/%@
    [ -e $index -a "`stat -f '%z' $index`" = '2' ] &&
      rm -f $index
  done
  fc-cache -s %D/%@

Lines 13-20 Link Here

(-)x11-fonts/encodings/Makefile (-2 / +3 lines)
13	MAINTAINER= x11@FreeBSD.org	13	MAINTAINER= x11@FreeBSD.org
14	COMMENT= X.Org Encoding fonts	14	COMMENT= X.Org Encoding fonts
15		15
16	XORG_CAT= font	16	BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
		17
17	USE_XORG= fontutil	18	USE_XORG= fontutil
18	FONTDIR= encodings/large encodings	19	XORG_CAT= font
19		20
20	.include <bsd.port.mk>	21	.include <bsd.port.mk>




%%FONTDIR%%/adobe-dingbats.enc.gz
%%FONTDIR%%/adobe-standard.enc.gz
%%FONTDIR%%/adobe-symbol.enc.gz
%%FONTDIR%%/armscii-8.enc.gz
%%FONTDIR%%/ascii-0.enc.gz
%%FONTDIR%%/dec-special.enc.gz
%%FONTDIR%%/encodings.dir
%%FONTDIR%%/ibm-cp437.enc.gz
%%FONTDIR%%/ibm-cp850.enc.gz
%%FONTDIR%%/ibm-cp852.enc.gz
%%FONTDIR%%/ibm-cp866.enc.gz
%%FONTDIR%%/iso8859-11.enc.gz
%%FONTDIR%%/iso8859-13.enc.gz
%%FONTDIR%%/iso8859-16.enc.gz
%%FONTDIR%%/iso8859-6.16.enc.gz
%%FONTDIR%%/iso8859-6.8x.enc.gz
%%FONTDIR%%/large/big5.eten-0.enc.gz
%%FONTDIR%%/large/big5hkscs-0.enc.gz
%%FONTDIR%%/large/cns11643-1.enc.gz
%%FONTDIR%%/large/cns11643-2.enc.gz
%%FONTDIR%%/large/cns11643-3.enc.gz
%%FONTDIR%%/large/encodings.dir
%%FONTDIR%%/large/gb18030-0.enc.gz
%%FONTDIR%%/large/gb18030.2000-0.enc.gz
%%FONTDIR%%/large/gb18030.2000-1.enc.gz
%%FONTDIR%%/large/gb2312.1980-0.enc.gz
%%FONTDIR%%/large/gbk-0.enc.gz
%%FONTDIR%%/large/jisx0201.1976-0.enc.gz
%%FONTDIR%%/large/jisx0208.1990-0.enc.gz
%%FONTDIR%%/large/jisx0212.1990-0.enc.gz
%%FONTDIR%%/large/ksc5601.1987-0.enc.gz
%%FONTDIR%%/large/ksc5601.1992-3.enc.gz
%%FONTDIR%%/large/sun.unicode.india-0.enc.gz
%%FONTDIR%%/microsoft-cp1250.enc.gz
%%FONTDIR%%/microsoft-cp1251.enc.gz
%%FONTDIR%%/microsoft-cp1252.enc.gz
%%FONTDIR%%/microsoft-cp1253.enc.gz
%%FONTDIR%%/microsoft-cp1254.enc.gz
%%FONTDIR%%/microsoft-cp1255.enc.gz
%%FONTDIR%%/microsoft-cp1256.enc.gz
%%FONTDIR%%/microsoft-cp1257.enc.gz
%%FONTDIR%%/microsoft-cp1258.enc.gz
%%FONTDIR%%/microsoft-win3.1.enc.gz
%%FONTDIR%%/mulearabic-0.enc.gz
%%FONTDIR%%/mulearabic-1.enc.gz
%%FONTDIR%%/mulearabic-2.enc.gz
%%FONTDIR%%/mulelao-1.enc.gz
%%FONTDIR%%/suneu-greek.enc.gz
%%FONTDIR%%/tcvn-0.enc.gz
%%FONTDIR%%/tis620-2.enc.gz
%%FONTDIR%%/viscii1.1-1.enc.gz
@dirrm %%FONTDIR%%/large
@dirrm %%FONTDIR%%

Lines 7-18 Link Here

(-)x11-fonts/font-alias/Makefile (-1 / +5 lines)
7		7
8	PORTNAME= font-alias	8	PORTNAME= font-alias
9	PORTVERSION= 1.0.3	9	PORTVERSION= 1.0.3
		10	PORTREVISION= 1
10	CATEGORIES= x11-fonts	11	CATEGORIES= x11-fonts
11		12
12	MAINTAINER= x11@FreeBSD.org	13	MAINTAINER= x11@FreeBSD.org
13	COMMENT= X.Org Font aliases	14	COMMENT= X.Org Font aliases
14		15
15	XORG_CAT= font	16	XORG_CAT= font
16	FONTDIR= 100dpi 75dpi misc cyrillic	17	FONTDIR= misc cyrillic 75dpi 100dpi
		18
		19	PLIST_FILES= ${PLIST_DIRSTRY:S,$,/fonts.alias,}
		20	PLIST_DIRSTRY= ${FONTDIR:S,^,${FONTROOTDIR_REL}/,}
17		21
18	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Removed Link Here

(-)x11-fonts/font-alias/pkg-plist (-4 lines)
1	lib/X11/fonts/100dpi/fonts.alias
2	lib/X11/fonts/75dpi/fonts.alias
3	lib/X11/fonts/cyrillic/fonts.alias
4	lib/X11/fonts/misc/fonts.alias

Lines 12-17 Link Here

(-)x11-fonts/font-util/Makefile (+1 lines)
12	MAINTAINER= x11@FreeBSD.org	12	MAINTAINER= x11@FreeBSD.org
13	COMMENT= Create an index of X font files in a directory	13	COMMENT= Create an index of X font files in a directory
14		14
		15	USE_GNOME= gnomehack
15	XORG_CAT= font	16	XORG_CAT= font
16		17
17	MAN1= bdftruncate.1 ucs2any.1	18	MAN1= bdftruncate.1 ucs2any.1




bin/bdftruncate
bin/ucs2any
%%FONTDIR%%/map-ISO8859-1
%%FONTDIR%%/map-ISO8859-10
%%FONTDIR%%/map-ISO8859-11
%%FONTDIR%%/map-ISO8859-13
%%FONTDIR%%/map-ISO8859-14
%%FONTDIR%%/map-ISO8859-15
%%FONTDIR%%/map-ISO8859-16
%%FONTDIR%%/map-ISO8859-2
%%FONTDIR%%/map-ISO8859-3
%%FONTDIR%%/map-ISO8859-4
%%FONTDIR%%/map-ISO8859-5
%%FONTDIR%%/map-ISO8859-6
%%FONTDIR%%/map-ISO8859-7
%%FONTDIR%%/map-ISO8859-8
%%FONTDIR%%/map-ISO8859-9
%%FONTDIR%%/map-JISX0201.1976-0
%%FONTDIR%%/map-KOI8-R
libdata/pkgconfig/fontutil.pc
share/aclocal/fontutil.m4
@dirrm %%FONTDIR%%





PORTNAME=	CharisSIL
PORTVERSION=	4.110
PORTREVISION=	1
CATEGORIES=	x11-fonts
MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
		LOCAL/bf
MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory

MAINTAINER=	bf@FreeBSD.org
COMMENT=	Charis SIL TrueType font collection

LICENSE_FILE=	${WRKSRC}/OFL.txt
LICENSE_PERMS=	auto-accept

INSTALLS_FONTS=	yes
XORG_CAT=	font

FONTROOTDIR=	${PREFIX}/lib/X11/fonts
INSTALLS_TTF=	yes
MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
USE_ZIP=	yes
NO_BUILD=	yes
USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP

.for type in B BI I R
PLIST_FILES+=	${FONTROOTDIR_REL}/${FONTDIR}/${PORTNAME}-${type}.ttf
.endfor

.if !defined(NOPORTDOCS)
PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
.endif

SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
SUB_FILES=	pkg-message

do-configure:
	@${DO_NADA}

do-install:
	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
.endif
	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_MSG}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-fonts/charis/distinfo (-2 / +2 lines)
1	SHA256 (xorg/font/CharisSIL-4.110.zip) = 97bf74d1bb8301e7688abf1481515920a84d47e3d325ce3eb0d8ee9a16cb3264	1	SHA256 (CharisSIL-4.110.zip) = 97bf74d1bb8301e7688abf1481515920a84d47e3d325ce3eb0d8ee9a16cb3264
2	SIZE (xorg/font/CharisSIL-4.110.zip) = 3435758	2	SIZE (CharisSIL-4.110.zip) = 3435758

Removed Link Here

(-)x11-fonts/charis/files/pkg-message.in (-11 lines)
1	To use these fonts, add the following line to the "Files" section of
2	xorg.conf:
3
4	FontPath "%%DIR%%/"
5
6	Users of older versions of X may additionally have to make sure that
7	the freetype module is loaded. Check /var/log/Xorg.0.log for error
8	messages. If freetype is required, add the following line to the
9	"Modules" section of xorg.conf:
10
11	Load "freetype"





PORTNAME=	CharisSILCompact
PORTVERSION=	4.110
PORTREVISION=	2
CATEGORIES=	x11-fonts
#unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy
.if defined(MAINTAINER_MODE)

.else
MASTER_SITES=	LOCAL/bf
.endif
MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory

MAINTAINER=	bf@FreeBSD.org
COMMENT=	Charis SIL TrueType font collection, compact variant

LICENSE_FILE=	${WRKSRC}/OFL.txt
LICENSE_PERMS=	auto-accept

INSTALLS_FONTS=	yes
USE_ZIP=	yes
XORG_CAT=	font

FONTROOTDIR=	${PREFIX}/lib/X11/fonts
INSTALLS_TTF=	yes
NO_BUILD=	yes
USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP

.for type in B BI I R
PLIST_FILES+=	${FONTROOTDIR_REL}/${FONTDIR}/${PORTNAME}-${type}.ttf
.endfor

.if !defined(NOPORTDOCS)
PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml
.endif

SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
SUB_FILES=	pkg-message

do-configure:
	@${DO_NADA}

do-install:
	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
.endif
	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_MSG}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-fonts/charis-compact/distinfo (-2 / +2 lines)
1	SHA256 (xorg/font/CharisSILCompact-4.110.zip) = 7360bfda93d58ae6673bc48499360219e49d102f9ad648c65f5428c2e1bc6960	1	SHA256 (CharisSILCompact-4.110.zip) = 7360bfda93d58ae6673bc48499360219e49d102f9ad648c65f5428c2e1bc6960
2	SIZE (xorg/font/CharisSILCompact-4.110.zip) = 3384203	2	SIZE (CharisSILCompact-4.110.zip) = 3384203

Removed Link Here

(-)x11-fonts/charis-compact/files/pkg-message.in (-11 lines)
1	To use these fonts, add the following line to the "Files" section of
2	xorg.conf:
3
4	FontPath "%%DIR%%/"
5
6	Users of older versions of X may additionally have to make sure that
7	the freetype module is loaded. Check /var/log/Xorg.0.log for error
8	messages. If freetype is required, add the following line to the
9	"Modules" section of xorg.conf:
10
11	Load "freetype"





PORTNAME=	DoulosSIL
PORTVERSION=	4.110
PORTREVISION=	1
CATEGORIES=	x11-fonts
MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
		LOCAL/bf
MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory

MAINTAINER=	bf@FreeBSD.org
COMMENT=	Doulos SIL TrueType font collection

LICENSE_FILE=	${WRKSRC}/OFL.txt
LICENSE_PERMS=	auto-accept

INSTALLS_FONTS=	yes
XORG_CAT=	font

FONTROOTDIR=	${PREFIX}/lib/X11/fonts
INSTALLS_TTF=	yes
MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
USE_ZIP=	yes
NO_BUILD=	yes
USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP

PLIST_FILES=	${FONTROOTDIR_REL}/${FONTDIR}/${PORTNAME}-R.ttf

.if !defined(NOPORTDOCS)
PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
.endif

SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
SUB_FILES=	pkg-message

do-configure:
	@${DO_NADA}

do-install:
	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
.endif
	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_MSG}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-fonts/doulos/distinfo (-2 / +2 lines)
1	SHA256 (xorg/font/DoulosSIL-4.110.zip) = 8bb5701a182e9100be44dfbfc68535f2c0a5310368b25aee62280fa73194b16d	1	SHA256 (DoulosSIL-4.110.zip) = 8bb5701a182e9100be44dfbfc68535f2c0a5310368b25aee62280fa73194b16d
2	SIZE (xorg/font/DoulosSIL-4.110.zip) = 1498994	2	SIZE (DoulosSIL-4.110.zip) = 1498994

Removed Link Here

(-)x11-fonts/doulos/files/pkg-message.in (-11 lines)
1	To use these fonts, add the following line to the "Files" section of
2	xorg.conf:
3
4	FontPath "%%DIR%%/"
5
6	Users of older versions of X may additionally have to make sure that
7	the freetype module is loaded. Check /var/log/Xorg.0.log for error
8	messages. If freetype is required, add the following line to the
9	"Modules" section of xorg.conf:
10
11	Load "freetype"





PORTNAME=	DoulosSILCompact
PORTVERSION=	4.110
PORTREVISION=	2
CATEGORIES=	x11-fonts
#unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy
.if defined(MAINTAINER_MODE)

.else
MASTER_SITES=	LOCAL/bf
.endif
MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory

MAINTAINER=	bf@FreeBSD.org
COMMENT=	Doulos SIL TrueType font collection, compact variant

LICENSE_FILE=	${WRKSRC}/OFL.txt
LICENSE_PERMS=	auto-accept

INSTALLS_FONTS=	yes
USE_ZIP=	yes
XORG_CAT=	font

FONTROOTDIR=	${PREFIX}/lib/X11/fonts
INSTALLS_TTF=	yes
NO_BUILD=	yes
USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP

PLIST_FILES=	${FONTROOTDIR_REL}/${FONTDIR}/${PORTNAME}-R.ttf

.if !defined(NOPORTDOCS)
PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml
.endif

SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
SUB_FILES=	pkg-message

do-configure:
	@${DO_NADA}

do-install:
	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
.endif
	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_MSG}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-fonts/doulos-compact/distinfo (-2 / +2 lines)
1	SHA256 (xorg/font/DoulosSILCompact-4.110.zip) = 9a9ccec7a722ba86d7b45aa335fa4fdab23e46392876358b6ac99dc6233a8b92	1	SHA256 (DoulosSILCompact-4.110.zip) = 9a9ccec7a722ba86d7b45aa335fa4fdab23e46392876358b6ac99dc6233a8b92
2	SIZE (xorg/font/DoulosSILCompact-4.110.zip) = 1491644	2	SIZE (DoulosSILCompact-4.110.zip) = 1491644

Removed Link Here

(-)x11-fonts/doulos-compact/files/pkg-message.in (-11 lines)
1	To use these fonts, add the following line to the "Files" section of
2	xorg.conf:
3
4	FontPath "%%DIR%%/"
5
6	Users of older versions of X may additionally have to make sure that
7	the freetype module is loaded. Check /var/log/Xorg.0.log for error
8	messages. If freetype is required, add the following line to the
9	"Modules" section of xorg.conf:
10
11	Load "freetype"





PORTNAME=	paratype
PORTVERSION=	2.004
PORTREVISION=	4
CATEGORIES=	x11-fonts
MASTER_SITES=	http://paratype.0xdc.ru/
MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
DISTFILES=	PTSansOFL-2.004.zip PTSerifOFL-1.000.zip PTMonoOFL-1.002.zip

MAINTAINER=	littlesavage@rambler.ru

LICENSE_FILE=	${WRKSRC}/PTSansPTSerifOFL.txt
LICENSE_PERMS=	auto-accept

INSTALLS_FONTS=	yes
FONTDIR=	ParaType
NO_BUILD=	yes
NO_WRKSUBDIR=	yes
USE_TGZ=	yes
USE_ZIP=	yes
XORG_CAT=	font

FONTDIR=	ParaType
FONTROOTDIR=	${PREFIX}/lib/X11/fonts
PLIST_SUB=	FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}"
SUB_FILES=	pkg-message
SUB_LIST=	FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}"

do-configure:
	@${DO_NADA}

do-install:
	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
	@${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}/
	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_MSG}

.include <bsd.port.mk>

Lines 1-6 Link Here

(-)x11-fonts/paratype/distinfo (-6 / +6 lines)
1	SHA256 (xorg/font/PTSansOFL-2.004.zip) = 7105b5e7d9965b5b2fa189b5a84c66a8252b3432c0293f1350c15ad159447ee1	1	SHA256 (PTSansOFL-2.004.zip) = 7105b5e7d9965b5b2fa189b5a84c66a8252b3432c0293f1350c15ad159447ee1
2	SIZE (xorg/font/PTSansOFL-2.004.zip) = 1600360	2	SIZE (PTSansOFL-2.004.zip) = 1600360
3	SHA256 (xorg/font/PTSerifOFL-1.000.zip) = 1bf55f3cf143a5e22501de18e597677ed81aaad9c12019146a9e3735e06543a5	3	SHA256 (PTSerifOFL-1.000.zip) = 1bf55f3cf143a5e22501de18e597677ed81aaad9c12019146a9e3735e06543a5
4	SIZE (xorg/font/PTSerifOFL-1.000.zip) = 1029464	4	SIZE (PTSerifOFL-1.000.zip) = 1029464
5	SHA256 (xorg/font/PTMonoOFL-1.002.zip) = beba94b5c56816a2844880fc241a6752fde7dbc238c03bc4f4ec6d34964d6676	5	SHA256 (PTMonoOFL-1.002.zip) = beba94b5c56816a2844880fc241a6752fde7dbc238c03bc4f4ec6d34964d6676
6	SIZE (xorg/font/PTMonoOFL-1.002.zip) = 100806	6	SIZE (PTMonoOFL-1.002.zip) = 100806

Removed Link Here

(-)x11-fonts/paratype/files/pkg-message.in (-11 lines)
1	To use these fonts, add the following line to the "Files" section of
2	xorg.conf:
3
4	FontPath "%%PREFIX%%/%%FONTDIR%%/"
5
6	Users of older versions of X may additionally have to make sure that
7	the freetype module is loaded. Check /var/log/Xorg.0.log for error
8	messages. If freetype is required, add the following line to the
9	"Modules" section of xorg.conf:
10
11	Load "freetype"





PORTNAME=	inconsolata-ttf
PORTVERSION=	20090215
PORTREVISION=	1
CATEGORIES=	x11-fonts
MASTER_SITES=	http://www.levien.com/type/myfonts/
DISTNAME=	Inconsolata

MAINTAINER=	ashish@FreeBSD.org
COMMENT=	A monospaced truetype font

INSTALLS_FONTS=	yes
INSTALLS_TTF=	yes
XORG_CAT=	font
FONTDIR=	OTF
NO_BUILD=	yes

PLIST_FILES=	${FONTROOTDIR_REL}/${FONTDIR}/${DISTNAME}${EXTRACT_SUFX}

do-build:

do-install:
	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${FONTROOTDIR}/${FONTDIR}
	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${PREFIX}/lib/X11/fonts/${FONTDIR}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-fonts/inconsolata-ttf/distinfo (-2 / +2 lines)
1	SHA256 (xorg/font/Inconsolata.otf) = 1561e616c414a1b82d6e6dfbd18e5726fd65028913ade191e5fa38b6ec375a1a	1	SHA256 (Inconsolata.otf) = 1561e616c414a1b82d6e6dfbd18e5726fd65028913ade191e5fa38b6ec375a1a
2	SIZE (xorg/font/Inconsolata.otf) = 58464	2	SIZE (Inconsolata.otf) = 58464

Return to bug 165781

Lines 16-22 Link Here

(-)Mk/bsd.xorg.mk (-54 / +160 lines)
16	Xorg_Pre_Include= bsd.xorg.mk	16	Xorg_Pre_Include= bsd.xorg.mk
17		17
18	# Some notes:	18	# Some notes:
19	#
20	# app - requires pkgconfig, don't install shared libraries (I guess)	19	# app - requires pkgconfig, don't install shared libraries (I guess)
21	# data - nothing I could factorize	20	# data - nothing I could factorize
22	# doc - no particular notes	21	# doc - no particular notes
Lines 26-31 Link Here
26	# lib - various dependencies, install .pc file	25	# lib - various dependencies, install .pc file
27	# proto - install .pc file, no dependencies, needed only at build time for most of them	26	# proto - install .pc file, no dependencies, needed only at build time for most of them
28	# xserver - there's only one atm, I guess everything can fit into the port itself	27	# xserver - there's only one atm, I guess everything can fit into the port itself
		28	#
		29	# To create a port dealing with fonts, define:
		30	# - XORG_CAT=font, if it's part of X.Org;
		31	# - INSTALLS_FONTS=yes, otherwise.
		32	# Here is a quick reference of the variables and features available to
		33	# maintainers (for extensive documentation, refer to the Porter's Handbook).
		34	# FONTDIR - Directory/ies relative to ${FONTROOTDIR} in which fonts are
		35	# installed. When there are multiple installation directories,
		36	# set it to a reverse alphabetical ordered list of these
		37	# directories (still relative to ${FONTROOTDIR}).
		38	# Default: ${PORTNAME} without some common suffixes like -ttf
		39	# or -fonts, a bit more complicated when
		40	# ${XORG_CAT} == "font".
		41	# FONTROOTDIR - Common fonts installation prefix. A relative version exists:
		42	# ${FONTROOTDIR_REL}. You don't need to change these.
		43	# Default: ${PREFIX}/lib/X11/fonts when ${XORG_CAT} == "fonts",
		44	# ${PREFIX}/share/fonts otherwise.
		45	# Remember: fonts MUST be installed in the directory/ies determined by
		46	# ${FONTROOTDIR} and ${FONTDIR}. You may modify ${FONTDIR} to ensure this, but
		47	# DO NOT change ${FONTROOTDIR}. Make sure the port always adapts to
		48	# ${FONTROOTDIR}. Patch it if needed.
		49	# Additionally, ${FONTDIR} and ${FONTROOTDIR} are passed to ${SUB_LIST} and
		50	# ${PLIST_SUB} (respectively with and without ${PREFIX}). In this case,
		51	# %%FONTDIR%% expands to ${FONTROOTDIR}/${FONTDIR} (and
		52	# ${FONTROOTDIR_REL}/${FONTDIR}). Therefore, if ${FONTDIR} is a list this
		53	# substitution is useless. Use %%FONTROOTDIR%%/<hardcodeddirectoryname>, then.
		54	# Dependency on fontconfig, mkfontscale and mkfontdir is automatically handled,
		55	# as well as post-install/post-deinstall targets using those tools (via
		56	# @fontdir directive). To provide a customized fonts.dir/fonts.scale, install it
		57	# as fonts.dir.fixed/fonts.scale.fixed.
		58	# ${FONTROOTDIR}, and ${FONTDIR} under it (single or multiple), are
		59	# automatically created and removed: no need to ${MKDIR} or @dirrm.
		60	# A pkg-message notifying about FontPath addition to xorg.conf(5) is installed
		61	# automatically when no existing one is found.
29		62
30	.if defined(XORG_CAT)	63	.if defined(XORG_CAT)
31	# Default variables, common to all new modular xorg ports.	64	# Default variables, common to all new modular xorg ports.
Lines 60-120 Link Here
60	. endif	93	. endif
61		94
62	. if ${XORG_CAT} == "font"	95	. if ${XORG_CAT} == "font"
63	FONTDIR?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}	96	INSTALLS_FONTS= yes
64	CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/lib/X11/fonts	97	FONTDIR?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
65	CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/lib/X11/fonts	98	FONTROOTDIR?= ${XORGFONTDIR}
66	NEED_MKFONTFOO= yes	99	. if ${PORTNAME} == "encodings" \|\| ${PORTNAME} == "font-alias" \|\| ${PORTNAME} == "font-util"
67		100	# These ports do not install any fonts, they just need FONTROOTDIR,
68	. if ${PORTNAME:Mtype1}x != x	101	# CONFIGURE_ARGS, CONFIGURE_ENV and PLIST_SUB (some are defined below).
69	INSTALLS_TTF?= yes	102	. undef INSTALLS_FONTS
70	. elif ${PORTNAME:Mttf}x != x	103	. elif ${PORTNAME:Mtype1} == "" && ${PORTNAME:Mttf} == "" && ${PORTNAME:Methiopic} == "" && ${PORTNAME:Mmeltho} == ""
71	INSTALLS_TTF?= yes	104	# We add this dependency to non-Type1/TTF fonts, i.e., bitmap fonts.
72	. elif ${PORTNAME:Mencodings}x != x
73	# This is terrific, we want mkfontscale at build time, but don't use it like for the other ports.
74	NEED_MKFONTFOO= no
75	BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
76	INSTALLS_TTF?= no
77	. else
78	INSTALLS_TTF?= no
79	. endif
80
81	. if ${PORTNAME:Mfont-util}x != x
82	USE_GNOME+= gnomehack
83	NEED_MKFONTFOO= no
84	. elif ${INSTALLS_TTF} == "yes"
85	USE_GNOME+= pkgconfig
86	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
87	RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
88	. else
89	BUILD_DEPENDS+= ${LOCALBASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf	105	BUILD_DEPENDS+= ${LOCALBASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
90	. endif	106	. endif
91
92	. if ${NEED_MKFONTFOO} == "yes"
93	BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
94	${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
95	RUN_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
96	${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
97	. endif
98
99	post-install:
100	. if ${INSTALLS_TTF} == "yes"
101	. for _fontdir in ${FONTDIR}
102	@${ECHO_CMD} "@exec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null \|\| true" >> ${TMPPLIST}
103	@${ECHO_CMD} "@unexec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null \|\| true" >> ${TMPPLIST}
104	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null \|\| true" >> ${TMPPLIST}
105	. endfor
106	. endif
107	. for _fontdir in ${FONTDIR}
108	. if ${NEED_MKFONTFOO} == "yes"
109	@${ECHO_CMD} "@exec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null \|\| true" >> ${TMPPLIST}
110	@${ECHO_CMD} "@unexec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null \|\| true" >> ${TMPPLIST}
111	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.scale -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.scale 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.scale; fi" >> ${TMPPLIST}
112	@${ECHO_CMD} "@exec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null \|\| true" >> ${TMPPLIST}
113	@${ECHO_CMD} "@unexec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null \|\| true" >> ${TMPPLIST}
114	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.dir -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.dir 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.dir; fi" >> ${TMPPLIST}
115	. endif
116	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null \|\| true" >> ${TMPPLIST}
117	. endfor
118	. endif	107	. endif
119		108
120	. if ${XORG_CAT} == "lib"	109	. if ${XORG_CAT} == "lib"
Lines 139-144 Link Here
139		128
140	.endif	129	.endif
141		130
		131	.if defined(INSTALLS_FONTS)
		132	# We will set USE_GNOME in post-makefile section, so we need this.
		133	WANT_GNOME= yes
		134	.endif
		135
142	.endif	136	.endif
143		137
144	.if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)	138	.if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)
Lines 260-263 Link Here
260	done	254	done
261	.endif	255	.endif
262		256
		257	# We check fot XORG_CAT as this section is for those ports (listed above) with
		258	# XORG_CAT set to "font" which don't set INSTALLS_FONTS.
		259	.if defined(XORG_CAT) && ${XORG_CAT} == "font" \|\| defined(INSTALLS_FONTS)
		260	# Default X.Org font installation directory.
		261	XORGFONTDIR?= ${PREFIX}/lib/X11/fonts
		262	FONTROOTDIR_REL?= ${FONTROOTDIR:S,^${PREFIX}/,,}
		263	CONFIGURE_ARGS+= --with-fontrootdir=${FONTROOTDIR}
		264	CONFIGURE_ENV+= FONTROOTDIR=${FONTROOTDIR}
		265	# When FONTDIR is set to multiple directories, we can't use it in
		266	# plist: use FONTROOTDIR then, and hardcode remaining path.
		267	PLIST_SUB+= FONTDIR="${FONTROOTDIR_REL}/${FONTDIR}" \
		268	FONTROOTDIR="${FONTROOTDIR_REL}"
		269	.endif
		270
		271	.if defined(INSTALLS_FONTS)
		272	FONTDIR?= ${PORTNAME:C/[-_][ot]tf$//:C/[-_]([ot]t)?fonts?$//}
		273	# Non-X.Org fonts go here.
		274	FONTROOTDIR?= ${PREFIX}/share/fonts
		275	USE_GNOME+= pkgconfig
		276	FONT_DEPENDS= ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
		277	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
		278	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig
		279	BUILD_DEPENDS+= ${FONT_DEPENDS}
		280	RUN_DEPENDS+= ${FONT_DEPENDS}
		281	# The same logic of PLIST_SUB applies.
		282	SUB_LIST+= FONTDIR="${FONTROOTDIR}/${FONTDIR}" \
		283	FONTROOTDIR="${FONTROOTDIR}"
		284	.endif
		285
		286	.if defined(INSTALLS_FONTS)
		287	# Install a default pkg-message in non-X.Org ports which don't provide
		288	# one already.
		289	. if !defined(XORG_CAT) && !exists(${PKGMESSAGE}) && (!exists(${FILESDIR}/pkg-message.in) \|\| defined(SUB_FILES) && ${SUB_FILES:Mpkg-message} == "")
		290	FONTPKGMESSAGE= yes
		291	PKGMESSAGE= ${WRKDIR}/pkg-message
		292	. else
		293	FONTPKGMESSAGE= no
		294	. endif
		295
		296	. if defined(XORG_CAT)
		297	pre-configure: fonts-pre-configure
		298
		299	# Keep X.Org ports from running mkfontscale, mkfontdir and fc-cache: we'll do
		300	# that later.
		301	fonts-pre-configure:
		302	-@${REINPLACE_CMD} -e '/MKFONTSCALE/ d; /MKFONTDIR/ d; /FCCACHE/ d' \
		303	${WRKSRC}/Makefile.in
		304	. endif
		305
		306	pre-install: fonts-pre-install
		307	post-install: fonts-post-install
		308	# fonts-post-install would be better, but would "fail" if fonts.dir.fixed is
		309	# installed in post-install, so we create a target which comes later.
		310	add-plist-post: add-plist-fontdirs
		311
		312	fonts-pre-install:
		313	. if ${FONTPKGMESSAGE} == yes
		314	@${ECHO_CMD} 'To use these fonts, add the following line(s) to the "Files" section' > ${PKGMESSAGE}
		315	@${ECHO_CMD} "of xorg.conf(5):" >> ${PKGMESSAGE}
		316	@${ECHO_CMD} >> ${PKGMESSAGE}
		317	. endif
		318	. for _fontdir in ${FONTDIR:O:S,^,${FONTROOTDIR}/,}
		319	@${MKDIR} ${_fontdir}
		320	. if ${FONTPKGMESSAGE} == yes
321	@${ECHO_CMD} " FontPath \"${_fontdir}/\"" >> ${PKGMESSAGE}
322	. endif
323	. endfor
324
325	fonts-post-install:
326	. if ${FONTPKGMESSAGE} == yes
327	@${CAT} ${PKGMESSAGE}
328	. endif
329
330	add-plist-fontdirs:
331	. for _fontdir in ${FONTDIR:S,^,${FONTROOTDIR_REL}/,}
332	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
333	. if defined(WITH_PKGNG)
334	@${ECHO_CMD} "@fontdir ${_fontdir}" >> ${TMPPLIST}
335	. endif
336	@${ECHO_MSG} "===> Updating font cache"
337	. for t in scale dir
338	@${ECHO_CMD} "mkfont${t} ${PREFIX}/${_fontdir}"
339	@if [ -e ${PREFIX}/${_fontdir}/fonts.${t}.fixed ]; then \
340	${CP} ${PREFIX}/${_fontdir}/fonts.${t}.fixed ${PREFIX}/${_fontdir}/fonts.${t}; \
341	else \
342	mkfont${t} ${PREFIX}/${_fontdir}; \
343	fi
344	@if [ -e ${PREFIX}/${_fontdir}/fonts.${t} -a "`stat -f '%z' ${PREFIX}/${_fontdir}/fonts.${t}`" = '2' ]; then ${RM} ${PREFIX}/${_fontdir}/fonts.${t}; fi
345	. if !defined(WITH_PKGNG)
346	@${ECHO_CMD} "@exec if [ -e %D/${_fontdir}/fonts.${t}.fixed ]; then ${CP} %D/${_fontdir}/fonts.${t}.fixed %D/${_fontdir}/fonts.${t}; else mkfont${t} %D/${_fontdir}; fi" >> ${TMPPLIST}
347	@${ECHO_CMD} "@unexec mkfont${t} %D/${_fontdir}" >> ${TMPPLIST}
348	. for cmd in exec unexec
349	@${ECHO_CMD} "@${cmd} if [ -e %D/${_fontdir}/fonts.${t} -a \"\`stat -f '%%z' %D/${_fontdir}/fonts.${t}\`\" = '2' ]; then ${RM} %D/${_fontdir}/fonts.${t}; fi" >> ${TMPPLIST}
350	. endfor
351	. endif
352	. endfor
353	fc-cache -s ${PREFIX}/${_fontdir}
354	. if !defined(WITH_PKGNG)
355	@${ECHO_CMD} "@exec fc-cache -s %D/${_fontdir}" >> ${TMPPLIST}
356	@${ECHO_CMD} "@unexec fc-cache -s %D/${_fontdir}" >> ${TMPPLIST}
357	@${ECHO_CMD} "@unexec ${RMDIR} %D/${_fontdir} 2>/dev/null \|\| ${TRUE}" >> ${TMPPLIST}
358	. endif
359	. endfor
360	. if !defined(XORG_CAT)
361	. if defined(WITH_PKGNG)
362	@${ECHO_CMD} "@dirrmtry ${FONTROOTDIR_REL}" >> ${TMPPLIST}
363	. else
364	@${ECHO_CMD} "@unexec ${RMDIR} %D/${FONTROOTDIR_REL} 2>/dev/null \|\| ${TRUE}" >> ${TMPPLIST}
365	. endif
366	. endif
367	.endif
368
263	.endif	369	.endif

Added Link Here

(-)Keywords/fontdir.yaml (+21 lines)
1	actions: [dirrmtry,]
2	post-install: \|
3	for t in scale dir; do
4	index=%D/%@/fonts.$t
5	if [ -e $index.fixed ]; then
6	cp $index.fixed $index
7	else
8	mkfont$t %D/%@
9	[ -e $index -a "`stat -f '%z' $index`" = '2' ] &&
10	rm -f $index
11	fi
12	done
13	fc-cache -s %D/%@
14	post-deinstall: \|
15	for t in scale dir; do
16	index=%D/%@/fonts.$t
17	mkfont$t %D/%@
18	[ -e $index -a "`stat -f '%z' $index`" = '2' ] &&
19	rm -f $index
20	done
21	fc-cache -s %D/%@

Lines 1-51 Link Here

(-)x11-fonts/encodings/pkg-plist (-51 / +53 lines)
1	lib/X11/fonts/encodings/adobe-dingbats.enc.gz	1	%%FONTDIR%%/adobe-dingbats.enc.gz
2	lib/X11/fonts/encodings/adobe-standard.enc.gz	2	%%FONTDIR%%/adobe-standard.enc.gz
3	lib/X11/fonts/encodings/adobe-symbol.enc.gz	3	%%FONTDIR%%/adobe-symbol.enc.gz
4	lib/X11/fonts/encodings/armscii-8.enc.gz	4	%%FONTDIR%%/armscii-8.enc.gz
5	lib/X11/fonts/encodings/ascii-0.enc.gz	5	%%FONTDIR%%/ascii-0.enc.gz
6	lib/X11/fonts/encodings/dec-special.enc.gz	6	%%FONTDIR%%/dec-special.enc.gz
7	lib/X11/fonts/encodings/encodings.dir	7	%%FONTDIR%%/encodings.dir
8	lib/X11/fonts/encodings/ibm-cp437.enc.gz	8	%%FONTDIR%%/ibm-cp437.enc.gz
9	lib/X11/fonts/encodings/ibm-cp850.enc.gz	9	%%FONTDIR%%/ibm-cp850.enc.gz
10	lib/X11/fonts/encodings/ibm-cp852.enc.gz	10	%%FONTDIR%%/ibm-cp852.enc.gz
11	lib/X11/fonts/encodings/ibm-cp866.enc.gz	11	%%FONTDIR%%/ibm-cp866.enc.gz
12	lib/X11/fonts/encodings/iso8859-11.enc.gz	12	%%FONTDIR%%/iso8859-11.enc.gz
13	lib/X11/fonts/encodings/iso8859-13.enc.gz	13	%%FONTDIR%%/iso8859-13.enc.gz
14	lib/X11/fonts/encodings/iso8859-16.enc.gz	14	%%FONTDIR%%/iso8859-16.enc.gz
15	lib/X11/fonts/encodings/iso8859-6.16.enc.gz	15	%%FONTDIR%%/iso8859-6.16.enc.gz
16	lib/X11/fonts/encodings/iso8859-6.8x.enc.gz	16	%%FONTDIR%%/iso8859-6.8x.enc.gz
17	lib/X11/fonts/encodings/large/big5.eten-0.enc.gz	17	%%FONTDIR%%/large/big5.eten-0.enc.gz
18	lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz	18	%%FONTDIR%%/large/big5hkscs-0.enc.gz
19	lib/X11/fonts/encodings/large/cns11643-1.enc.gz	19	%%FONTDIR%%/large/cns11643-1.enc.gz
20	lib/X11/fonts/encodings/large/cns11643-2.enc.gz	20	%%FONTDIR%%/large/cns11643-2.enc.gz
21	lib/X11/fonts/encodings/large/cns11643-3.enc.gz	21	%%FONTDIR%%/large/cns11643-3.enc.gz
22	lib/X11/fonts/encodings/large/encodings.dir	22	%%FONTDIR%%/large/encodings.dir
23	lib/X11/fonts/encodings/large/gb18030-0.enc.gz	23	%%FONTDIR%%/large/gb18030-0.enc.gz
24	lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz	24	%%FONTDIR%%/large/gb18030.2000-0.enc.gz
25	lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz	25	%%FONTDIR%%/large/gb18030.2000-1.enc.gz
26	lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz	26	%%FONTDIR%%/large/gb2312.1980-0.enc.gz
27	lib/X11/fonts/encodings/large/gbk-0.enc.gz	27	%%FONTDIR%%/large/gbk-0.enc.gz
28	lib/X11/fonts/encodings/large/jisx0201.1976-0.enc.gz	28	%%FONTDIR%%/large/jisx0201.1976-0.enc.gz
29	lib/X11/fonts/encodings/large/jisx0208.1990-0.enc.gz	29	%%FONTDIR%%/large/jisx0208.1990-0.enc.gz
30	lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz	30	%%FONTDIR%%/large/jisx0212.1990-0.enc.gz
31	lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz	31	%%FONTDIR%%/large/ksc5601.1987-0.enc.gz
32	lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz	32	%%FONTDIR%%/large/ksc5601.1992-3.enc.gz
33	lib/X11/fonts/encodings/large/sun.unicode.india-0.enc.gz	33	%%FONTDIR%%/large/sun.unicode.india-0.enc.gz
34	lib/X11/fonts/encodings/microsoft-cp1250.enc.gz	34	%%FONTDIR%%/microsoft-cp1250.enc.gz
35	lib/X11/fonts/encodings/microsoft-cp1251.enc.gz	35	%%FONTDIR%%/microsoft-cp1251.enc.gz
36	lib/X11/fonts/encodings/microsoft-cp1252.enc.gz	36	%%FONTDIR%%/microsoft-cp1252.enc.gz
37	lib/X11/fonts/encodings/microsoft-cp1253.enc.gz	37	%%FONTDIR%%/microsoft-cp1253.enc.gz
38	lib/X11/fonts/encodings/microsoft-cp1254.enc.gz	38	%%FONTDIR%%/microsoft-cp1254.enc.gz
39	lib/X11/fonts/encodings/microsoft-cp1255.enc.gz	39	%%FONTDIR%%/microsoft-cp1255.enc.gz
40	lib/X11/fonts/encodings/microsoft-cp1256.enc.gz	40	%%FONTDIR%%/microsoft-cp1256.enc.gz
41	lib/X11/fonts/encodings/microsoft-cp1257.enc.gz	41	%%FONTDIR%%/microsoft-cp1257.enc.gz
42	lib/X11/fonts/encodings/microsoft-cp1258.enc.gz	42	%%FONTDIR%%/microsoft-cp1258.enc.gz
43	lib/X11/fonts/encodings/microsoft-win3.1.enc.gz	43	%%FONTDIR%%/microsoft-win3.1.enc.gz
44	lib/X11/fonts/encodings/mulearabic-0.enc.gz	44	%%FONTDIR%%/mulearabic-0.enc.gz
45	lib/X11/fonts/encodings/mulearabic-1.enc.gz	45	%%FONTDIR%%/mulearabic-1.enc.gz
46	lib/X11/fonts/encodings/mulearabic-2.enc.gz	46	%%FONTDIR%%/mulearabic-2.enc.gz
47	lib/X11/fonts/encodings/mulelao-1.enc.gz	47	%%FONTDIR%%/mulelao-1.enc.gz
48	lib/X11/fonts/encodings/suneu-greek.enc.gz	48	%%FONTDIR%%/suneu-greek.enc.gz
49	lib/X11/fonts/encodings/tcvn-0.enc.gz	49	%%FONTDIR%%/tcvn-0.enc.gz
50	lib/X11/fonts/encodings/tis620-2.enc.gz	50	%%FONTDIR%%/tis620-2.enc.gz
51	lib/X11/fonts/encodings/viscii1.1-1.enc.gz	51	%%FONTDIR%%/viscii1.1-1.enc.gz
		52	@dirrm %%FONTDIR%%/large
		53	@dirrm %%FONTDIR%%

Lines 1-21 Link Here

(-)x11-fonts/font-util/pkg-plist (-17 / +18 lines)
1	bin/bdftruncate	1	bin/bdftruncate
2	bin/ucs2any	2	bin/ucs2any
3	lib/X11/fonts/util/map-ISO8859-1	3	%%FONTDIR%%/map-ISO8859-1
4	lib/X11/fonts/util/map-ISO8859-10	4	%%FONTDIR%%/map-ISO8859-10
5	lib/X11/fonts/util/map-ISO8859-11	5	%%FONTDIR%%/map-ISO8859-11
6	lib/X11/fonts/util/map-ISO8859-13	6	%%FONTDIR%%/map-ISO8859-13
7	lib/X11/fonts/util/map-ISO8859-14	7	%%FONTDIR%%/map-ISO8859-14
8	lib/X11/fonts/util/map-ISO8859-15	8	%%FONTDIR%%/map-ISO8859-15
9	lib/X11/fonts/util/map-ISO8859-16	9	%%FONTDIR%%/map-ISO8859-16
10	lib/X11/fonts/util/map-ISO8859-2	10	%%FONTDIR%%/map-ISO8859-2
11	lib/X11/fonts/util/map-ISO8859-3	11	%%FONTDIR%%/map-ISO8859-3
12	lib/X11/fonts/util/map-ISO8859-4	12	%%FONTDIR%%/map-ISO8859-4
13	lib/X11/fonts/util/map-ISO8859-5	13	%%FONTDIR%%/map-ISO8859-5
14	lib/X11/fonts/util/map-ISO8859-6	14	%%FONTDIR%%/map-ISO8859-6
15	lib/X11/fonts/util/map-ISO8859-7	15	%%FONTDIR%%/map-ISO8859-7
16	lib/X11/fonts/util/map-ISO8859-8	16	%%FONTDIR%%/map-ISO8859-8
17	lib/X11/fonts/util/map-ISO8859-9	17	%%FONTDIR%%/map-ISO8859-9
18	lib/X11/fonts/util/map-JISX0201.1976-0	18	%%FONTDIR%%/map-JISX0201.1976-0
19	lib/X11/fonts/util/map-KOI8-R	19	%%FONTDIR%%/map-KOI8-R
20	libdata/pkgconfig/fontutil.pc	20	libdata/pkgconfig/fontutil.pc
21	share/aclocal/fontutil.m4	21	share/aclocal/fontutil.m4
		22	@dirrm %%FONTDIR%%

Lines 7-16 Link Here

(-)x11-fonts/charis/Makefile (-18 / +4 lines)
7		7
8	PORTNAME= CharisSIL	8	PORTNAME= CharisSIL
9	PORTVERSION= 4.110	9	PORTVERSION= 4.110
		10	PORTREVISION= 1
10	CATEGORIES= x11-fonts	11	CATEGORIES= x11-fonts
11	MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \	12	MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
12	LOCAL/bf	13	LOCAL/bf
13	MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
14		14
15	MAINTAINER= bf@FreeBSD.org	15	MAINTAINER= bf@FreeBSD.org
16	COMMENT= Charis SIL TrueType font collection	16	COMMENT= Charis SIL TrueType font collection
Lines 20-57 Link Here
20	LICENSE_FILE= ${WRKSRC}/OFL.txt	20	LICENSE_FILE= ${WRKSRC}/OFL.txt
21	LICENSE_PERMS= auto-accept	21	LICENSE_PERMS= auto-accept
22		22
23	USE_ZIP= yes	23	INSTALLS_FONTS= yes
24	XORG_CAT= font
25
26	FONTROOTDIR= ${PREFIX}/lib/X11/fonts
27	INSTALLS_TTF= yes
28	MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX}	24	MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX}
		25	USE_ZIP= yes
29	NO_BUILD= yes	26	NO_BUILD= yes
30	USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP
31		27
32	.for type in B BI I R	28	.for type in B BI I R
33	PLIST_FILES+= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-${type}.ttf	29	PLIST_FILES+= ${FONTROOTDIR_REL}/${FONTDIR}/${PORTNAME}-${type}.ttf
34	.endfor	30	.endfor
35		31
36	.if !defined(NOPORTDOCS)	32	.if !defined(NOPORTDOCS)
37	PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt	33	PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
38	.endif	34	.endif
39		35
40	SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}"
41	SUB_FILES= pkg-message
42
43	do-configure:
44	@${DO_NADA}
45
46	do-install:	36	do-install:
47	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
48	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})	37	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
49	.if !defined(NOPORTDOCS)	38	.if !defined(NOPORTDOCS)
50	@${MKDIR} ${DOCSDIR}	39	@${MKDIR} ${DOCSDIR}
51	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})	40	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
52	.endif	41	.endif
53	@${ECHO_MSG}
54	@${CAT} ${PKGMESSAGE}
55	@${ECHO_MSG}
56		42
57	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Lines 7-13 Link Here

(-)x11-fonts/charis-compact/Makefile (-18 / +3 lines)
7		7
8	PORTNAME= CharisSILCompact	8	PORTNAME= CharisSILCompact
9	PORTVERSION= 4.110	9	PORTVERSION= 4.110
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= x11-fonts	11	CATEGORIES= x11-fonts
12	#unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy	12	#unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy
13	.if defined(MAINTAINER_MODE)	13	.if defined(MAINTAINER_MODE)
Lines 15-21 Link Here
15	.else	15	.else
16	MASTER_SITES= LOCAL/bf	16	MASTER_SITES= LOCAL/bf
17	.endif	17	.endif
18	MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
19		18
20	MAINTAINER= bf@FreeBSD.org	19	MAINTAINER= bf@FreeBSD.org
21	COMMENT= Charis SIL TrueType font collection, compact variant	20	COMMENT= Charis SIL TrueType font collection, compact variant
Lines 25-61 Link Here
25	LICENSE_FILE= ${WRKSRC}/OFL.txt	24	LICENSE_FILE= ${WRKSRC}/OFL.txt
26	LICENSE_PERMS= auto-accept	25	LICENSE_PERMS= auto-accept
27		26
		27	INSTALLS_FONTS= yes
28	USE_ZIP= yes	28	USE_ZIP= yes
29	XORG_CAT= font
30
31	FONTROOTDIR= ${PREFIX}/lib/X11/fonts
32	INSTALLS_TTF= yes
33	NO_BUILD= yes	29	NO_BUILD= yes
34	USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP
35		30
36	.for type in B BI I R	31	.for type in B BI I R
37	PLIST_FILES+= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-${type}.ttf	32	PLIST_FILES+= ${FONTROOTDIR_REL}/${FONTDIR}/${PORTNAME}-${type}.ttf
38	.endfor	33	.endfor
39		34
40	.if !defined(NOPORTDOCS)	35	.if !defined(NOPORTDOCS)
41	PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml	36	PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml
42	.endif	37	.endif
43		38
44	SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}"
45	SUB_FILES= pkg-message
46
47	do-configure:
48	@${DO_NADA}
49
50	do-install:	39	do-install:
51	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
52	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})	40	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
53	.if !defined(NOPORTDOCS)	41	.if !defined(NOPORTDOCS)
54	@${MKDIR} ${DOCSDIR}	42	@${MKDIR} ${DOCSDIR}
55	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})	43	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
56	.endif	44	.endif
57	@${ECHO_MSG}
58	@${CAT} ${PKGMESSAGE}
59	@${ECHO_MSG}
60		45
61	.include <bsd.port.mk>	46	.include <bsd.port.mk>

Lines 7-16 Link Here

(-)x11-fonts/doulos/Makefile (-18 / +4 lines)
7		7
8	PORTNAME= DoulosSIL	8	PORTNAME= DoulosSIL
9	PORTVERSION= 4.110	9	PORTVERSION= 4.110
		10	PORTREVISION= 1
10	CATEGORIES= x11-fonts	11	CATEGORIES= x11-fonts
11	MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \	12	MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
12	LOCAL/bf	13	LOCAL/bf
13	MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
14		14
15	MAINTAINER= bf@FreeBSD.org	15	MAINTAINER= bf@FreeBSD.org
16	COMMENT= Doulos SIL TrueType font collection	16	COMMENT= Doulos SIL TrueType font collection
Lines 20-55 Link Here
20	LICENSE_FILE= ${WRKSRC}/OFL.txt	20	LICENSE_FILE= ${WRKSRC}/OFL.txt
21	LICENSE_PERMS= auto-accept	21	LICENSE_PERMS= auto-accept
22		22
23	USE_ZIP= yes	23	INSTALLS_FONTS= yes
24	XORG_CAT= font
25
26	FONTROOTDIR= ${PREFIX}/lib/X11/fonts
27	INSTALLS_TTF= yes
28	MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX}	24	MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX}
		25	USE_ZIP= yes
29	NO_BUILD= yes	26	NO_BUILD= yes
30	USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP
31		27
32	PLIST_FILES= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf	28	PLIST_FILES= ${FONTROOTDIR_REL}/${FONTDIR}/${PORTNAME}-R.ttf
33		29
34	.if !defined(NOPORTDOCS)	30	.if !defined(NOPORTDOCS)
35	PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt	31	PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
36	.endif	32	.endif
37		33
38	SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}"
39	SUB_FILES= pkg-message
40
41	do-configure:
42	@${DO_NADA}
43
44	do-install:	34	do-install:
45	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
46	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})	35	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
47	.if !defined(NOPORTDOCS)	36	.if !defined(NOPORTDOCS)
48	@${MKDIR} ${DOCSDIR}	37	@${MKDIR} ${DOCSDIR}
49	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})	38	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
50	.endif	39	.endif
51	@${ECHO_MSG}
52	@${CAT} ${PKGMESSAGE}
53	@${ECHO_MSG}
54		40
55	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Lines 7-13 Link Here

(-)x11-fonts/doulos-compact/Makefile (-18 / +3 lines)
7		7
8	PORTNAME= DoulosSILCompact	8	PORTNAME= DoulosSILCompact
9	PORTVERSION= 4.110	9	PORTVERSION= 4.110
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= x11-fonts	11	CATEGORIES= x11-fonts
12	#unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy	12	#unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy
13	.if defined(MAINTAINER_MODE)	13	.if defined(MAINTAINER_MODE)
Lines 15-21 Link Here
15	.else	15	.else
16	MASTER_SITES= LOCAL/bf	16	MASTER_SITES= LOCAL/bf
17	.endif	17	.endif
18	MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
19		18
20	MAINTAINER= bf@FreeBSD.org	19	MAINTAINER= bf@FreeBSD.org
21	COMMENT= Doulos SIL TrueType font collection, compact variant	20	COMMENT= Doulos SIL TrueType font collection, compact variant
Lines 25-59 Link Here
25	LICENSE_FILE= ${WRKSRC}/OFL.txt	24	LICENSE_FILE= ${WRKSRC}/OFL.txt
26	LICENSE_PERMS= auto-accept	25	LICENSE_PERMS= auto-accept
27		26
		27	INSTALLS_FONTS= yes
28	USE_ZIP= yes	28	USE_ZIP= yes
29	XORG_CAT= font
30
31	FONTROOTDIR= ${PREFIX}/lib/X11/fonts
32	INSTALLS_TTF= yes
33	NO_BUILD= yes	29	NO_BUILD= yes
34	USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP
35		30
36	PLIST_FILES= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf	31	PLIST_FILES= ${FONTROOTDIR_REL}/${FONTDIR}/${PORTNAME}-R.ttf
37		32
38	.if !defined(NOPORTDOCS)	33	.if !defined(NOPORTDOCS)
39	PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml	34	PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml
40	.endif	35	.endif
41		36
42	SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}"
43	SUB_FILES= pkg-message
44
45	do-configure:
46	@${DO_NADA}
47
48	do-install:	37	do-install:
49	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
50	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})	38	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
51	.if !defined(NOPORTDOCS)	39	.if !defined(NOPORTDOCS)
52	@${MKDIR} ${DOCSDIR}	40	@${MKDIR} ${DOCSDIR}
53	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})	41	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
54	.endif	42	.endif
55	@${ECHO_MSG}
56	@${CAT} ${PKGMESSAGE}
57	@${ECHO_MSG}
58		43
59	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 7-16 Link Here

(-)x11-fonts/paratype/Makefile (-18 / +3 lines)
7		7
8	PORTNAME= paratype	8	PORTNAME= paratype
9	PORTVERSION= 2.004	9	PORTVERSION= 2.004
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= x11-fonts	11	CATEGORIES= x11-fonts
12	MASTER_SITES= http://paratype.0xdc.ru/	12	MASTER_SITES= http://paratype.0xdc.ru/
13	MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
14	DISTFILES= PTSansOFL-2.004.zip PTSerifOFL-1.000.zip PTMonoOFL-1.002.zip	13	DISTFILES= PTSansOFL-2.004.zip PTSerifOFL-1.000.zip PTMonoOFL-1.002.zip
15		14
16	MAINTAINER= littlesavage@rambler.ru	15	MAINTAINER= littlesavage@rambler.ru
Lines 21-47 Link Here
21	LICENSE_FILE= ${WRKSRC}/PTSansPTSerifOFL.txt	20	LICENSE_FILE= ${WRKSRC}/PTSansPTSerifOFL.txt
22	LICENSE_PERMS= auto-accept	21	LICENSE_PERMS= auto-accept
23		22
24	INSTALLS_TTF= yes	23	INSTALLS_FONTS= yes
		24	FONTDIR= ParaType
25	NO_BUILD= yes	25	NO_BUILD= yes
26	NO_WRKSUBDIR= yes	26	NO_WRKSUBDIR= yes
27	USE_TGZ= yes
28	USE_ZIP= yes	27	USE_ZIP= yes
29	XORG_CAT= font
30
31	FONTDIR= ParaType
32	FONTROOTDIR= ${PREFIX}/lib/X11/fonts
33	PLIST_SUB= FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}"
34	SUB_FILES= pkg-message
35	SUB_LIST= FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}"
36
37	do-configure:
38	@${DO_NADA}
39		28
40	do-install:	29	do-install:
41	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
42	@${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}/	30	@${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}/
43	@${ECHO_MSG}
44	@${CAT} ${PKGMESSAGE}
45	@${ECHO_MSG}
46		31
47	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Lines 7-12 Link Here

(-)x11-fonts/inconsolata-ttf/Makefile (-9 / +5 lines)
7		7
8	PORTNAME= inconsolata-ttf	8	PORTNAME= inconsolata-ttf
9	PORTVERSION= 20090215	9	PORTVERSION= 20090215
		10	PORTREVISION= 1
10	CATEGORIES= x11-fonts	11	CATEGORIES= x11-fonts
11	MASTER_SITES= http://www.levien.com/type/myfonts/	12	MASTER_SITES= http://www.levien.com/type/myfonts/
12	DISTNAME= Inconsolata	13	DISTNAME= Inconsolata
Lines 16-33 Link Here
16	MAINTAINER= ashish@FreeBSD.org	17	MAINTAINER= ashish@FreeBSD.org
17	COMMENT= A monospaced truetype font	18	COMMENT= A monospaced truetype font
18		19
19	USE_XORG= x11	20	INSTALLS_FONTS= yes
20	INSTALLS_TTF= yes
21	XORG_CAT= font
22	FONTDIR= OTF	21	FONTDIR= OTF
23	PLIST_FILES= lib/X11/fonts/${FONTDIR}/${DISTNAME}${EXTRACT_SUFX}	22	NO_BUILD= yes
24		23
25	do-configure:	24	PLIST_FILES= ${FONTROOTDIR_REL}/${FONTDIR}/${DISTNAME}${EXTRACT_SUFX}
26
27	do-build:
28		25
29	do-install:	26	do-install:
30	${MKDIR} ${PREFIX}/lib/X11/fonts/${FONTDIR}	27	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${FONTROOTDIR}/${FONTDIR}
31	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${PREFIX}/lib/X11/fonts/${FONTDIR}
32		28
33	.include <bsd.port.mk>	29	.include <bsd.port.mk>