Date: Tue, 6 Mar 2012 17:14:12 GMT From: Alberto Villa <avilla@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/165781: [patch] update font ports management Message-ID: <201203061714.q26HECJd069839@red.freebsd.org> Resent-Message-ID: <201203061720.q26HKDEu025104@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 165781 >Category: ports >Synopsis: [patch] update font ports management >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 06 17:20:13 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Alberto Villa >Release: FreeBSD 10.0-CURRENT >Organization: >Environment: FreeBSD woodstock.peanuts 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r231328M: Fri Feb 10 04:17:47 CET 2012 root@woodstock.peanuts:/usr/obj/usr/src/sys/HPDV6 amd64 >Description: Font ports are currently handled by hand, one by one, while most of the tasks (like updating font cache) could be automated. X.Org font ports have a draft of such a system, but a bit bugged, and not suited for non-X.Org ports (some try to use it, with some hacks). Additionally, all the @(un)?exec's used in those ports fail with pkgng, thus being an obstacle to its growth. >How-To-Repeat: >Fix: The attached patch proposes an evolution of the system already there for X.Org ports, which takes care of most of the procedures required by font ports: - setting installation directory (different for X.Org and non-X.Org ports) without hardcoding it (thus making it flexible); - creating and removing installation directories; - updating font cache; - printing a default pkg-message to notify users about the need to update xorg.conf(5). It has been reviewed and approved by x11@ (via kwm@), apart for documentation which still requires work. It fully supports pkgng, and introduces extension scripts for plist. Keywords/fontdir.yaml provides a @fontdir plist directive which updates font cache for a directory and removes the directory on deinstallation. This has been approved by portmgr@ (via bapt@). The system can be included with XORG_CAT=font for X.Org ports, and INSTALLS_FONTS=yes otherwise. I'm now asking for an exp-run to check for errors. Please note: the attached patch contains bits which have to go in at the same time. Without them all, fail is ensured. Here - http://people.freebsd.org/~avilla/files/fonts/fonts-full.diff - you can find a patch containing the fixes for *all* (120) font ports. As I expect it will take some time to get approval for all of them (at most two weeks, for maintainer timeout), I'd like to start committing the smaller patch, and then update single ports when maintainers reply. Patch attached with submission follows: Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.706 diff -u -r1.706 bsd.port.mk --- Mk/bsd.port.mk 22 Feb 2012 17:34:47 -0000 1.706 +++ Mk/bsd.port.mk 6 Mar 2012 16:01:08 -0000 @@ -1368,7 +1368,7 @@ .include "${PORTSDIR}/Mk/bsd.linux-apps.mk" .endif -.if defined(USE_XORG) || defined(XORG_CAT) +.if defined(USE_XORG) || defined(XORG_CAT) || defined(INSTALLS_FONTS) .include "${PORTSDIR}/Mk/bsd.xorg.mk" .endif @@ -1997,7 +1997,7 @@ .include "${PORTSDIR}/Mk/bsd.local.mk" .endif -.if defined(USE_XORG) || defined(XORG_CAT) +.if defined(USE_XORG) || defined(XORG_CAT) || defined(INSTALLS_FONTS) .include "${PORTSDIR}/Mk/bsd.xorg.mk" .endif Index: Mk/bsd.xorg.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.xorg.mk,v retrieving revision 1.14 diff -u -r1.14 bsd.xorg.mk --- Mk/bsd.xorg.mk 1 Mar 2011 10:11:42 -0000 1.14 +++ Mk/bsd.xorg.mk 6 Mar 2012 16:01:08 -0000 @@ -16,7 +16,6 @@ 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 @@ -26,6 +25,40 @@ # 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. @@ -60,61 +93,17 @@ . endif . if ${XORG_CAT} == "font" -FONTDIR?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/} -CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/lib/X11/fonts -CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/lib/X11/fonts -NEED_MKFONTFOO= yes - -. if ${PORTNAME:M*type1*}x != x -INSTALLS_TTF?= yes -. elif ${PORTNAME:M*ttf*}x != x -INSTALLS_TTF?= yes -. 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 +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. 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" @@ -139,6 +128,11 @@ .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) @@ -260,4 +254,116 @@ 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 --- /dev/null 2012-03-06 17:01:04.000000000 +0100 +++ Keywords/fontdir.yaml 2012-03-05 18:33:55.781327845 +0100 @@ -0,0 +1,21 @@ +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/%@ Index: x11-fonts/encodings/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/encodings/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- x11-fonts/encodings/Makefile 25 Feb 2011 16:52:38 -0000 1.3 +++ x11-fonts/encodings/Makefile 6 Mar 2012 16:07:43 -0000 @@ -13,8 +13,9 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Encoding fonts -XORG_CAT= font +BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale + USE_XORG= fontutil -FONTDIR= encodings/large encodings +XORG_CAT= font .include <bsd.port.mk> Index: x11-fonts/encodings/pkg-plist =================================================================== RCS file: /home/pcvs/ports/x11-fonts/encodings/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- x11-fonts/encodings/pkg-plist 1 May 2010 11:40:50 -0000 1.2 +++ x11-fonts/encodings/pkg-plist 6 Mar 2012 16:07:43 -0000 @@ -1,51 +1,53 @@ -lib/X11/fonts/encodings/adobe-dingbats.enc.gz -lib/X11/fonts/encodings/adobe-standard.enc.gz -lib/X11/fonts/encodings/adobe-symbol.enc.gz -lib/X11/fonts/encodings/armscii-8.enc.gz -lib/X11/fonts/encodings/ascii-0.enc.gz -lib/X11/fonts/encodings/dec-special.enc.gz -lib/X11/fonts/encodings/encodings.dir -lib/X11/fonts/encodings/ibm-cp437.enc.gz -lib/X11/fonts/encodings/ibm-cp850.enc.gz -lib/X11/fonts/encodings/ibm-cp852.enc.gz -lib/X11/fonts/encodings/ibm-cp866.enc.gz -lib/X11/fonts/encodings/iso8859-11.enc.gz -lib/X11/fonts/encodings/iso8859-13.enc.gz -lib/X11/fonts/encodings/iso8859-16.enc.gz -lib/X11/fonts/encodings/iso8859-6.16.enc.gz -lib/X11/fonts/encodings/iso8859-6.8x.enc.gz -lib/X11/fonts/encodings/large/big5.eten-0.enc.gz -lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz -lib/X11/fonts/encodings/large/cns11643-1.enc.gz -lib/X11/fonts/encodings/large/cns11643-2.enc.gz -lib/X11/fonts/encodings/large/cns11643-3.enc.gz -lib/X11/fonts/encodings/large/encodings.dir -lib/X11/fonts/encodings/large/gb18030-0.enc.gz -lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz -lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz -lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz -lib/X11/fonts/encodings/large/gbk-0.enc.gz -lib/X11/fonts/encodings/large/jisx0201.1976-0.enc.gz -lib/X11/fonts/encodings/large/jisx0208.1990-0.enc.gz -lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz -lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz -lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz -lib/X11/fonts/encodings/large/sun.unicode.india-0.enc.gz -lib/X11/fonts/encodings/microsoft-cp1250.enc.gz -lib/X11/fonts/encodings/microsoft-cp1251.enc.gz -lib/X11/fonts/encodings/microsoft-cp1252.enc.gz -lib/X11/fonts/encodings/microsoft-cp1253.enc.gz -lib/X11/fonts/encodings/microsoft-cp1254.enc.gz -lib/X11/fonts/encodings/microsoft-cp1255.enc.gz -lib/X11/fonts/encodings/microsoft-cp1256.enc.gz -lib/X11/fonts/encodings/microsoft-cp1257.enc.gz -lib/X11/fonts/encodings/microsoft-cp1258.enc.gz -lib/X11/fonts/encodings/microsoft-win3.1.enc.gz -lib/X11/fonts/encodings/mulearabic-0.enc.gz -lib/X11/fonts/encodings/mulearabic-1.enc.gz -lib/X11/fonts/encodings/mulearabic-2.enc.gz -lib/X11/fonts/encodings/mulelao-1.enc.gz -lib/X11/fonts/encodings/suneu-greek.enc.gz -lib/X11/fonts/encodings/tcvn-0.enc.gz -lib/X11/fonts/encodings/tis620-2.enc.gz -lib/X11/fonts/encodings/viscii1.1-1.enc.gz +%%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%% Index: x11-fonts/font-alias/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/font-alias/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- x11-fonts/font-alias/Makefile 25 Feb 2011 16:52:39 -0000 1.3 +++ x11-fonts/font-alias/Makefile 6 Mar 2012 16:07:43 -0000 @@ -7,12 +7,16 @@ PORTNAME= font-alias PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Font aliases XORG_CAT= font -FONTDIR= 100dpi 75dpi misc cyrillic +FONTDIR= misc cyrillic 75dpi 100dpi + +PLIST_FILES= ${PLIST_DIRSTRY:S,$,/fonts.alias,} +PLIST_DIRSTRY= ${FONTDIR:S,^,${FONTROOTDIR_REL}/,} .include <bsd.port.mk> Index: x11-fonts/font-alias/pkg-plist =================================================================== RCS file: x11-fonts/font-alias/pkg-plist diff -N x11-fonts/font-alias/pkg-plist --- x11-fonts/font-alias/pkg-plist 19 May 2007 20:29:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -lib/X11/fonts/100dpi/fonts.alias -lib/X11/fonts/75dpi/fonts.alias -lib/X11/fonts/cyrillic/fonts.alias -lib/X11/fonts/misc/fonts.alias Index: x11-fonts/font-util/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/font-util/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- x11-fonts/font-util/Makefile 25 Feb 2011 16:52:44 -0000 1.3 +++ x11-fonts/font-util/Makefile 6 Mar 2012 16:07:43 -0000 @@ -12,6 +12,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Create an index of X font files in a directory +USE_GNOME= gnomehack XORG_CAT= font MAN1= bdftruncate.1 ucs2any.1 Index: x11-fonts/font-util/pkg-plist =================================================================== RCS file: /home/pcvs/ports/x11-fonts/font-util/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- x11-fonts/font-util/pkg-plist 19 May 2007 20:29:20 -0000 1.1 +++ x11-fonts/font-util/pkg-plist 6 Mar 2012 16:07:43 -0000 @@ -1,21 +1,22 @@ bin/bdftruncate bin/ucs2any -lib/X11/fonts/util/map-ISO8859-1 -lib/X11/fonts/util/map-ISO8859-10 -lib/X11/fonts/util/map-ISO8859-11 -lib/X11/fonts/util/map-ISO8859-13 -lib/X11/fonts/util/map-ISO8859-14 -lib/X11/fonts/util/map-ISO8859-15 -lib/X11/fonts/util/map-ISO8859-16 -lib/X11/fonts/util/map-ISO8859-2 -lib/X11/fonts/util/map-ISO8859-3 -lib/X11/fonts/util/map-ISO8859-4 -lib/X11/fonts/util/map-ISO8859-5 -lib/X11/fonts/util/map-ISO8859-6 -lib/X11/fonts/util/map-ISO8859-7 -lib/X11/fonts/util/map-ISO8859-8 -lib/X11/fonts/util/map-ISO8859-9 -lib/X11/fonts/util/map-JISX0201.1976-0 -lib/X11/fonts/util/map-KOI8-R +%%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%% Index: x11-fonts/charis/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/charis/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- x11-fonts/charis/Makefile 14 Oct 2011 20:37:20 -0000 1.2 +++ x11-fonts/charis/Makefile 6 Mar 2012 16:41:25 -0000 @@ -7,10 +7,10 @@ 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 @@ -20,38 +20,24 @@ LICENSE_FILE= ${WRKSRC}/OFL.txt LICENSE_PERMS= auto-accept -USE_ZIP= yes -XORG_CAT= font - -FONTROOTDIR= ${PREFIX}/lib/X11/fonts -INSTALLS_TTF= yes +INSTALLS_FONTS= 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:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-${type}.ttf +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> Index: x11-fonts/charis/distinfo =================================================================== RCS file: /home/pcvs/ports/x11-fonts/charis/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- x11-fonts/charis/distinfo 14 Oct 2011 20:37:20 -0000 1.2 +++ x11-fonts/charis/distinfo 6 Mar 2012 16:41:25 -0000 @@ -1,2 +1,2 @@ -SHA256 (xorg/font/CharisSIL-4.110.zip) = 97bf74d1bb8301e7688abf1481515920a84d47e3d325ce3eb0d8ee9a16cb3264 -SIZE (xorg/font/CharisSIL-4.110.zip) = 3435758 +SHA256 (CharisSIL-4.110.zip) = 97bf74d1bb8301e7688abf1481515920a84d47e3d325ce3eb0d8ee9a16cb3264 +SIZE (CharisSIL-4.110.zip) = 3435758 Index: x11-fonts/charis/files/pkg-message.in =================================================================== RCS file: x11-fonts/charis/files/pkg-message.in diff -N x11-fonts/charis/files/pkg-message.in --- x11-fonts/charis/files/pkg-message.in 14 Oct 2011 20:37:20 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -To use these fonts, add the following line to the "Files" section of -xorg.conf: - - FontPath "%%DIR%%/" - -Users of older versions of X may additionally have to make sure that -the freetype module is loaded. Check /var/log/Xorg.0.log for error -messages. If freetype is required, add the following line to the -"Modules" section of xorg.conf: - - Load "freetype" Index: x11-fonts/charis-compact/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/charis-compact/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- x11-fonts/charis-compact/Makefile 18 Oct 2011 05:15:44 -0000 1.2 +++ x11-fonts/charis-compact/Makefile 6 Mar 2012 16:41:25 -0000 @@ -7,7 +7,7 @@ PORTNAME= CharisSILCompact PORTVERSION= 4.110 -PORTREVISION= 1 +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) @@ -15,7 +15,6 @@ .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 @@ -25,37 +24,23 @@ 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:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-${type}.ttf +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> Index: x11-fonts/charis-compact/distinfo =================================================================== RCS file: /home/pcvs/ports/x11-fonts/charis-compact/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-fonts/charis-compact/distinfo 14 Oct 2011 20:42:25 -0000 1.1 +++ x11-fonts/charis-compact/distinfo 6 Mar 2012 16:41:25 -0000 @@ -1,2 +1,2 @@ -SHA256 (xorg/font/CharisSILCompact-4.110.zip) = 7360bfda93d58ae6673bc48499360219e49d102f9ad648c65f5428c2e1bc6960 -SIZE (xorg/font/CharisSILCompact-4.110.zip) = 3384203 +SHA256 (CharisSILCompact-4.110.zip) = 7360bfda93d58ae6673bc48499360219e49d102f9ad648c65f5428c2e1bc6960 +SIZE (CharisSILCompact-4.110.zip) = 3384203 Index: x11-fonts/charis-compact/files/pkg-message.in =================================================================== RCS file: x11-fonts/charis-compact/files/pkg-message.in diff -N x11-fonts/charis-compact/files/pkg-message.in --- x11-fonts/charis-compact/files/pkg-message.in 14 Oct 2011 20:42:25 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -To use these fonts, add the following line to the "Files" section of -xorg.conf: - - FontPath "%%DIR%%/" - -Users of older versions of X may additionally have to make sure that -the freetype module is loaded. Check /var/log/Xorg.0.log for error -messages. If freetype is required, add the following line to the -"Modules" section of xorg.conf: - - Load "freetype" Index: x11-fonts/doulos/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/doulos/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- x11-fonts/doulos/Makefile 14 Oct 2011 20:37:20 -0000 1.2 +++ x11-fonts/doulos/Makefile 6 Mar 2012 16:41:26 -0000 @@ -7,10 +7,10 @@ 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 @@ -20,36 +20,22 @@ LICENSE_FILE= ${WRKSRC}/OFL.txt LICENSE_PERMS= auto-accept -USE_ZIP= yes -XORG_CAT= font - -FONTROOTDIR= ${PREFIX}/lib/X11/fonts -INSTALLS_TTF= yes +INSTALLS_FONTS= 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:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf +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> Index: x11-fonts/doulos/distinfo =================================================================== RCS file: /home/pcvs/ports/x11-fonts/doulos/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- x11-fonts/doulos/distinfo 14 Oct 2011 20:37:20 -0000 1.2 +++ x11-fonts/doulos/distinfo 6 Mar 2012 16:41:26 -0000 @@ -1,2 +1,2 @@ -SHA256 (xorg/font/DoulosSIL-4.110.zip) = 8bb5701a182e9100be44dfbfc68535f2c0a5310368b25aee62280fa73194b16d -SIZE (xorg/font/DoulosSIL-4.110.zip) = 1498994 +SHA256 (DoulosSIL-4.110.zip) = 8bb5701a182e9100be44dfbfc68535f2c0a5310368b25aee62280fa73194b16d +SIZE (DoulosSIL-4.110.zip) = 1498994 Index: x11-fonts/doulos/files/pkg-message.in =================================================================== RCS file: x11-fonts/doulos/files/pkg-message.in diff -N x11-fonts/doulos/files/pkg-message.in --- x11-fonts/doulos/files/pkg-message.in 14 Oct 2011 20:37:20 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -To use these fonts, add the following line to the "Files" section of -xorg.conf: - - FontPath "%%DIR%%/" - -Users of older versions of X may additionally have to make sure that -the freetype module is loaded. Check /var/log/Xorg.0.log for error -messages. If freetype is required, add the following line to the -"Modules" section of xorg.conf: - - Load "freetype" Index: x11-fonts/doulos-compact/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/doulos-compact/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- x11-fonts/doulos-compact/Makefile 18 Oct 2011 05:15:44 -0000 1.2 +++ x11-fonts/doulos-compact/Makefile 6 Mar 2012 16:41:26 -0000 @@ -7,7 +7,7 @@ PORTNAME= DoulosSILCompact PORTVERSION= 4.110 -PORTREVISION= 1 +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) @@ -15,7 +15,6 @@ .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 @@ -25,35 +24,21 @@ 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:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf +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> Index: x11-fonts/doulos-compact/distinfo =================================================================== RCS file: /home/pcvs/ports/x11-fonts/doulos-compact/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-fonts/doulos-compact/distinfo 14 Oct 2011 20:44:00 -0000 1.1 +++ x11-fonts/doulos-compact/distinfo 6 Mar 2012 16:41:26 -0000 @@ -1,2 +1,2 @@ -SHA256 (xorg/font/DoulosSILCompact-4.110.zip) = 9a9ccec7a722ba86d7b45aa335fa4fdab23e46392876358b6ac99dc6233a8b92 -SIZE (xorg/font/DoulosSILCompact-4.110.zip) = 1491644 +SHA256 (DoulosSILCompact-4.110.zip) = 9a9ccec7a722ba86d7b45aa335fa4fdab23e46392876358b6ac99dc6233a8b92 +SIZE (DoulosSILCompact-4.110.zip) = 1491644 Index: x11-fonts/doulos-compact/files/pkg-message.in =================================================================== RCS file: x11-fonts/doulos-compact/files/pkg-message.in diff -N x11-fonts/doulos-compact/files/pkg-message.in --- x11-fonts/doulos-compact/files/pkg-message.in 14 Oct 2011 20:44:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -To use these fonts, add the following line to the "Files" section of -xorg.conf: - - FontPath "%%DIR%%/" - -Users of older versions of X may additionally have to make sure that -the freetype module is loaded. Check /var/log/Xorg.0.log for error -messages. If freetype is required, add the following line to the -"Modules" section of xorg.conf: - - Load "freetype" Index: x11-fonts/paratype/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/paratype/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- x11-fonts/paratype/Makefile 28 Feb 2012 18:08:34 -0000 1.6 +++ x11-fonts/paratype/Makefile 6 Mar 2012 16:41:26 -0000 @@ -7,10 +7,9 @@ PORTNAME= paratype PORTVERSION= 2.004 -PORTREVISION= 3 +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 @@ -21,27 +20,13 @@ LICENSE_FILE= ${WRKSRC}/PTSansPTSerifOFL.txt LICENSE_PERMS= auto-accept -INSTALLS_TTF= yes +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> Index: x11-fonts/paratype/distinfo =================================================================== RCS file: /home/pcvs/ports/x11-fonts/paratype/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- x11-fonts/paratype/distinfo 28 Feb 2012 18:08:34 -0000 1.5 +++ x11-fonts/paratype/distinfo 6 Mar 2012 16:41:26 -0000 @@ -1,6 +1,6 @@ -SHA256 (xorg/font/PTSansOFL-2.004.zip) = 7105b5e7d9965b5b2fa189b5a84c66a8252b3432c0293f1350c15ad159447ee1 -SIZE (xorg/font/PTSansOFL-2.004.zip) = 1600360 -SHA256 (xorg/font/PTSerifOFL-1.000.zip) = 1bf55f3cf143a5e22501de18e597677ed81aaad9c12019146a9e3735e06543a5 -SIZE (xorg/font/PTSerifOFL-1.000.zip) = 1029464 -SHA256 (xorg/font/PTMonoOFL-1.002.zip) = beba94b5c56816a2844880fc241a6752fde7dbc238c03bc4f4ec6d34964d6676 -SIZE (xorg/font/PTMonoOFL-1.002.zip) = 100806 +SHA256 (PTSansOFL-2.004.zip) = 7105b5e7d9965b5b2fa189b5a84c66a8252b3432c0293f1350c15ad159447ee1 +SIZE (PTSansOFL-2.004.zip) = 1600360 +SHA256 (PTSerifOFL-1.000.zip) = 1bf55f3cf143a5e22501de18e597677ed81aaad9c12019146a9e3735e06543a5 +SIZE (PTSerifOFL-1.000.zip) = 1029464 +SHA256 (PTMonoOFL-1.002.zip) = beba94b5c56816a2844880fc241a6752fde7dbc238c03bc4f4ec6d34964d6676 +SIZE (PTMonoOFL-1.002.zip) = 100806 Index: x11-fonts/paratype/files/pkg-message.in =================================================================== RCS file: x11-fonts/paratype/files/pkg-message.in diff -N x11-fonts/paratype/files/pkg-message.in --- x11-fonts/paratype/files/pkg-message.in 26 May 2011 16:47:27 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -To use these fonts, add the following line to the "Files" section of -xorg.conf: - - FontPath "%%PREFIX%%/%%FONTDIR%%/" - -Users of older versions of X may additionally have to make sure that -the freetype module is loaded. Check /var/log/Xorg.0.log for error -messages. If freetype is required, add the following line to the -"Modules" section of xorg.conf: - - Load "freetype" Index: x11-fonts/inconsolata-ttf/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/inconsolata-ttf/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- x11-fonts/inconsolata-ttf/Makefile 11 Jun 2010 13:37:40 -0000 1.3 +++ x11-fonts/inconsolata-ttf/Makefile 6 Mar 2012 16:41:26 -0000 @@ -7,6 +7,7 @@ PORTNAME= inconsolata-ttf PORTVERSION= 20090215 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://www.levien.com/type/myfonts/ DISTNAME= Inconsolata @@ -16,18 +17,13 @@ MAINTAINER= ashish@FreeBSD.org COMMENT= A monospaced truetype font -USE_XORG= x11 -INSTALLS_TTF= yes -XORG_CAT= font +INSTALLS_FONTS= yes FONTDIR= OTF -PLIST_FILES= lib/X11/fonts/${FONTDIR}/${DISTNAME}${EXTRACT_SUFX} +NO_BUILD= yes -do-configure: - -do-build: +PLIST_FILES= ${FONTROOTDIR_REL}/${FONTDIR}/${DISTNAME}${EXTRACT_SUFX} do-install: - ${MKDIR} ${PREFIX}/lib/X11/fonts/${FONTDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${PREFIX}/lib/X11/fonts/${FONTDIR} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${FONTROOTDIR}/${FONTDIR} .include <bsd.port.mk> Index: x11-fonts/inconsolata-ttf/distinfo =================================================================== RCS file: /home/pcvs/ports/x11-fonts/inconsolata-ttf/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- x11-fonts/inconsolata-ttf/distinfo 19 Mar 2011 12:38:46 -0000 1.3 +++ x11-fonts/inconsolata-ttf/distinfo 6 Mar 2012 16:41:26 -0000 @@ -1,2 +1,2 @@ -SHA256 (xorg/font/Inconsolata.otf) = 1561e616c414a1b82d6e6dfbd18e5726fd65028913ade191e5fa38b6ec375a1a -SIZE (xorg/font/Inconsolata.otf) = 58464 +SHA256 (Inconsolata.otf) = 1561e616c414a1b82d6e6dfbd18e5726fd65028913ade191e5fa38b6ec375a1a +SIZE (Inconsolata.otf) = 58464 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203061714.q26HECJd069839>