Date: Sat, 21 Mar 2015 23:05:21 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381876 - in head: . Mk Mk/Scripts Mk/Uses arabic/ae_fonts_mono arabic/ae_fonts_ttf arabic/kacst_fonts arabic/khotot audio/py-karaoke benchmarks/phoronix-test-suite chinese/auto-cn-l10n... Message-ID: <201503212305.t2LN5LBH093671@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Mar 21 23:05:19 2015 New Revision: 381876 URL: https://svnweb.freebsd.org/changeset/ports/381876 QAT: https://qat.redports.org/buildarchive/r381876/ Log: Make fonts repecting XDG Xorg is now looking in ${LOCALBASE}/share/fonts by default Xorg now accepts symlinks in etc/X11/fontpath.d (as decribed in Xserver(1)) Large cleanup on lots of font ports All fonts are now properly dynamically generating fonts.dir and fonts.scale instead of sometime overwriting existing ones) All fonts are generating fontconfig's cache Improve consistency in fonts ports Added: head/japanese/elisa8x8/files/ head/japanese/elisa8x8/files/pkg-deinstall.in - copied, changed from r381874, head/japanese/elisa8x8/pkg-deinstall head/japanese/elisa8x8/files/pkg-install.in - copied, changed from r381765, head/japanese/elisa8x8/pkg-install head/x11-fonts/artwiz-aleczapka-de/files/ head/x11-fonts/artwiz-aleczapka-de/files/pkg-message.in - copied, changed from r381782, head/x11-fonts/artwiz-aleczapka-de/pkg-message head/x11-fonts/artwiz-aleczapka-se/files/ head/x11-fonts/artwiz-aleczapka-se/files/pkg-message.in - copied, changed from r381782, head/x11-fonts/artwiz-aleczapka-se/pkg-message head/x11-fonts/sharefonts/files/ head/x11-fonts/sharefonts/files/pkg-message.in - copied, changed from r381782, head/x11-fonts/sharefonts/pkg-message Deleted: head/chinese/bg5ps/files/patch-bg5ps.conf head/chinese/bg5ps/files/patch-gb2312-bg5ps.conf head/games/xjewel/files/pkg-deinstall.in head/games/xjewel/files/pkg-install.in head/japanese/elisa8x8/pkg-deinstall head/japanese/elisa8x8/pkg-install head/vietnamese/unicode-uhoai/pkg-deinstall head/vietnamese/unicode-uhoai/pkg-install head/x11-fonts/artwiz-aleczapka-de/pkg-message head/x11-fonts/artwiz-aleczapka-se/pkg-message head/x11-fonts/manu-gothica/pkg-plist head/x11-fonts/sharefonts/pkg-message head/x11-fonts/suxus/pkg-plist Modified: head/Mk/Scripts/check-stagedir.sh head/Mk/Uses/display.mk head/Mk/Uses/fonts.mk head/Mk/bsd.xorg.mk head/UPDATING head/arabic/ae_fonts_mono/Makefile head/arabic/ae_fonts_ttf/Makefile head/arabic/kacst_fonts/Makefile head/arabic/khotot/Makefile head/audio/py-karaoke/Makefile head/benchmarks/phoronix-test-suite/Makefile head/chinese/auto-cn-l10n/Makefile head/chinese/bg5ps/Makefile head/chinese/eterm/Makefile head/chinese/gugod-clean/Makefile head/chinese/gugod-clean/pkg-plist head/chinese/kcfonts/Makefile head/chinese/kcfonts/files/patch-Makefile head/chinese/kcfonts/pkg-plist head/chinese/ttfm/Makefile head/chinese/ttfm/Makefile.ttf head/comms/gnuradio/Makefile head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in head/databases/rrdtool/Makefile head/deskutils/conkyforecast/Makefile head/deskutils/conkyforecast/files/pkg-message.in head/devel/rlvm/Makefile head/editors/abiword/Makefile head/editors/libreoffice/Makefile head/editors/openoffice-4/Makefile head/editors/openoffice-devel/Makefile head/emulators/stonx/Makefile head/emulators/stonx/pkg-plist head/emulators/x48/Makefile head/games/stonesoup/Makefile head/games/stonesoup/files/patch-Makefile head/games/warzone2100/Makefile head/games/xblast/Makefile head/games/xjewel/Makefile head/games/xmoto/Makefile head/games/xpacman/Makefile head/graphics/GraphicsMagick/Makefile head/graphics/a2png/Makefile head/graphics/inventor/Makefile head/graphics/inventor/files/patch-fl.c head/graphics/inventor/files/pkg-message.in head/graphics/lcdtest/Makefile head/graphics/ruby-gd/Makefile head/graphics/sk1libs/Makefile head/graphics/sk1libs/files/patch-src-utils-fs.py head/hebrew/culmus/Makefile head/hebrew/culmus/pkg-plist head/hebrew/elmar-fonts/Makefile head/hebrew/elmar-fonts/pkg-plist head/japanese/alias-fonts/Makefile head/japanese/alias-fonts/pkg-install head/japanese/elisa8x8/Makefile head/japanese/elisa8x8/pkg-plist head/japanese/font-ipa-uigothic/Makefile head/japanese/font-ipa-uigothic/files/pkg-install.in head/japanese/font-ipa-uigothic/pkg-plist head/japanese/font-ipa/Makefile head/japanese/font-ipa/files/pkg-install.in head/japanese/font-ipa/pkg-plist head/japanese/font-ipaex/Makefile head/japanese/font-ipaex/files/pkg-install.in head/japanese/font-ipaex/pkg-plist head/japanese/font-ipamjm/Makefile head/japanese/font-ipamjm/files/pkg-install.in head/japanese/font-ipamjm/pkg-plist head/japanese/font-jisx0213/Makefile head/japanese/font-jisx0213/files/Makefile head/japanese/font-jisx0213/pkg-plist head/japanese/font-kochi/Makefile head/japanese/font-kochi/files/pkg-install.in head/japanese/font-kochi/pkg-plist head/japanese/font-koruri/Makefile head/japanese/font-koruri/files/pkg-install.in head/japanese/font-koruri/pkg-plist head/japanese/font-migmix/Makefile head/japanese/font-migmix/files/pkg-install.in head/japanese/font-migmix/pkg-plist head/japanese/font-migu/Makefile head/japanese/font-migu/files/pkg-install.in head/japanese/font-migu/pkg-plist head/japanese/font-mona-ipa/Makefile head/japanese/font-mona-ipa/files/pkg-install.in head/japanese/font-mona-ipa/pkg-plist head/japanese/font-motoya-al/Makefile head/japanese/font-motoya-al/files/pkg-install.in head/japanese/font-motoya-al/pkg-plist head/japanese/font-mplus-ipa/Makefile head/japanese/font-mplus-ipa/files/pkg-install.in head/japanese/font-mplus-ipa/pkg-plist head/japanese/font-ricty/Makefile head/japanese/font-sazanami/Makefile head/japanese/font-sazanami/files/pkg-install.in head/japanese/font-sazanami/pkg-plist head/japanese/font-shinonome/Makefile head/japanese/font-shinonome/files/pkg-install.in head/japanese/font-shinonome/pkg-plist head/japanese/font-takao/Makefile head/japanese/font-takao/files/pkg-install.in head/japanese/font-takao/pkg-plist head/japanese/font-ume/Makefile head/japanese/font-ume/files/pkg-install.in head/japanese/font-ume/pkg-plist head/japanese/font-vlgothic/Makefile head/japanese/font-vlgothic/files/pkg-install.in head/japanese/font-vlgothic/pkg-plist head/japanese/k10/Makefile head/japanese/k10/pkg-deinstall head/japanese/k10/pkg-install head/japanese/k10/pkg-plist head/japanese/k12/Makefile head/japanese/k12/pkg-plist head/japanese/kanji18/Makefile head/japanese/kanji18/pkg-descr head/japanese/kanji26/pkg-descr head/japanese/kappa20/Makefile head/japanese/kappa20/pkg-deinstall head/japanese/kappa20/pkg-install head/japanese/kappa20/pkg-plist head/japanese/kterm/Makefile head/japanese/kterm/pkg-plist head/japanese/marumoji-fonts/Makefile head/japanese/marumoji-fonts/pkg-deinstall head/japanese/marumoji-fonts/pkg-install head/japanese/marumoji-fonts/pkg-plist head/japanese/mikachan-ttfonts/Makefile head/japanese/mikachan-ttfonts/pkg-deinstall head/japanese/mikachan-ttfonts/pkg-install head/japanese/mikachan-ttfonts/pkg-plist head/japanese/monafonts-ttf/Makefile head/japanese/monafonts-ttf/pkg-deinstall head/japanese/monafonts-ttf/pkg-descr head/japanese/monafonts-ttf/pkg-install head/japanese/monafonts/Makefile head/japanese/monafonts/files/patch-Makefile head/japanese/monafonts/pkg-deinstall head/japanese/monafonts/pkg-descr head/japanese/monafonts/pkg-install head/japanese/monafonts/pkg-plist head/japanese/navi2ch/Makefile head/japanese/ngraph-fonts/Makefile head/korean/aleefonts-ttf/Makefile head/korean/baekmukfonts-bdf/Makefile head/korean/baekmukfonts-bdf/pkg-plist head/korean/baekmukfonts-ttf/Makefile head/korean/baekmukfonts-ttf/pkg-plist head/korean/gtkcomm/Makefile head/korean/hanyangfonts/Makefile head/korean/hanyangfonts/files/pkg-message.in head/korean/hanyangfonts/pkg-plist head/korean/kaistfonts/Makefile head/korean/kaistfonts/files/patch-Makefile head/korean/kaistfonts/pkg-plist head/korean/nanumcoding-ttf/Makefile head/korean/nanumfonts-otf/Makefile head/korean/unfonts-core/Makefile head/korean/xpdf/Makefile head/math/plplot/Makefile head/misc/freebsd-doc-en/Makefile head/multimedia/devede/Makefile head/multimedia/dvd-slideshow/Makefile head/multimedia/xawtv/Makefile head/net/tightvnc/Makefile head/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile head/net/tridiavnc/Makefile head/net/tridiavnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile head/net/vnc/Makefile head/print/lilypond-devel/Makefile head/print/lilypond/Makefile head/russian/artwiz-ru/Makefile head/russian/artwiz-ru/files/pkg-message.in head/russian/artwiz-ru/pkg-plist head/sysutils/asusoled/Makefile head/sysutils/grub2-efi/Makefile head/sysutils/grub2-pcbsd/Makefile head/sysutils/grub2-pcbsd/files/patch-configure.ac head/sysutils/grub2/Makefile head/sysutils/jfbterm/Makefile head/textproc/docproj/Makefile head/ukrainian/monacofonts/Makefile head/ukrainian/monacofonts/files/Makefile head/ukrainian/monacofonts/pkg-message head/ukrainian/monacofonts/pkg-plist head/vietnamese/unicode-uhoai/Makefile head/vietnamese/unicode-uhoai/pkg-plist head/www/awffull/Makefile head/x11-fonts/alegreya-sans/Makefile head/x11-fonts/alegreya-sans/pkg-plist head/x11-fonts/anonymous-pro/Makefile head/x11-fonts/artwiz-aleczapka-de/Makefile head/x11-fonts/artwiz-aleczapka-de/pkg-plist head/x11-fonts/artwiz-aleczapka-se/Makefile head/x11-fonts/artwiz-aleczapka-se/pkg-plist head/x11-fonts/artwiz-aleczapka/Makefile head/x11-fonts/artwiz-aleczapka/files/pkg-message.in head/x11-fonts/artwiz-aleczapka/pkg-plist head/x11-fonts/artwiz-fonts/Makefile head/x11-fonts/artwiz-fonts/files/pkg-message.in head/x11-fonts/artwiz-fonts/pkg-plist head/x11-fonts/bitstream-vera/Makefile head/x11-fonts/bitter/Makefile head/x11-fonts/bitter/pkg-plist head/x11-fonts/c64bdf/Makefile head/x11-fonts/clearsans/Makefile head/x11-fonts/clearsans/pkg-plist head/x11-fonts/code2000/Makefile head/x11-fonts/code2001/Makefile head/x11-fonts/comfortaa-ttf/Makefile head/x11-fonts/comfortaa-ttf/pkg-plist head/x11-fonts/comic-neue/Makefile head/x11-fonts/consolamono-ttf/Makefile head/x11-fonts/consolamono-ttf/pkg-plist head/x11-fonts/croscorefonts-fonts-ttf/Makefile head/x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in head/x11-fonts/crosextrafonts-caladea-ttf/Makefile head/x11-fonts/crosextrafonts-caladea-ttf/files/pkg-message.in head/x11-fonts/crosextrafonts-caladea-ttf/pkg-plist head/x11-fonts/crosextrafonts-carlito-ttf/Makefile head/x11-fonts/crosextrafonts-carlito-ttf/pkg-plist head/x11-fonts/cyberbit-ttfonts/Makefile head/x11-fonts/cyberbit-ttfonts/files/pkg-message.in head/x11-fonts/cyr-rfx/Makefile head/x11-fonts/cyr-rfx/files/pkg-message.in head/x11-fonts/cyr-rfx/pkg-plist head/x11-fonts/dejavu/files/pkg-message.in head/x11-fonts/dina/Makefile head/x11-fonts/dina/pkg-plist head/x11-fonts/ecofont/Makefile head/x11-fonts/ecofont/files/pkg-message.in head/x11-fonts/encodings/Makefile head/x11-fonts/encodings/pkg-plist head/x11-fonts/fantasque-sans-mono/Makefile head/x11-fonts/fantasque-sans-mono/pkg-plist head/x11-fonts/farsifonts/Makefile head/x11-fonts/farsifonts/pkg-plist head/x11-fonts/font-adobe-100dpi/Makefile head/x11-fonts/font-adobe-100dpi/pkg-plist head/x11-fonts/font-adobe-75dpi/Makefile head/x11-fonts/font-adobe-75dpi/pkg-plist head/x11-fonts/font-adobe-utopia-100dpi/Makefile head/x11-fonts/font-adobe-utopia-100dpi/pkg-plist head/x11-fonts/font-adobe-utopia-75dpi/Makefile head/x11-fonts/font-adobe-utopia-75dpi/pkg-plist head/x11-fonts/font-adobe-utopia-type1/Makefile head/x11-fonts/font-adobe-utopia-type1/pkg-plist head/x11-fonts/font-alias/Makefile head/x11-fonts/font-alias/pkg-plist head/x11-fonts/font-arabic-misc/Makefile head/x11-fonts/font-arabic-misc/pkg-plist head/x11-fonts/font-bh-100dpi/Makefile head/x11-fonts/font-bh-100dpi/pkg-plist head/x11-fonts/font-bh-75dpi/Makefile head/x11-fonts/font-bh-75dpi/pkg-plist head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile head/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-plist head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile head/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-plist head/x11-fonts/font-bh-ttf/Makefile head/x11-fonts/font-bh-ttf/pkg-plist head/x11-fonts/font-bh-type1/Makefile head/x11-fonts/font-bh-type1/pkg-plist head/x11-fonts/font-bitstream-100dpi/Makefile head/x11-fonts/font-bitstream-100dpi/pkg-plist head/x11-fonts/font-bitstream-75dpi/Makefile head/x11-fonts/font-bitstream-75dpi/pkg-plist head/x11-fonts/font-bitstream-speedo/Makefile head/x11-fonts/font-bitstream-speedo/pkg-plist head/x11-fonts/font-bitstream-type1/Makefile head/x11-fonts/font-bitstream-type1/pkg-plist head/x11-fonts/font-cronyx-cyrillic/Makefile head/x11-fonts/font-cronyx-cyrillic/pkg-plist head/x11-fonts/font-cursor-misc/Makefile head/x11-fonts/font-cursor-misc/pkg-plist head/x11-fonts/font-daewoo-misc/Makefile head/x11-fonts/font-daewoo-misc/pkg-plist head/x11-fonts/font-dec-misc/Makefile head/x11-fonts/font-dec-misc/pkg-plist head/x11-fonts/font-gost/Makefile head/x11-fonts/font-ibm-type1/Makefile head/x11-fonts/font-ibm-type1/pkg-plist head/x11-fonts/font-isas-misc/Makefile head/x11-fonts/font-isas-misc/pkg-plist head/x11-fonts/font-jis-misc/Makefile head/x11-fonts/font-jis-misc/pkg-plist head/x11-fonts/font-micro-misc/Makefile head/x11-fonts/font-micro-misc/pkg-plist head/x11-fonts/font-misc-cyrillic/Makefile head/x11-fonts/font-misc-cyrillic/pkg-plist head/x11-fonts/font-misc-ethiopic/Makefile head/x11-fonts/font-misc-ethiopic/pkg-plist head/x11-fonts/font-misc-meltho/Makefile head/x11-fonts/font-misc-meltho/pkg-plist head/x11-fonts/font-misc-misc/Makefile head/x11-fonts/font-misc-misc/pkg-plist head/x11-fonts/font-mutt-misc/Makefile head/x11-fonts/font-mutt-misc/pkg-plist head/x11-fonts/font-schumacher-misc/Makefile head/x11-fonts/font-schumacher-misc/pkg-plist head/x11-fonts/font-screen-cyrillic/Makefile head/x11-fonts/font-screen-cyrillic/pkg-plist head/x11-fonts/font-sony-misc/Makefile head/x11-fonts/font-sony-misc/pkg-plist head/x11-fonts/font-sun-misc/Makefile head/x11-fonts/font-sun-misc/pkg-plist head/x11-fonts/font-util/Makefile head/x11-fonts/font-util/pkg-plist head/x11-fonts/font-winitzki-cyrillic/Makefile head/x11-fonts/font-winitzki-cyrillic/pkg-plist head/x11-fonts/font-xfree86-type1/Makefile head/x11-fonts/font-xfree86-type1/pkg-plist head/x11-fonts/fonts-indic/Makefile head/x11-fonts/freefont-ttf/Makefile head/x11-fonts/freefont-ttf/pkg-plist head/x11-fonts/freefonts/Makefile head/x11-fonts/geminifonts/Makefile head/x11-fonts/geminifonts/pkg-message head/x11-fonts/geminifonts/pkg-plist head/x11-fonts/gnu-unifont-ttf/Makefile head/x11-fonts/gnu-unifont-ttf/pkg-plist head/x11-fonts/gnu-unifont/Makefile head/x11-fonts/gohufont/Makefile head/x11-fonts/gohufont/pkg-plist head/x11-fonts/hanazono-fonts-ttf/Makefile head/x11-fonts/hanazono-fonts-ttf/pkg-plist head/x11-fonts/inconsolata-lgc-ttf/Makefile head/x11-fonts/indic-ttf/Makefile head/x11-fonts/indic-ttf/pkg-plist head/x11-fonts/isabella/Makefile head/x11-fonts/isabella/pkg-plist head/x11-fonts/jmk-x11-fonts/Makefile head/x11-fonts/junicode/Makefile head/x11-fonts/khmeros/Makefile head/x11-fonts/lfpfonts-fix/Makefile head/x11-fonts/lfpfonts-fix/pkg-plist head/x11-fonts/lfpfonts-var/Makefile head/x11-fonts/lfpfonts-var/pkg-plist head/x11-fonts/linuxlibertine/Makefile head/x11-fonts/manu-gothica/Makefile head/x11-fonts/mgopen/Makefile head/x11-fonts/mondulkiri/Makefile head/x11-fonts/montecarlo_fonts/Makefile head/x11-fonts/montecarlo_fonts/pkg-plist head/x11-fonts/noto/Makefile head/x11-fonts/nucleus/Makefile head/x11-fonts/nucleus/pkg-plist head/x11-fonts/padauk/Makefile head/x11-fonts/paratype/Makefile head/x11-fonts/pingwi/Makefile head/x11-fonts/profont/Makefile head/x11-fonts/profont/pkg-plist head/x11-fonts/proggy_fonts/Makefile head/x11-fonts/proggy_fonts/pkg-plist head/x11-fonts/roboto-fonts-ttf/Makefile head/x11-fonts/sgifonts/Makefile head/x11-fonts/sgifonts/files/pkg-message.in head/x11-fonts/sharefonts/Makefile head/x11-fonts/sourcecodepro-ttf/Makefile head/x11-fonts/stix-fonts/Makefile head/x11-fonts/stix-fonts/files/pkg-message.in head/x11-fonts/stix-fonts/pkg-plist head/x11-fonts/suxus/Makefile head/x11-fonts/suxus/files/pkg-message.in head/x11-fonts/symbola/Makefile head/x11-fonts/symbola/pkg-plist head/x11-fonts/tv-fonts/Makefile head/x11-fonts/tv-fonts/pkg-plist head/x11-fonts/vollkorn-ttf/Makefile head/x11-fonts/vollkorn-ttf/pkg-plist head/x11-fonts/webfonts/Makefile head/x11-fonts/xfs/Makefile head/x11-fonts/xfs/pkg-plist head/x11-fonts/xorg-fonts-100dpi/Makefile head/x11-fonts/xorg-fonts-75dpi/Makefile head/x11-fonts/xorg-fonts-cyrillic/Makefile head/x11-fonts/xorg-fonts-miscbitmaps/Makefile head/x11-fonts/xorg-fonts-truetype/Makefile head/x11-fonts/xorg-fonts-type1/Makefile head/x11-fonts/xorg-fonts/Makefile head/x11-servers/Xfstt/Makefile head/x11-servers/Xfstt/files/pkg-message.in head/x11-servers/Xfstt/pkg-plist head/x11-servers/x11rdp/Makefile head/x11-servers/x11rdp/files/patch-buildx_sh head/x11-servers/xorg-nestserver/Makefile head/x11-servers/xorg-server/Makefile head/x11-servers/xorg-vfbserver/Makefile head/x11-toolkits/pango/Makefile head/x11-toolkits/qt4-gui/Makefile head/x11-toolkits/qt5-gui/Makefile head/x11-wm/libdockapp/Makefile head/x11-wm/libdockapp/pkg-plist head/x11/gnome3/Makefile head/x11/mate-base/Makefile head/x11/metisse/Makefile head/x11/x3270/Makefile head/x11/x3270/pkg-plist Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Sat Mar 21 22:47:08 2015 (r381875) +++ head/Mk/Scripts/check-stagedir.sh Sat Mar 21 23:05:19 2015 (r381876) @@ -152,8 +152,8 @@ check_orphans_from_plist() { */.svnignore) ;; */CVS/*|'@dir '*/CVS) ;; */info/dir|info/dir) ;; - lib/X11/fonts/*/fonts.dir) ;; - lib/X11/fonts/*/fonts.scale) ;; + share/fonts/*/fonts.dir) ;; + share/fonts/*/fonts.scale) ;; share/applications/mimeinfo.cache) ;; share/mime/XMLnamespaces) ;; share/mime/aliases) ;; Modified: head/Mk/Uses/display.mk ============================================================================== --- head/Mk/Uses/display.mk Sat Mar 21 22:47:08 2015 (r381875) +++ head/Mk/Uses/display.mk Sat Mar 21 23:05:19 2015 (r381876) @@ -17,8 +17,8 @@ display_ARGS= install .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \ - ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \ - ${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \ + ${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \ + ${LOCALBASE}/share/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \ ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp Modified: head/Mk/Uses/fonts.mk ============================================================================== --- head/Mk/Uses/fonts.mk Sat Mar 21 22:47:08 2015 (r381875) +++ head/Mk/Uses/fonts.mk Sat Mar 21 23:05:19 2015 (r381876) @@ -14,7 +14,7 @@ RUN_DEPENDS+= fc-cache:${PORTSDIR}/x11-f mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale FONTNAME?= ${PORTNAME} -FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME} +FONTSDIR?= ${PREFIX}/share/fonts/${FONTNAME} PLIST_FILES+= "@fcfontsdir ${FONTSDIR}" SUB_LIST+= FONTSDIR="${FONTSDIR}" PLIST_SUB+= FONTSDIR="${FONTSDIR}" Modified: head/Mk/bsd.xorg.mk ============================================================================== --- head/Mk/bsd.xorg.mk Sat Mar 21 22:47:08 2015 (r381875) +++ head/Mk/bsd.xorg.mk Sat Mar 21 23:05:19 2015 (r381876) @@ -70,12 +70,14 @@ USES+= libtool . if ${XORG_CAT} == "font" FONTNAME?= ${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 +CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts +CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/share/fonts . if !defined(NOFONT) USES+= fonts BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +PLIST_FILES+= "@comment ${FONTSDIR}/fonts.dir" \ + "@comment ${FONTSDIR}/fonts.scale" . endif . endif @@ -93,7 +95,9 @@ USES+= pathfix DISTFILES?= xorg-server-${PORTVERSION}.tar.bz2 WRKSRC= ${WRKDIR}/xorg-server-${PORTVERSION} USES+= pathfix -CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb +CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb \ + --with-fontrootdir=${LOCALBASE}/share/fonts \ + --with-default-font-path="catalogue:${LOCALBASE}/etc/X11/fontpath.d,built-ins" LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri USE_XORG+= pciaccess xextproto videoproto fontsproto dri2proto fontutil:build Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Mar 21 22:47:08 2015 (r381875) +++ head/UPDATING Sat Mar 21 23:05:19 2015 (r381876) @@ -5,6 +5,18 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150321: + AFFECTS: Users of x11-servers/xorg-server and other X servers + AUTHOR: bapt@FreeBSD.org + + All fonts ports have been modified to respect XDG and install in + share/fonts + + The Xorg servers now are looking there by default, and have been + modified to also look into etc/X11/fontpath.d (see Xserver(1) for more + details) adding a symlink in that directory pointing to a font directory + will automatically add the later into Xorg FontPath + 20150317: AFFECTS: users of editors/openoffice-4 and editors/openoffice-devel AUTHOR: truckman@FreeBSD.org Modified: head/arabic/ae_fonts_mono/Makefile ============================================================================== --- head/arabic/ae_fonts_mono/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/arabic/ae_fonts_mono/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= ae_fonts_mono PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= arabic x11-fonts MASTER_SITES= SF/arabeyes/Fonts/ae_fonts DISTNAME= ${PORTNAME} Modified: head/arabic/ae_fonts_ttf/Makefile ============================================================================== --- head/arabic/ae_fonts_ttf/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/arabic/ae_fonts_ttf/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= ae_fonts1_ttf PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= arabic x11-fonts MASTER_SITES= SF/arabeyes/Fonts/ae_fonts DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: head/arabic/kacst_fonts/Makefile ============================================================================== --- head/arabic/kacst_fonts/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/arabic/kacst_fonts/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= kacst_fonts PORTVERSION= 2.01 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= arabic MASTER_SITES= SF/arabeyes/${PORTNAME} \ http://www.c-s.li/ports/ Modified: head/arabic/khotot/Makefile ============================================================================== --- head/arabic/khotot/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/arabic/khotot/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -23,8 +23,8 @@ MONO_DESC= Install Arabic PCF fonts AEFONTS_DESC= Install Arabeyes project TrueType fonts KACST_DESC= Install King AbdulAziz University fonts -MONO_RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/ae_fonts_mono/fonts.dir:${PORTSDIR}/arabic/ae_fonts_mono -AEFONTS_RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/ae_fonts1/AAHS/fonts.dir:${PORTSDIR}/arabic/ae_fonts_ttf -KACST_RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/kacst_fonts/fonts.dir:${PORTSDIR}/arabic/kacst_fonts +MONO_RUN_DEPENDS= ae_fonts_mono>0:${PORTSDIR}/arabic/ae_fonts_mono +AEFONTS_RUN_DEPENDS= ae_fonts_ttf>0:${PORTSDIR}/arabic/ae_fonts_ttf +KACST_RUN_DEPENDS= kacst_fonts>0:${PORTSDIR}/arabic/kacst_fonts .include <bsd.port.mk> Modified: head/audio/py-karaoke/Makefile ============================================================================== --- head/audio/py-karaoke/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/audio/py-karaoke/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= karaoke PORTVERSION= 0.7.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -52,7 +52,7 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${DATADIR}/fonts .for i in DejaVuSans.ttf DejaVuSansCondensed-Bold.ttf DejaVuSansCondensed.ttf - @${LN} -sf ${LOCALBASE}/lib/X11/fonts/dejavu/${i} \ + @${LN} -sf ${LOCALBASE}/share/fonts/dejavu/${i} \ ${STAGEDIR}${DATADIR}/fonts .endfor @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pycdgAux.so Modified: head/benchmarks/phoronix-test-suite/Makefile ============================================================================== --- head/benchmarks/phoronix-test-suite/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/benchmarks/phoronix-test-suite/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,6 +3,7 @@ PORTNAME= phoronix-test-suite PORTVERSION= 5.4.1 +PORTREVISION= 1 CATEGORIES= benchmarks MASTER_SITES= http://www.phoronix-test-suite.com/releases/ @@ -43,7 +44,7 @@ post-patch: ${WRKSRC}/pts-core/external-test-dependencies/xml/freebsd-packages.xml \ ${WRKSRC}/pts-core/objects/bilde_renderer/bilde_renderer.php \ ${WRKSRC}/pts-core/objects/client/pts_client.php - @${SED} -i '' -e "s|/usr/share/fonts|${LOCALBASE}/lib/X11/fonts| ; \ + @${SED} -i '' -e "s|/usr/share/fonts|${LOCALBASE}/share/fonts| ; \ s|/usr/X11/lib|${LOCALBASE}/lib|" \ ${WRKSRC}/pts-core/objects/bilde_renderer/bilde_renderer.php @${SED} -i '' -e "/fpdf.php/s|/usr/share/php|${PREFIX}/share|" \ Modified: head/chinese/auto-cn-l10n/Makefile ============================================================================== --- head/chinese/auto-cn-l10n/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/auto-cn-l10n/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -28,7 +28,7 @@ RELAXCONF_DESC= A set of utilities for .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MWQY} -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy +RUN_DEPENDS+= ${LOCALBASE}/share/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy .endif .if ${PORT_OPTIONS:MFIREFLYTTF} Modified: head/chinese/bg5ps/Makefile ============================================================================== --- head/chinese/bg5ps/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/bg5ps/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= bg5ps PORTVERSION= 1.3.0p3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese print MASTER_SITES= http://ftp.jaist.ac.jp/pub/FreeBSD/distfiles/ \ http://www.gtlib.gatech.edu/pub/FreeBSD/distfiles/ @@ -19,6 +19,9 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS EXAMPLES +post-patch: + @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' bg5ps.conf gb2312-bg5ps.conf + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bg5ps ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/ttf2psm ${STAGEDIR}${PREFIX}/bin Modified: head/chinese/eterm/Makefile ============================================================================== --- head/chinese/eterm/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/eterm/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -18,6 +18,6 @@ CONFIGURE_ARGS= --enable-trans --enable- PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist -RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts +RUN_DEPENDS= ${LOCALBASE}/share/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts .include "${MASTERDIR}/Makefile" Modified: head/chinese/gugod-clean/Makefile ============================================================================== --- head/chinese/gugod-clean/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/gugod-clean/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,25 +3,24 @@ PORTNAME= gugod-clean PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese x11-fonts MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/gugod/ MAINTAINER= gugod@gugod.org COMMENT= Pretty font modifyed from X11 schumacher-clean that match kcfonts +USES= fonts RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale FONTFILES= gugod16.bdf gugod18.bdf gugod20.bdf gugod22.bdf WRKSRC= ${WRKDIR} NO_BUILD= yes -XFONTDIR= ${LOCALBASE}/lib/X11/fonts/local +FONTNAME= gugod do-install: - @${MKDIR} ${STAGEDIR}${XFONTDIR} - ${INSTALL_DATA} ${FONTFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${XFONTDIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${FONTFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${FONTSDIR} .include <bsd.port.mk> Modified: head/chinese/gugod-clean/pkg-plist ============================================================================== --- head/chinese/gugod-clean/pkg-plist Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/gugod-clean/pkg-plist Sat Mar 21 23:05:19 2015 (r381876) @@ -1,6 +1,4 @@ -lib/X11/fonts/local/gugod16.bdf -lib/X11/fonts/local/gugod18.bdf -lib/X11/fonts/local/gugod20.bdf -lib/X11/fonts/local/gugod22.bdf -@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir -@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir +%%FONTSDIR%%/gugod16.bdf +%%FONTSDIR%%/gugod18.bdf +%%FONTSDIR%%/gugod20.bdf +%%FONTSDIR%%/gugod22.bdf Modified: head/chinese/kcfonts/Makefile ============================================================================== --- head/chinese/kcfonts/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/kcfonts/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= kcfonts PORTVERSION= 1.05 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese x11-fonts MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles @@ -11,12 +11,16 @@ MASTER_SITE_SUBDIR= distfiles MAINTAINER= ports@FreeBSD.org COMMENT= Kuo Chauo Chinese Fonts collection +USES= fonts BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +MAKE_ARGS= CFONTDIR=${FONTSDIR} EFONTDIR=${FONTSDIR} MAKE_JOBS_UNSAFE=yes BROKEN_sparc64= Does not build on sparc64 NO_WRKSUBDIR= yes +pre-install: + ${MKDIR} ${STAGEDIR}${FONTSDIR} + .include <bsd.port.mk> Modified: head/chinese/kcfonts/files/patch-Makefile ============================================================================== --- head/chinese/kcfonts/files/patch-Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/kcfonts/files/patch-Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -13,8 +13,8 @@ -CFONTDIR=/usr/X11R6/lib/X11/fonts/chinese -EFONTDIR=/usr/X11R6/lib/X11/fonts/misc -+CFONTDIR=${PREFIX}/lib/X11/fonts/local -+EFONTDIR=${PREFIX}/lib/X11/fonts/local ++CFONTDIR=${PREFIX}/share/fonts/chinese ++EFONTDIR=${PREFIX}/share/fonts/misc FONTS =kc24f.pcf.gz kc15f.pcf.gz kc8x15.pcf.gz kc12x24.pcf.gz PROGS =kc24f kc15f kc8x15 kc12x24 kca2et OBJS =tran.o kc24f.o kc15f.o kc8x15.o kc12x24.o kca2et.o Modified: head/chinese/kcfonts/pkg-plist ============================================================================== --- head/chinese/kcfonts/pkg-plist Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/kcfonts/pkg-plist Sat Mar 21 23:05:19 2015 (r381876) @@ -1,9 +1,5 @@ -lib/X11/fonts/local/kc8x15.pcf.gz -lib/X11/fonts/local/kc12x24.pcf.gz -lib/X11/fonts/local/kc15f.pcf.gz -lib/X11/fonts/local/kc24f.pcf.gz -lib/X11/fonts/local/kc_fonts.alias -@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir -@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir -@unexec if [ `\head -1 %D/lib/X11/fonts/local/fonts.dir` = 0 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi -@unexec if [ ! -s %D/lib/X11/fonts/local/fonts.alias ]; then rm -f %D/lib/X11/fonts/local/fonts.alias; fi +%%FONTSDIR%%/kc8x15.pcf.gz +%%FONTSDIR%%/kc12x24.pcf.gz +%%FONTSDIR%%/kc15f.pcf.gz +%%FONTSDIR%%/kc24f.pcf.gz +%%FONTSDIR%%/kc_fonts.alias Modified: head/chinese/ttfm/Makefile ============================================================================== --- head/chinese/ttfm/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/ttfm/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,15 +3,13 @@ PORTNAME= ttfm PORTVERSION= 0.9.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= chinese print MASTER_SITES= LOCAL/rafan/chinese MAINTAINER= ports@FreeBSD.org COMMENT= Big5/GB enhanced TrueType Font Manager -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 MAKE_ARGS= FREETYPE_BASE=${LOCALBASE:Q} CC="${CC}" @@ -20,8 +18,6 @@ PORTDOCS= README USAGE OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \ -e 's,%%PREFIX%%,${PREFIX},' \ Modified: head/chinese/ttfm/Makefile.ttf ============================================================================== --- head/chinese/ttfm/Makefile.ttf Sat Mar 21 22:47:08 2015 (r381875) +++ head/chinese/ttfm/Makefile.ttf Sat Mar 21 23:05:19 2015 (r381876) @@ -16,7 +16,8 @@ FONTSDIR?= ${PREFIX}/share/fonts/TrueTyp FONTSDIR_REL= ${FONTSDIR:S,^${PREFIX}/,,} PLIST_SUB+= FONTSDIR=${FONTSDIR_REL} -XFONTSDIR?= ${LOCALBASE}/lib/X11/fonts/TrueType +USES+= fonts +XFONTSDIR?= ${LOCALBASE}/share/fonts/TrueType XFONTSDIR_REL= ${XFONTSDIR:S,${LOCALBASE}/,,} PLIST_SUB+= XFONTSDIR=${XFONTSDIR_REL} Modified: head/comms/gnuradio/Makefile ============================================================================== --- head/comms/gnuradio/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/comms/gnuradio/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -2,7 +2,7 @@ PORTNAME= gnuradio PORTVERSION= 3.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms astro hamradio MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \ ${MASTER_SITE_LOCAL} @@ -82,7 +82,7 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/deve ${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \ dot:${PORTSDIR}/graphics/graphviz \ xmlto:${PORTSDIR}/textproc/xmlto \ - ${LOCALBASE}/lib/X11/fonts/freefont-ttf/fonts.scale:${PORTSDIR}/x11-fonts/freefont-ttf + freefont-ttf>0:${PORTSDIR}/x11-fonts/freefont-ttf CMAKE_ARGS+= -DENABLE_DOXYGEN:STRING="ON" CMAKE_ARGS+= -DENABLE_DOCS:STRING="ON" CMAKE_ARGS+= -DENABLE_BAD_BOOST="ON" Modified: head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in ============================================================================== --- head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in Sat Mar 21 22:47:08 2015 (r381875) +++ head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in Sat Mar 21 23:05:19 2015 (r381876) @@ -5,7 +5,7 @@ # set the path where dot can find it. -DOT_FONTPATH = -+DOT_FONTPATH = %%PREFIX%%/lib/X11/fonts/freefont-ttf ++DOT_FONTPATH = %%PREFIX%%/share/fonts/freefont-ttf # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and Modified: head/databases/rrdtool/Makefile ============================================================================== --- head/databases/rrdtool/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/databases/rrdtool/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -93,7 +93,7 @@ USE_GNOME+= intltool CONFIGURE_ARGS+=--disable-nls .endif -.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU} +.if exists(${LOCALBASE}/share/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU} RUN_DEPENDS+= dejavu>0:${PORTSDIR}/x11-fonts/dejavu .endif Modified: head/deskutils/conkyforecast/Makefile ============================================================================== --- head/deskutils/conkyforecast/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/deskutils/conkyforecast/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,6 +3,7 @@ PORTNAME= conkyforecast PORTVERSION= 2.20 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= https://launchpadlibrarian.net/70673352/ \ LOCAL/vg @@ -13,17 +14,12 @@ COMMENT= Weather forecast script for con LICENSE= GPLv3 -BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= conky:${PORTSDIR}/sysutils/conky \ - pidof:${PORTSDIR}/sysutils/pidof \ - fc-cache:${PORTSDIR}/x11-fonts/fontconfig + pidof:${PORTSDIR}/sysutils/pidof -USES= gettext python +USES= gettext python fonts USE_PYTHON= distutils SUB_FILES= pkg-message -SUB_LIST+= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" -PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" -FONTSDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME} WRKSRC= ${WRKDIR}/src Modified: head/deskutils/conkyforecast/files/pkg-message.in ============================================================================== --- head/deskutils/conkyforecast/files/pkg-message.in Sat Mar 21 22:47:08 2015 (r381875) +++ head/deskutils/conkyforecast/files/pkg-message.in Sat Mar 21 23:05:19 2015 (r381876) @@ -5,7 +5,7 @@ line to the "Modules" section of your X Add the following line to the "Files" section of X Windows configuration file: - FontPath "%%PREFIX%%/%%FONTSDIR%%/" + FontPath "%%FONTSDIR%%/" For a working script you must define, in a user specific config file, a partner id and registration code for the weather.com xoap service. For this purpose Modified: head/devel/rlvm/Makefile ============================================================================== --- head/devel/rlvm/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/devel/rlvm/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -2,6 +2,7 @@ PORTNAME= rlvm PORTVERSION= 0.14.0.20150223 +PORTREVISION= 1 CATEGORIES= devel games MAINTAINER= jbeich@FreeBSD.org @@ -15,7 +16,7 @@ LIB_DEPENDS= libvorbisfile.so:${PORTSDIR libboost_serialization.so:${PORTSDIR}/devel/boost-libs \ libguichan.so:${PORTSDIR}/devel/guichan \ libGLEW.so:${PORTSDIR}/graphics/glew -RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu +RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu USE_GITHUB= yes GH_ACCOUNT= eglaysher @@ -43,11 +44,11 @@ OPTIONS_SUB= yes JAPANESE_FONT_DESC=msgothic.ttc alternatives with verified metrics (unless --font) KOCHI_DESC= kochi-gothic-subst.ttf from japanese/font-kochi -KOCHI_RUN_DEPENDS=${LOCALBASE}/lib/X11/fonts/TTF/kochi-gothic-subst.ttf:${PORTSDIR}/japanese/font-kochi +KOCHI_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/kochi-gothic-subst.ttf:${PORTSDIR}/japanese/font-kochi MONA_DESC= mona.ttf from japanese/monafonts-ttf -MONA_RUN_DEPENDS=${LOCALBASE}/lib/X11/fonts/TrueType/mona.ttf:${PORTSDIR}/japanese/monafonts-ttf +MONA_RUN_DEPENDS=${LOCALBASE}/share/fonts/TrueType/mona.ttf:${PORTSDIR}/japanese/monafonts-ttf SAZANAMI_DESC= sazanami-gothic.ttf from japanese/font-sazanami -SAZANAMI_RUN_DEPENDS=${LOCALBASE}/lib/X11/fonts/TTF/sazanami-gothic.ttf:${PORTSDIR}/japanese/font-sazanami +SAZANAMI_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/sazanami-gothic.ttf:${PORTSDIR}/japanese/font-sazanami DEBUG_MAKE_ARGS_OFF=--release NLS_USES= gettext @@ -67,7 +68,6 @@ post-patch: @${GREP} -Flr '/usr/share' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -i .bak.paths \ -e 's,/usr/share,${PREFIX}/share,' \ - -e 's,share/fonts,lib/X11/fonts,' \ -e 's,truetype/ttf-dejavu,dejavu,' \ -e 's,truetype/mona,TrueType,' \ -e 's,truetype/[^/"]*,TTF,' Modified: head/editors/abiword/Makefile ============================================================================== --- head/editors/abiword/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/editors/abiword/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -21,7 +21,7 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/deve libfribidi.so:${PORTSDIR}/converters/fribidi \ libpsiconv.so:${PORTSDIR}/converters/psiconv \ libgoffice-0.8.so:${PORTSDIR}/devel/goffice -RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu +RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/editors/libreoffice/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -62,12 +62,12 @@ LIB_DEPENDS= libapr-1.so:${PORTSDIR}/dev librdf.so:${PORTSDIR}/textproc/redland \ libserf-1.so:${PORTSDIR}/www/serf -RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \ - ${LOCALBASE}/lib/X11/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \ - ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \ - ${LOCALBASE}/lib/X11/fonts/GentiumBasic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic \ - ${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \ - ${LOCALBASE}/lib/X11/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g +RUN_DEPENDS= ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \ + ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \ + ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \ + ${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic \ + ${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \ + ${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g _MAKE_JOBS= # Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/editors/openoffice-4/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -64,7 +64,7 @@ RUN_DEPENDS= \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ - ${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf + ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf AOOVERSION1= 4 AOOVERSION2= 1 Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/editors/openoffice-devel/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -66,7 +66,7 @@ RUN_DEPENDS= \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ - ${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf + ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf AOOVERSION1= 4 AOOVERSION2= 2 Modified: head/emulators/stonx/Makefile ============================================================================== --- head/emulators/stonx/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/emulators/stonx/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -14,7 +14,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11- gccmakedep:${PORTSDIR}/devel/gccmakedep \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ - ${LOCALBASE}/lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc + ${LOCALBASE}/share/fonts/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir RESTRICTED= Contains ROM (C) by Atari @@ -27,7 +27,7 @@ CONFIGURE_ARGS= --x-includes=${LOCALBASE ALL_TARGET= all fnttobdf tosfonts fonts BINDIR= ${PREFIX}/bin -FNTDIR= ${PREFIX}/lib/X11/fonts/misc +FNTDIR= ${PREFIX}/share/fonts/misc DATA= atari/bench1.pas atari/bench1.prg ETCFILES= keysyms-alternative keysyms-german keysyms-spanish Modified: head/emulators/stonx/pkg-plist ============================================================================== --- head/emulators/stonx/pkg-plist Sat Mar 21 22:47:08 2015 (r381875) +++ head/emulators/stonx/pkg-plist Sat Mar 21 23:05:19 2015 (r381876) @@ -9,12 +9,12 @@ bin/stonx %%DATADIR%%/gemdos_c/final.tos %%DATADIR%%/gemdos_c/mint/stonx.xfs %%DATADIR%%/tos.img -lib/X11/fonts/misc/System0-iso.pcf.gz -lib/X11/fonts/misc/System0.pcf.gz -lib/X11/fonts/misc/System1-iso.pcf.gz -lib/X11/fonts/misc/System1.pcf.gz -lib/X11/fonts/misc/System2-iso.pcf.gz -lib/X11/fonts/misc/System2.pcf.gz +%%FONTSDIR%%/misc/System0-iso.pcf.gz +%%FONTSDIR%%/misc/System0.pcf.gz +%%FONTSDIR%%/misc/System1-iso.pcf.gz +%%FONTSDIR%%/misc/System1.pcf.gz +%%FONTSDIR%%/misc/System2-iso.pcf.gz +%%FONTSDIR%%/misc/System2.pcf.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/DEBUGGING @@ -24,6 +24,3 @@ lib/X11/fonts/misc/System2.pcf.gz %%PORTDOCS%%%%DOCSDIR%%/TOS-VERSIONS %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench1.pas %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench1.prg -@exec mkfontdir %D/lib/X11/fonts/misc -@exec xset fp+ %D/lib/X11/fonts/misc -@exec xset fp rehash Modified: head/emulators/x48/Makefile ============================================================================== --- head/emulators/x48/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/emulators/x48/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -15,8 +15,8 @@ COMMENT= HP48 SX/GX graphic calculator e LICENSE= GPLv3 -RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/misc/7x14B-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc \ - ${LOCALBASE}/lib/X11/fonts/75dpi/helvR12-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75dpi +RUN_DEPENDS= ${LOCALBASE}/share/fonts/misc/7x14B-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc \ + ${LOCALBASE}/share/fonts/75dpi/helvR12-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75dpi USE_AUTOTOOLS= aclocal autoheader automake autoconf AUTOMAKE_ARGS= --add-missing --copy -Wno-portability Modified: head/games/stonesoup/Makefile ============================================================================== --- head/games/stonesoup/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/games/stonesoup/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -58,8 +58,8 @@ MAKE_ARGS+= TILES=y PLIST_SUB+= SDL="" PKGNAMESUFFIX= -sdl BUILD_DEPENDS+= fc-list:${PORTSDIR}/x11-fonts/fontconfig \ - ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu + ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu +RUN_DEPENDS+= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 USE_SDL= sdl image Modified: head/games/stonesoup/files/patch-Makefile ============================================================================== --- head/games/stonesoup/files/patch-Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/games/stonesoup/files/patch-Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -78,7 +78,7 @@ endif else - SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) -+ SYS_PROPORTIONAL_FONT = $(shell dir=%%LOCALBASE%%/lib/X11/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) ++ SYS_PROPORTIONAL_FONT = $(shell dir=%%LOCALBASE%%/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) ifeq (,$(SYS_PROPORTIONAL_FONT)) SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) endif @@ -87,7 +87,7 @@ endif else - SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) -+ SYS_MONOSPACED_FONT = $(shell dir=%%LOCALBASE%%/lib/X11/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) ++ SYS_MONOSPACED_FONT = $(shell dir=%%LOCALBASE%%/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) ifeq (,$(SYS_MONOSPACED_FONT)) SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) endif Modified: head/games/warzone2100/Makefile ============================================================================== --- head/games/warzone2100/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/games/warzone2100/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -22,7 +22,7 @@ LIB_DEPENDS= libphysfs.so:${PORTSDIR}/de libfribidi.so:${PORTSDIR}/converters/fribidi \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu +RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu USES= tar:xz bison gmake openal:al pkgconfig compiler:c++11-lang # actually, old gcc fails on unknown -W flag GNU_CONFIGURE= yes Modified: head/games/xblast/Makefile ============================================================================== --- head/games/xblast/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/games/xblast/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= xblast PORTVERSION= 2.10.4 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION} \ SF/${PORTNAME}/Images/${IMAGES_DATE}:images \ @@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-otherdatadir=${DA CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -FONTSDIR= ${LOCALBASE}/lib/X11/fonts/bitstream-vera +FONTSDIR= ${LOCALBASE}/share/fonts/bitstream-vera IMAGES_DATE= 2005-01-06 LEVELS_DATE= 2005-01-06 Modified: head/games/xjewel/Makefile ============================================================================== --- head/games/xjewel/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/games/xjewel/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= xjewel PORTVERSION= 1.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= XCONTRIB/../R5contrib EXTRACT_SUFX= .tar.z @@ -11,25 +11,16 @@ EXTRACT_SUFX= .tar.z MAINTAINER= ports@FreeBSD.org COMMENT= X11 dropping jewels game -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ - mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf -USES= imake +USES= fonts imake USE_XORG= x11 xext -SUB_FILES= pkg-install pkg-deinstall -SUB_LIST= FONTSDIR="${FONTSDIR}" - -PLIST_SUB= FONTSDIR="${FONTSDIR}" - DESKTOP_ENTRIES="XJewel" "" "" "${PORTNAME}" "" "" -FONTSDIR= lib/X11/fonts/local - post-install: + @${MKDIR} ${STAGEDIR}${FONTSDIR} (cd ${WRKSRC}/bitmaps && ${INSTALL_DATA} seven_seg.pcf.gz \ - ${STAGEDIR}${PREFIX}/${FONTSDIR}) + ${STAGEDIR}${FONTSDIR}) .include <bsd.port.mk> Modified: head/games/xmoto/Makefile ============================================================================== --- head/games/xmoto/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/games/xmoto/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= xmoto PORTVERSION= 0.5.11 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://download.tuxfamily.org/xmoto/xmoto/${PORTVERSION}/ \ http://mirror.amdmi3.ru/distfiles/ @@ -42,8 +42,8 @@ OPTIONS_SUB= yes ASIAN_TTF_DESC= Use asian TTF font -ASIAN_TTF_RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/TrueType/bkai00mp.ttf:${PORTSDIR}/chinese/arphicttf -ASIAN_TTF_CONFIGURE_ON= --with-asian-ttf-file=${LOCALBASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf +ASIAN_TTF_RUN_DEPENDS= ${LOCALBASE}/share/fonts/TrueType/bkai00mp.ttf:${PORTSDIR}/chinese/arphicttf +ASIAN_TTF_CONFIGURE_ON= --with-asian-ttf-file=${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf ASIAN_TTF_CONFIGURE_OFF=--without-asian-ttf-file NLS_USES= gettext Modified: head/games/xpacman/Makefile ============================================================================== --- head/games/xpacman/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/games/xpacman/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -12,7 +12,7 @@ COMMENT= Old action game LICENSE= GPLv2 -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/misc/9x18.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc +RUN_DEPENDS+= ${LOCALBASE}/share/fonts/misc/9x18.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-doublesize Modified: head/graphics/GraphicsMagick/Makefile ============================================================================== --- head/graphics/GraphicsMagick/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/graphics/GraphicsMagick/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.20 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF \ @@ -95,7 +95,7 @@ LIBWMF_PORT= libwmf-nox11 .if !defined(WINDOWS_FONT_DIR) # Use fonts installed by x11-fonts/webfonts by default -WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts +WINDOWS_FONT_DIR=${LOCALBASE}/share/fonts/webfonts .endif .if ${PORT_OPTIONS:MTESTS} Modified: head/graphics/a2png/Makefile ============================================================================== --- head/graphics/a2png/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/graphics/a2png/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= a2png PORTVERSION= 0.1.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF @@ -18,7 +18,7 @@ CONFIGURE_ARGS= --enable-gd CFLAGS+= -DDEFAULT_FONTPATH='\"${FONTROOTDIR}/TTF:${FONTROOTDIR}/Type1:${FONTROOTDIR}\"' PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz -FONTROOTDIR?= ${LOCALBASE}/lib/X11/fonts +FONTROOTDIR?= ${LOCALBASE}/share/fonts do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Modified: head/graphics/inventor/Makefile ============================================================================== --- head/graphics/inventor/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/graphics/inventor/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= inventor PORTVERSION= 2.1.5.p10 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= ftp://oss.sgi.com/projects/inventor/download/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-/} Modified: head/graphics/inventor/files/patch-fl.c ============================================================================== --- head/graphics/inventor/files/patch-fl.c Sat Mar 21 22:47:08 2015 (r381875) +++ head/graphics/inventor/files/patch-fl.c Sat Mar 21 23:05:19 2015 (r381876) @@ -7,7 +7,7 @@ }; + #ifdef __FreeBSD__ -+ static char *fontPath = IVPREFIX "/lib/X11/fonts/TTF"; ++ static char *fontPath = IVPREFIX "/share/fonts/TTF"; + #else static char *fontPath = IVPREFIX "/share/data/fonts"; + #endif Modified: head/graphics/inventor/files/pkg-message.in ============================================================================== --- head/graphics/inventor/files/pkg-message.in Sat Mar 21 22:47:08 2015 (r381875) +++ head/graphics/inventor/files/pkg-message.in Sat Mar 21 23:05:19 2015 (r381876) @@ -14,7 +14,7 @@ Open Inventor (TM) needs the following T You should make symbolic links of the TrueType fonts to the OpenInventor (TM) font names if they are not available: - # cd %%PREFIX%%/lib/X11/fonts/TTF + # cd %%PREFIX%%/share/fonts/TTF # ln -s times.ttf Times-Roman # ln -s arial.ttf Helvetica # ln -s cour.ttf Utopia-Regular Modified: head/graphics/lcdtest/Makefile ============================================================================== --- head/graphics/lcdtest/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/graphics/lcdtest/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= lcdtest PORTVERSION= 1.18 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://www.brouhaha.com/~eric/software/lcdtest/download/ \ SF/nemysisfreebsdp/${CATEGORIES}/:icons @@ -33,7 +33,7 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ - 's|/usr/share/fonts/liberation/|${LOCALBASE}/lib/X11/fonts/Liberation/|' \ + 's|/usr/share/fonts/liberation/|${LOCALBASE}/share/fonts/Liberation/|' \ ${WRKSRC}/src/lcdtest.c do-build: Modified: head/graphics/ruby-gd/Makefile ============================================================================== --- head/graphics/ruby-gd/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/graphics/ruby-gd/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= gd PORTVERSION= 0.8.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics ruby MASTER_SITES= http://www.daifukuya.com/archive/kagemai/lib/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -62,7 +62,7 @@ DOCS_JA= readme.ja \ doc/INSTALL.ja post-patch: - ${RUBY} -i -pe 'sub %r:/win98/windows/FONTS:, "${LOCALBASE}/lib/X11/fonts/TrueType"' ${WRKSRC}/sample/gdtestttf.rb + ${RUBY} -i -pe 'sub %r:/win98/windows/FONTS:, "${LOCALBASE}/share/fonts/TrueType"' ${WRKSRC}/sample/gdtestttf.rb ${RUBY} -i -pe 'sub %r:%%GD%%:, "gd"' ${WRKSRC}/extconf.rb post-configure: Modified: head/graphics/sk1libs/Makefile ============================================================================== --- head/graphics/sk1libs/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/graphics/sk1libs/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,7 +3,7 @@ PORTNAME= sk1libs PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ Modified: head/graphics/sk1libs/files/patch-src-utils-fs.py ============================================================================== --- head/graphics/sk1libs/files/patch-src-utils-fs.py Sat Mar 21 22:47:08 2015 (r381875) +++ head/graphics/sk1libs/files/patch-src-utils-fs.py Sat Mar 21 23:05:19 2015 (r381876) @@ -5,7 +5,7 @@ system type. """ + if system.get_os_family()==system.FREEBSD: -+ return ['/usr/local/lib/X11/fonts', os.path.join(gethome(),'.fonts')] ++ return ['/usr/local/lib/X11/fonts', '/usr/local/share/fonts', os.path.join(gethome(),'.fonts')] if system.get_os_family()==system.LINUX: return ['/usr/share/fonts', os.path.join(gethome(),'.fonts')] - if system.get_os_family()==system.WINDOWS: Modified: head/hebrew/culmus/Makefile ============================================================================== --- head/hebrew/culmus/Makefile Sat Mar 21 22:47:08 2015 (r381875) +++ head/hebrew/culmus/Makefile Sat Mar 21 23:05:19 2015 (r381876) @@ -3,6 +3,7 @@ PORTNAME= culmus PORTVERSION= 0.130 +PORTREVISION= 1 CATEGORIES= hebrew MASTER_SITES= SF @@ -12,24 +13,20 @@ COMMENT= Free Hebrew Type1 fonts LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ - mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +USES= fonts NO_BUILD= yes SUB_FILES= pkg-message do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus + ${MKDIR} ${STAGEDIR}${FONTSDIR} .for filename in AharoniCLM-Bold AharoniCLM-BoldOblique AharoniCLM-Book AharoniCLM-BookOblique CaladingsCLM DrugulinCLM-Bold DrugulinCLM-BoldItalic ElliniaCLM-Bold ElliniaCLM-BoldItalic ElliniaCLM-Light ElliniaCLM-LightItalic NachlieliCLM-Bold NachlieliCLM-BoldOblique NachlieliCLM-Light NachlieliCLM-LightOblique YehudaCLM-Bold YehudaCLM-Light - ${INSTALL_DATA} ${WRKSRC}/${filename}.afm ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus - ${INSTALL_DATA} ${WRKSRC}/${filename}.pfa ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus + ${INSTALL_DATA} ${WRKSRC}/${filename}.afm ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/${filename}.pfa ${STAGEDIR}${FONTSDIR} .endfor .for filename in DavidCLM-Bold DavidCLM-BoldItalic DavidCLM-Medium DavidCLM-MediumItalic FrankRuehlCLM-Bold FrankRuehlCLM-BoldOblique FrankRuehlCLM-Medium FrankRuehlCLM-MediumOblique HadasimCLM-Bold HadasimCLM-BoldOblique HadasimCLM-Regular HadasimCLM-RegularOblique KeterYG-Bold KeterYG-BoldOblique KeterYG-Medium KeterYG-MediumOblique MiriamCLM-Bold MiriamCLM-Book MiriamMonoCLM-Bold MiriamMonoCLM-BoldOblique MiriamMonoCLM-Book MiriamMonoCLM-BookOblique ShofarDemi-Bold ShofarDemi-BoldOblique ShofarRegular ShofarRegularOblique SimpleCLM-Bold SimpleCLM-BoldOblique SimpleCLM-Medium SimpleCLM-MediumOblique StamAshkenazCLM StamSefaradCLM - ${INSTALL_DATA} ${WRKSRC}/${filename}.ttf ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus + ${INSTALL_DATA} ${WRKSRC}/${filename}.ttf ${STAGEDIR}${FONTSDIR} .endfor - @cd ${WRKSRC}; ${PREFIX}/bin/mkfontscale; ${PREFIX}/bin/mkfontdir - ${INSTALL_DATA} ${WRKSRC}/fonts.scale-* ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus - .include <bsd.port.mk> Modified: head/hebrew/culmus/pkg-plist ============================================================================== --- head/hebrew/culmus/pkg-plist Sat Mar 21 22:47:08 2015 (r381875) +++ head/hebrew/culmus/pkg-plist Sat Mar 21 23:05:19 2015 (r381876) @@ -1,68 +1,66 @@ -lib/X11/fonts/culmus/AharoniCLM-Bold.pfa -lib/X11/fonts/culmus/AharoniCLM-Bold.afm -lib/X11/fonts/culmus/AharoniCLM-BoldOblique.pfa -lib/X11/fonts/culmus/AharoniCLM-BoldOblique.afm -lib/X11/fonts/culmus/AharoniCLM-Book.pfa -lib/X11/fonts/culmus/AharoniCLM-Book.afm -lib/X11/fonts/culmus/AharoniCLM-BookOblique.pfa -lib/X11/fonts/culmus/AharoniCLM-BookOblique.afm -lib/X11/fonts/culmus/CaladingsCLM.pfa -lib/X11/fonts/culmus/CaladingsCLM.afm -lib/X11/fonts/culmus/DavidCLM-Bold.ttf -lib/X11/fonts/culmus/DavidCLM-BoldItalic.ttf -lib/X11/fonts/culmus/DavidCLM-Medium.ttf -lib/X11/fonts/culmus/DavidCLM-MediumItalic.ttf -lib/X11/fonts/culmus/DrugulinCLM-Bold.pfa -lib/X11/fonts/culmus/DrugulinCLM-Bold.afm -lib/X11/fonts/culmus/DrugulinCLM-BoldItalic.pfa -lib/X11/fonts/culmus/DrugulinCLM-BoldItalic.afm -lib/X11/fonts/culmus/ElliniaCLM-Bold.pfa -lib/X11/fonts/culmus/ElliniaCLM-Bold.afm -lib/X11/fonts/culmus/ElliniaCLM-BoldItalic.pfa -lib/X11/fonts/culmus/ElliniaCLM-BoldItalic.afm -lib/X11/fonts/culmus/ElliniaCLM-Light.pfa -lib/X11/fonts/culmus/ElliniaCLM-Light.afm -lib/X11/fonts/culmus/ElliniaCLM-LightItalic.pfa -lib/X11/fonts/culmus/ElliniaCLM-LightItalic.afm -lib/X11/fonts/culmus/FrankRuehlCLM-Bold.ttf -lib/X11/fonts/culmus/FrankRuehlCLM-BoldOblique.ttf -lib/X11/fonts/culmus/FrankRuehlCLM-Medium.ttf -lib/X11/fonts/culmus/FrankRuehlCLM-MediumOblique.ttf -lib/X11/fonts/culmus/HadasimCLM-Bold.ttf -lib/X11/fonts/culmus/HadasimCLM-BoldOblique.ttf -lib/X11/fonts/culmus/HadasimCLM-Regular.ttf -lib/X11/fonts/culmus/HadasimCLM-RegularOblique.ttf -lib/X11/fonts/culmus/KeterYG-Bold.ttf -lib/X11/fonts/culmus/KeterYG-BoldOblique.ttf -lib/X11/fonts/culmus/KeterYG-Medium.ttf -lib/X11/fonts/culmus/KeterYG-MediumOblique.ttf -lib/X11/fonts/culmus/MiriamCLM-Bold.ttf -lib/X11/fonts/culmus/MiriamCLM-Book.ttf -lib/X11/fonts/culmus/MiriamMonoCLM-Bold.ttf -lib/X11/fonts/culmus/MiriamMonoCLM-BoldOblique.ttf -lib/X11/fonts/culmus/MiriamMonoCLM-Book.ttf -lib/X11/fonts/culmus/MiriamMonoCLM-BookOblique.ttf -lib/X11/fonts/culmus/NachlieliCLM-Bold.pfa -lib/X11/fonts/culmus/NachlieliCLM-Bold.afm -lib/X11/fonts/culmus/NachlieliCLM-BoldOblique.pfa -lib/X11/fonts/culmus/NachlieliCLM-BoldOblique.afm -lib/X11/fonts/culmus/NachlieliCLM-Light.pfa -lib/X11/fonts/culmus/NachlieliCLM-Light.afm -lib/X11/fonts/culmus/NachlieliCLM-LightOblique.pfa -lib/X11/fonts/culmus/NachlieliCLM-LightOblique.afm -lib/X11/fonts/culmus/ShofarDemi-Bold.ttf -lib/X11/fonts/culmus/ShofarDemi-BoldOblique.ttf -lib/X11/fonts/culmus/ShofarRegular.ttf -lib/X11/fonts/culmus/ShofarRegularOblique.ttf -lib/X11/fonts/culmus/SimpleCLM-Bold.ttf -lib/X11/fonts/culmus/SimpleCLM-BoldOblique.ttf -lib/X11/fonts/culmus/SimpleCLM-Medium.ttf -lib/X11/fonts/culmus/SimpleCLM-MediumOblique.ttf -lib/X11/fonts/culmus/StamAshkenazCLM.ttf -lib/X11/fonts/culmus/StamSefaradCLM.ttf -lib/X11/fonts/culmus/YehudaCLM-Bold.pfa -lib/X11/fonts/culmus/YehudaCLM-Bold.afm -lib/X11/fonts/culmus/YehudaCLM-Light.pfa -lib/X11/fonts/culmus/YehudaCLM-Light.afm -lib/X11/fonts/culmus/fonts.scale-ttf -lib/X11/fonts/culmus/fonts.scale-type1 +%%FONTSDIR%%/AharoniCLM-Bold.pfa +%%FONTSDIR%%/AharoniCLM-Bold.afm +%%FONTSDIR%%/AharoniCLM-BoldOblique.pfa +%%FONTSDIR%%/AharoniCLM-BoldOblique.afm +%%FONTSDIR%%/AharoniCLM-Book.pfa +%%FONTSDIR%%/AharoniCLM-Book.afm +%%FONTSDIR%%/AharoniCLM-BookOblique.pfa +%%FONTSDIR%%/AharoniCLM-BookOblique.afm +%%FONTSDIR%%/CaladingsCLM.pfa +%%FONTSDIR%%/CaladingsCLM.afm +%%FONTSDIR%%/DavidCLM-Bold.ttf +%%FONTSDIR%%/DavidCLM-BoldItalic.ttf +%%FONTSDIR%%/DavidCLM-Medium.ttf +%%FONTSDIR%%/DavidCLM-MediumItalic.ttf *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503212305.t2LN5LBH093671>