aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/Scripts/check-stagedir.sh4
-rw-r--r--Mk/Uses/display.mk4
-rw-r--r--Mk/Uses/fonts.mk2
-rw-r--r--Mk/bsd.xorg.mk10
-rw-r--r--UPDATING12
-rw-r--r--arabic/ae_fonts_mono/Makefile2
-rw-r--r--arabic/ae_fonts_ttf/Makefile2
-rw-r--r--arabic/kacst_fonts/Makefile2
-rw-r--r--arabic/khotot/Makefile6
-rw-r--r--audio/py-karaoke/Makefile4
-rw-r--r--benchmarks/phoronix-test-suite/Makefile3
-rw-r--r--chinese/auto-cn-l10n/Makefile2
-rw-r--r--chinese/bg5ps/Makefile5
-rw-r--r--chinese/bg5ps/files/patch-bg5ps.conf11
-rw-r--r--chinese/bg5ps/files/patch-gb2312-bg5ps.conf9
-rw-r--r--chinese/eterm/Makefile2
-rw-r--r--chinese/gugod-clean/Makefile11
-rw-r--r--chinese/gugod-clean/pkg-plist10
-rw-r--r--chinese/kcfonts/Makefile8
-rw-r--r--chinese/kcfonts/files/patch-Makefile4
-rw-r--r--chinese/kcfonts/pkg-plist14
-rw-r--r--chinese/ttfm/Makefile6
-rw-r--r--chinese/ttfm/Makefile.ttf3
-rw-r--r--comms/gnuradio/Makefile4
-rw-r--r--comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in2
-rw-r--r--databases/rrdtool/Makefile2
-rw-r--r--deskutils/conkyforecast/Makefile10
-rw-r--r--deskutils/conkyforecast/files/pkg-message.in2
-rw-r--r--devel/rlvm/Makefile10
-rw-r--r--editors/abiword/Makefile2
-rw-r--r--editors/libreoffice/Makefile12
-rw-r--r--editors/openoffice-4/Makefile2
-rw-r--r--editors/openoffice-devel/Makefile2
-rw-r--r--emulators/stonx/Makefile4
-rw-r--r--emulators/stonx/pkg-plist15
-rw-r--r--emulators/x48/Makefile4
-rw-r--r--games/stonesoup/Makefile4
-rw-r--r--games/stonesoup/files/patch-Makefile4
-rw-r--r--games/warzone2100/Makefile2
-rw-r--r--games/xblast/Makefile4
-rw-r--r--games/xjewel/Makefile19
-rw-r--r--games/xjewel/files/pkg-deinstall.in13
-rw-r--r--games/xjewel/files/pkg-install.in12
-rw-r--r--games/xmoto/Makefile6
-rw-r--r--games/xpacman/Makefile2
-rw-r--r--graphics/GraphicsMagick/Makefile4
-rw-r--r--graphics/a2png/Makefile4
-rw-r--r--graphics/inventor/Makefile2
-rw-r--r--graphics/inventor/files/patch-fl.c2
-rw-r--r--graphics/inventor/files/pkg-message.in2
-rw-r--r--graphics/lcdtest/Makefile4
-rw-r--r--graphics/ruby-gd/Makefile4
-rw-r--r--graphics/sk1libs/Makefile2
-rw-r--r--graphics/sk1libs/files/patch-src-utils-fs.py2
-rw-r--r--hebrew/culmus/Makefile17
-rw-r--r--hebrew/culmus/pkg-plist134
-rw-r--r--hebrew/elmar-fonts/Makefile8
-rw-r--r--hebrew/elmar-fonts/pkg-plist104
-rw-r--r--japanese/alias-fonts/Makefile15
-rw-r--r--japanese/alias-fonts/pkg-install2
-rw-r--r--japanese/elisa8x8/Makefile19
-rw-r--r--japanese/elisa8x8/files/pkg-deinstall.in (renamed from japanese/elisa8x8/pkg-deinstall)2
-rw-r--r--japanese/elisa8x8/files/pkg-install.in (renamed from japanese/elisa8x8/pkg-install)2
-rw-r--r--japanese/elisa8x8/pkg-plist3
-rw-r--r--japanese/font-ipa-uigothic/Makefile26
-rw-r--r--japanese/font-ipa-uigothic/files/pkg-install.in7
-rw-r--r--japanese/font-ipa-uigothic/pkg-plist4
-rw-r--r--japanese/font-ipa/Makefile26
-rw-r--r--japanese/font-ipa/files/pkg-install.in7
-rw-r--r--japanese/font-ipa/pkg-plist13
-rw-r--r--japanese/font-ipaex/Makefile22
-rw-r--r--japanese/font-ipaex/files/pkg-install.in7
-rw-r--r--japanese/font-ipaex/pkg-plist7
-rw-r--r--japanese/font-ipamjm/Makefile25
-rw-r--r--japanese/font-ipamjm/files/pkg-install.in7
-rw-r--r--japanese/font-ipamjm/pkg-plist4
-rw-r--r--japanese/font-jisx0213/Makefile12
-rw-r--r--japanese/font-jisx0213/files/Makefile7
-rw-r--r--japanese/font-jisx0213/pkg-plist40
-rw-r--r--japanese/font-kochi/Makefile28
-rw-r--r--japanese/font-kochi/files/pkg-install.in6
-rw-r--r--japanese/font-kochi/pkg-plist7
-rw-r--r--japanese/font-koruri/Makefile24
-rw-r--r--japanese/font-koruri/files/pkg-install.in6
-rw-r--r--japanese/font-koruri/pkg-plist16
-rw-r--r--japanese/font-migmix/Makefile25
-rw-r--r--japanese/font-migmix/files/pkg-install.in7
-rw-r--r--japanese/font-migmix/pkg-plist25
-rw-r--r--japanese/font-migu/Makefile26
-rw-r--r--japanese/font-migu/files/pkg-install.in7
-rw-r--r--japanese/font-migu/pkg-plist25
-rw-r--r--japanese/font-mona-ipa/Makefile26
-rw-r--r--japanese/font-mona-ipa/files/pkg-install.in7
-rw-r--r--japanese/font-mona-ipa/pkg-plist16
-rw-r--r--japanese/font-motoya-al/Makefile28
-rw-r--r--japanese/font-motoya-al/files/pkg-install.in7
-rw-r--r--japanese/font-motoya-al/pkg-plist7
-rw-r--r--japanese/font-mplus-ipa/Makefile28
-rw-r--r--japanese/font-mplus-ipa/files/pkg-install.in7
-rw-r--r--japanese/font-mplus-ipa/pkg-plist19
-rw-r--r--japanese/font-ricty/Makefile4
-rw-r--r--japanese/font-sazanami/Makefile27
-rw-r--r--japanese/font-sazanami/files/pkg-install.in6
-rw-r--r--japanese/font-sazanami/pkg-plist7
-rw-r--r--japanese/font-shinonome/Makefile26
-rw-r--r--japanese/font-shinonome/files/pkg-install.in23
-rw-r--r--japanese/font-shinonome/pkg-plist192
-rw-r--r--japanese/font-takao/Makefile25
-rw-r--r--japanese/font-takao/files/pkg-install.in7
-rw-r--r--japanese/font-takao/pkg-plist19
-rw-r--r--japanese/font-ume/Makefile23
-rw-r--r--japanese/font-ume/files/pkg-install.in6
-rw-r--r--japanese/font-ume/pkg-plist55
-rw-r--r--japanese/font-vlgothic/Makefile25
-rw-r--r--japanese/font-vlgothic/files/pkg-install.in6
-rw-r--r--japanese/font-vlgothic/pkg-plist7
-rw-r--r--japanese/k10/Makefile14
-rw-r--r--japanese/k10/pkg-deinstall2
-rw-r--r--japanese/k10/pkg-install2
-rw-r--r--japanese/k10/pkg-plist3
-rw-r--r--japanese/k12/Makefile10
-rw-r--r--japanese/k12/pkg-plist1
-rw-r--r--japanese/kanji18/Makefile12
-rw-r--r--japanese/kanji18/pkg-descr2
-rw-r--r--japanese/kanji26/pkg-descr2
-rw-r--r--japanese/kappa20/Makefile10
-rw-r--r--japanese/kappa20/pkg-deinstall2
-rw-r--r--japanese/kappa20/pkg-install2
-rw-r--r--japanese/kappa20/pkg-plist3
-rw-r--r--japanese/kterm/Makefile5
-rw-r--r--japanese/kterm/pkg-plist4
-rw-r--r--japanese/marumoji-fonts/Makefile9
-rw-r--r--japanese/marumoji-fonts/pkg-deinstall2
-rw-r--r--japanese/marumoji-fonts/pkg-install2
-rw-r--r--japanese/marumoji-fonts/pkg-plist3
-rw-r--r--japanese/mikachan-ttfonts/Makefile10
-rw-r--r--japanese/mikachan-ttfonts/pkg-deinstall2
-rw-r--r--japanese/mikachan-ttfonts/pkg-install9
-rw-r--r--japanese/mikachan-ttfonts/pkg-plist1
-rw-r--r--japanese/monafonts-ttf/Makefile11
-rw-r--r--japanese/monafonts-ttf/pkg-deinstall2
-rw-r--r--japanese/monafonts-ttf/pkg-descr2
-rw-r--r--japanese/monafonts-ttf/pkg-install2
-rw-r--r--japanese/monafonts/Makefile7
-rw-r--r--japanese/monafonts/files/patch-Makefile2
-rw-r--r--japanese/monafonts/pkg-deinstall2
-rw-r--r--japanese/monafonts/pkg-descr2
-rw-r--r--japanese/monafonts/pkg-install2
-rw-r--r--japanese/monafonts/pkg-plist4
-rw-r--r--japanese/navi2ch/Makefile2
-rw-r--r--japanese/ngraph-fonts/Makefile11
-rw-r--r--korean/aleefonts-ttf/Makefile20
-rw-r--r--korean/baekmukfonts-bdf/Makefile13
-rw-r--r--korean/baekmukfonts-bdf/pkg-plist3
-rw-r--r--korean/baekmukfonts-ttf/Makefile13
-rw-r--r--korean/baekmukfonts-ttf/pkg-plist4
-rw-r--r--korean/gtkcomm/Makefile2
-rw-r--r--korean/hanyangfonts/Makefile12
-rw-r--r--korean/hanyangfonts/files/pkg-message.in4
-rw-r--r--korean/hanyangfonts/pkg-plist27
-rw-r--r--korean/kaistfonts/Makefile6
-rw-r--r--korean/kaistfonts/files/patch-Makefile4
-rw-r--r--korean/kaistfonts/pkg-plist11
-rw-r--r--korean/nanumcoding-ttf/Makefile23
-rw-r--r--korean/nanumfonts-otf/Makefile23
-rw-r--r--korean/unfonts-core/Makefile22
-rw-r--r--korean/xpdf/Makefile4
-rw-r--r--math/plplot/Makefile2
-rw-r--r--misc/freebsd-doc-en/Makefile8
-rw-r--r--multimedia/devede/Makefile2
-rw-r--r--multimedia/dvd-slideshow/Makefile6
-rw-r--r--multimedia/xawtv/Makefile4
-rw-r--r--net/tightvnc/Makefile2
-rw-r--r--net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile2
-rw-r--r--net/tridiavnc/Makefile2
-rw-r--r--net/tridiavnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile2
-rw-r--r--net/vnc/Makefile2
-rw-r--r--print/lilypond-devel/Makefile2
-rw-r--r--print/lilypond/Makefile2
-rw-r--r--russian/artwiz-ru/Makefile19
-rw-r--r--russian/artwiz-ru/files/pkg-message.in4
-rw-r--r--russian/artwiz-ru/pkg-plist42
-rw-r--r--sysutils/asusoled/Makefile4
-rw-r--r--sysutils/grub2-efi/Makefile2
-rw-r--r--sysutils/grub2-pcbsd/Makefile6
-rw-r--r--sysutils/grub2-pcbsd/files/patch-configure.ac4
-rw-r--r--sysutils/grub2/Makefile4
-rw-r--r--sysutils/jfbterm/Makefile2
-rw-r--r--textproc/docproj/Makefile8
-rw-r--r--ukrainian/monacofonts/Makefile10
-rw-r--r--ukrainian/monacofonts/files/Makefile6
-rw-r--r--ukrainian/monacofonts/pkg-message2
-rw-r--r--ukrainian/monacofonts/pkg-plist13
-rw-r--r--vietnamese/unicode-uhoai/Makefile14
-rw-r--r--vietnamese/unicode-uhoai/pkg-deinstall13
-rw-r--r--vietnamese/unicode-uhoai/pkg-install11
-rw-r--r--vietnamese/unicode-uhoai/pkg-plist2
-rw-r--r--www/awffull/Makefile8
-rw-r--r--x11-fonts/alegreya-sans/Makefile9
-rw-r--r--x11-fonts/alegreya-sans/pkg-plist56
-rw-r--r--x11-fonts/anonymous-pro/Makefile5
-rw-r--r--x11-fonts/artwiz-aleczapka-de/Makefile18
-rw-r--r--x11-fonts/artwiz-aleczapka-de/files/pkg-message.in (renamed from x11-fonts/artwiz-aleczapka-de/pkg-message)7
-rw-r--r--x11-fonts/artwiz-aleczapka-de/pkg-plist37
-rw-r--r--x11-fonts/artwiz-aleczapka-se/Makefile17
-rw-r--r--x11-fonts/artwiz-aleczapka-se/files/pkg-message.in (renamed from x11-fonts/artwiz-aleczapka-se/pkg-message)7
-rw-r--r--x11-fonts/artwiz-aleczapka-se/pkg-plist37
-rw-r--r--x11-fonts/artwiz-aleczapka/Makefile16
-rw-r--r--x11-fonts/artwiz-aleczapka/files/pkg-message.in2
-rw-r--r--x11-fonts/artwiz-aleczapka/pkg-plist37
-rw-r--r--x11-fonts/artwiz-fonts/Makefile12
-rw-r--r--x11-fonts/artwiz-fonts/files/pkg-message.in2
-rw-r--r--x11-fonts/artwiz-fonts/pkg-plist29
-rw-r--r--x11-fonts/bitstream-vera/Makefile4
-rw-r--r--x11-fonts/bitter/Makefile9
-rw-r--r--x11-fonts/bitter/pkg-plist8
-rw-r--r--x11-fonts/c64bdf/Makefile11
-rw-r--r--x11-fonts/clearsans/Makefile9
-rw-r--r--x11-fonts/clearsans/pkg-plist16
-rw-r--r--x11-fonts/code2000/Makefile10
-rw-r--r--x11-fonts/code2001/Makefile4
-rw-r--r--x11-fonts/comfortaa-ttf/Makefile11
-rw-r--r--x11-fonts/comfortaa-ttf/pkg-plist6
-rw-r--r--x11-fonts/comic-neue/Makefile3
-rw-r--r--x11-fonts/consolamono-ttf/Makefile9
-rw-r--r--x11-fonts/consolamono-ttf/pkg-plist4
-rw-r--r--x11-fonts/croscorefonts-fonts-ttf/Makefile2
-rw-r--r--x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in2
-rw-r--r--x11-fonts/crosextrafonts-caladea-ttf/Makefile25
-rw-r--r--x11-fonts/crosextrafonts-caladea-ttf/files/pkg-message.in2
-rw-r--r--x11-fonts/crosextrafonts-caladea-ttf/pkg-plist11
-rw-r--r--x11-fonts/crosextrafonts-carlito-ttf/Makefile24
-rw-r--r--x11-fonts/crosextrafonts-carlito-ttf/pkg-plist11
-rw-r--r--x11-fonts/cyberbit-ttfonts/Makefile8
-rw-r--r--x11-fonts/cyberbit-ttfonts/files/pkg-message.in4
-rw-r--r--x11-fonts/cyr-rfx/Makefile13
-rw-r--r--x11-fonts/cyr-rfx/files/pkg-message.in6
-rw-r--r--x11-fonts/cyr-rfx/pkg-plist264
-rw-r--r--x11-fonts/dejavu/files/pkg-message.in2
-rw-r--r--x11-fonts/dina/Makefile9
-rw-r--r--x11-fonts/dina/pkg-plist26
-rw-r--r--x11-fonts/ecofont/Makefile14
-rw-r--r--x11-fonts/ecofont/files/pkg-message.in2
-rw-r--r--x11-fonts/encodings/Makefile4
-rw-r--r--x11-fonts/encodings/pkg-plist102
-rw-r--r--x11-fonts/fantasque-sans-mono/Makefile10
-rw-r--r--x11-fonts/fantasque-sans-mono/pkg-plist8
-rw-r--r--x11-fonts/farsifonts/Makefile16
-rw-r--r--x11-fonts/farsifonts/pkg-plist1
-rw-r--r--x11-fonts/font-adobe-100dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-100dpi/pkg-plist1932
-rw-r--r--x11-fonts/font-adobe-75dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-75dpi/pkg-plist1932
-rw-r--r--x11-fonts/font-adobe-utopia-100dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-100dpi/pkg-plist400
-rw-r--r--x11-fonts/font-adobe-utopia-75dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-75dpi/pkg-plist400
-rw-r--r--x11-fonts/font-adobe-utopia-type1/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-type1/pkg-plist16
-rw-r--r--x11-fonts/font-alias/Makefile2
-rw-r--r--x11-fonts/font-alias/pkg-plist8
-rw-r--r--x11-fonts/font-arabic-misc/Makefile2
-rw-r--r--x11-fonts/font-arabic-misc/pkg-plist2
-rw-r--r--x11-fonts/font-bh-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-100dpi/pkg-plist1120
-rw-r--r--x11-fonts/font-bh-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-75dpi/pkg-plist1120
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-plist280
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-plist280
-rw-r--r--x11-fonts/font-bh-ttf/Makefile2
-rw-r--r--x11-fonts/font-bh-ttf/pkg-plist2
-rw-r--r--x11-fonts/font-bh-type1/Makefile2
-rw-r--r--x11-fonts/font-bh-type1/pkg-plist48
-rw-r--r--x11-fonts/font-bitstream-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bitstream-100dpi/pkg-plist56
-rw-r--r--x11-fonts/font-bitstream-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bitstream-75dpi/pkg-plist56
-rw-r--r--x11-fonts/font-bitstream-speedo/Makefile2
-rw-r--r--x11-fonts/font-bitstream-speedo/pkg-plist16
-rw-r--r--x11-fonts/font-bitstream-type1/Makefile2
-rw-r--r--x11-fonts/font-bitstream-type1/pkg-plist32
-rw-r--r--x11-fonts/font-cronyx-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-cronyx-cyrillic/pkg-plist128
-rw-r--r--x11-fonts/font-cursor-misc/Makefile2
-rw-r--r--x11-fonts/font-cursor-misc/pkg-plist2
-rw-r--r--x11-fonts/font-daewoo-misc/Makefile2
-rw-r--r--x11-fonts/font-daewoo-misc/pkg-plist6
-rw-r--r--x11-fonts/font-dec-misc/Makefile2
-rw-r--r--x11-fonts/font-dec-misc/pkg-plist4
-rw-r--r--x11-fonts/font-gost/Makefile3
-rw-r--r--x11-fonts/font-ibm-type1/Makefile2
-rw-r--r--x11-fonts/font-ibm-type1/pkg-plist16
-rw-r--r--x11-fonts/font-isas-misc/Makefile2
-rw-r--r--x11-fonts/font-isas-misc/pkg-plist6
-rw-r--r--x11-fonts/font-jis-misc/Makefile2
-rw-r--r--x11-fonts/font-jis-misc/pkg-plist4
-rw-r--r--x11-fonts/font-micro-misc/Makefile2
-rw-r--r--x11-fonts/font-micro-misc/pkg-plist2
-rw-r--r--x11-fonts/font-misc-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-misc-cyrillic/pkg-plist30
-rw-r--r--x11-fonts/font-misc-ethiopic/Makefile6
-rw-r--r--x11-fonts/font-misc-ethiopic/pkg-plist4
-rw-r--r--x11-fonts/font-misc-meltho/Makefile2
-rw-r--r--x11-fonts/font-misc-meltho/pkg-plist44
-rw-r--r--x11-fonts/font-misc-misc/Makefile2
-rw-r--r--x11-fonts/font-misc-misc/pkg-plist668
-rw-r--r--x11-fonts/font-mutt-misc/Makefile2
-rw-r--r--x11-fonts/font-mutt-misc/pkg-plist16
-rw-r--r--x11-fonts/font-schumacher-misc/Makefile2
-rw-r--r--x11-fonts/font-schumacher-misc/pkg-plist90
-rw-r--r--x11-fonts/font-screen-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-screen-cyrillic/pkg-plist4
-rw-r--r--x11-fonts/font-sony-misc/Makefile2
-rw-r--r--x11-fonts/font-sony-misc/pkg-plist8
-rw-r--r--x11-fonts/font-sun-misc/Makefile2
-rw-r--r--x11-fonts/font-sun-misc/pkg-plist10
-rw-r--r--x11-fonts/font-util/Makefile4
-rw-r--r--x11-fonts/font-util/pkg-plist34
-rw-r--r--x11-fonts/font-winitzki-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-winitzki-cyrillic/pkg-plist2
-rw-r--r--x11-fonts/font-xfree86-type1/Makefile2
-rw-r--r--x11-fonts/font-xfree86-type1/pkg-plist2
-rw-r--r--x11-fonts/fonts-indic/Makefile8
-rw-r--r--x11-fonts/freefont-ttf/Makefile19
-rw-r--r--x11-fonts/freefont-ttf/pkg-plist26
-rw-r--r--x11-fonts/freefonts/Makefile4
-rw-r--r--x11-fonts/geminifonts/Makefile15
-rw-r--r--x11-fonts/geminifonts/pkg-message2
-rw-r--r--x11-fonts/geminifonts/pkg-plist142
-rw-r--r--x11-fonts/gnu-unifont-ttf/Makefile19
-rw-r--r--x11-fonts/gnu-unifont-ttf/pkg-plist2
-rw-r--r--x11-fonts/gnu-unifont/Makefile11
-rw-r--r--x11-fonts/gohufont/Makefile9
-rw-r--r--x11-fonts/gohufont/pkg-plist16
-rw-r--r--x11-fonts/hanazono-fonts-ttf/Makefile21
-rw-r--r--x11-fonts/hanazono-fonts-ttf/pkg-plist6
-rw-r--r--x11-fonts/inconsolata-lgc-ttf/Makefile25
-rw-r--r--x11-fonts/indic-ttf/Makefile95
-rw-r--r--x11-fonts/indic-ttf/pkg-plist162
-rw-r--r--x11-fonts/isabella/Makefile12
-rw-r--r--x11-fonts/isabella/pkg-plist3
-rw-r--r--x11-fonts/jmk-x11-fonts/Makefile4
-rw-r--r--x11-fonts/junicode/Makefile8
-rw-r--r--x11-fonts/khmeros/Makefile7
-rw-r--r--x11-fonts/lfpfonts-fix/Makefile14
-rw-r--r--x11-fonts/lfpfonts-fix/pkg-plist147
-rw-r--r--x11-fonts/lfpfonts-var/Makefile14
-rw-r--r--x11-fonts/lfpfonts-var/pkg-plist187
-rw-r--r--x11-fonts/linuxlibertine/Makefile3
-rw-r--r--x11-fonts/manu-gothica/Makefile14
-rw-r--r--x11-fonts/manu-gothica/pkg-plist6
-rw-r--r--x11-fonts/mgopen/Makefile4
-rw-r--r--x11-fonts/mondulkiri/Makefile8
-rw-r--r--x11-fonts/montecarlo_fonts/Makefile12
-rw-r--r--x11-fonts/montecarlo_fonts/pkg-plist5
-rw-r--r--x11-fonts/noto/Makefile2
-rw-r--r--x11-fonts/nucleus/Makefile13
-rw-r--r--x11-fonts/nucleus/pkg-plist89
-rw-r--r--x11-fonts/padauk/Makefile6
-rw-r--r--x11-fonts/paratype/Makefile3
-rw-r--r--x11-fonts/pingwi/Makefile3
-rw-r--r--x11-fonts/profont/Makefile13
-rw-r--r--x11-fonts/profont/pkg-plist16
-rw-r--r--x11-fonts/proggy_fonts/Makefile14
-rw-r--r--x11-fonts/proggy_fonts/pkg-plist42
-rw-r--r--x11-fonts/roboto-fonts-ttf/Makefile3
-rw-r--r--x11-fonts/sgifonts/Makefile19
-rw-r--r--x11-fonts/sgifonts/files/pkg-message.in2
-rw-r--r--x11-fonts/sharefonts/Makefile2
-rw-r--r--x11-fonts/sharefonts/files/pkg-message.in (renamed from x11-fonts/sharefonts/pkg-message)4
-rw-r--r--x11-fonts/sourcecodepro-ttf/Makefile1
-rw-r--r--x11-fonts/stix-fonts/Makefile24
-rw-r--r--x11-fonts/stix-fonts/files/pkg-message.in2
-rw-r--r--x11-fonts/stix-fonts/pkg-plist173
-rw-r--r--x11-fonts/suxus/Makefile12
-rw-r--r--x11-fonts/suxus/files/pkg-message.in4
-rw-r--r--x11-fonts/suxus/pkg-plist2
-rw-r--r--x11-fonts/symbola/Makefile14
-rw-r--r--x11-fonts/symbola/pkg-plist4
-rw-r--r--x11-fonts/tv-fonts/Makefile4
-rw-r--r--x11-fonts/tv-fonts/pkg-plist44
-rw-r--r--x11-fonts/vollkorn-ttf/Makefile9
-rw-r--r--x11-fonts/vollkorn-ttf/pkg-plist16
-rw-r--r--x11-fonts/webfonts/Makefile6
-rw-r--r--x11-fonts/xfs/Makefile4
-rw-r--r--x11-fonts/xfs/pkg-plist6
-rw-r--r--x11-fonts/xorg-fonts-100dpi/Makefile5
-rw-r--r--x11-fonts/xorg-fonts-75dpi/Makefile5
-rw-r--r--x11-fonts/xorg-fonts-cyrillic/Makefile5
-rw-r--r--x11-fonts/xorg-fonts-miscbitmaps/Makefile5
-rw-r--r--x11-fonts/xorg-fonts-truetype/Makefile9
-rw-r--r--x11-fonts/xorg-fonts-type1/Makefile7
-rw-r--r--x11-fonts/xorg-fonts/Makefile1
-rw-r--r--x11-servers/Xfstt/Makefile4
-rw-r--r--x11-servers/Xfstt/files/pkg-message.in2
-rw-r--r--x11-servers/Xfstt/pkg-plist4
-rw-r--r--x11-servers/x11rdp/Makefile1
-rw-r--r--x11-servers/x11rdp/files/patch-buildx_sh2
-rw-r--r--x11-servers/xorg-nestserver/Makefile5
-rw-r--r--x11-servers/xorg-server/Makefile2
-rw-r--r--x11-servers/xorg-vfbserver/Makefile5
-rw-r--r--x11-toolkits/pango/Makefile4
-rw-r--r--x11-toolkits/qt4-gui/Makefile4
-rw-r--r--x11-toolkits/qt5-gui/Makefile4
-rw-r--r--x11-wm/libdockapp/Makefile10
-rw-r--r--x11-wm/libdockapp/pkg-plist7
-rw-r--r--x11/gnome3/Makefile2
-rw-r--r--x11/mate-base/Makefile2
-rw-r--r--x11/metisse/Makefile4
-rw-r--r--x11/x3270/Makefile5
-rw-r--r--x11/x3270/pkg-plist36
413 files changed, 6371 insertions, 7365 deletions
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh
index 66cc779bb475..289e295bf59e 100644
--- a/Mk/Scripts/check-stagedir.sh
+++ b/Mk/Scripts/check-stagedir.sh
@@ -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) ;;
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk
index 5b5c8b533559..b3aec5a49f33 100644
--- a/Mk/Uses/display.mk
+++ b/Mk/Uses/display.mk
@@ -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
diff --git a/Mk/Uses/fonts.mk b/Mk/Uses/fonts.mk
index c0493dd4e72d..54d282bd5aec 100644
--- a/Mk/Uses/fonts.mk
+++ b/Mk/Uses/fonts.mk
@@ -14,7 +14,7 @@ RUN_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
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}"
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index f3f8ebc563e5..3aa18c3c60c0 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -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
diff --git a/UPDATING b/UPDATING
index c37263ec8b75..ea11721c46c2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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
diff --git a/arabic/ae_fonts_mono/Makefile b/arabic/ae_fonts_mono/Makefile
index 3f81fb0656b6..b27487ce59be 100644
--- a/arabic/ae_fonts_mono/Makefile
+++ b/arabic/ae_fonts_mono/Makefile
@@ -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}
diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile
index 7ef86817c899..851c824d643f 100644
--- a/arabic/ae_fonts_ttf/Makefile
+++ b/arabic/ae_fonts_ttf/Makefile
@@ -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}
diff --git a/arabic/kacst_fonts/Makefile b/arabic/kacst_fonts/Makefile
index abeeb05aecfb..b366f0c4e1b8 100644
--- a/arabic/kacst_fonts/Makefile
+++ b/arabic/kacst_fonts/Makefile
@@ -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/
diff --git a/arabic/khotot/Makefile b/arabic/khotot/Makefile
index 5afac2a5862b..85129647d1d6 100644
--- a/arabic/khotot/Makefile
+++ b/arabic/khotot/Makefile
@@ -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>
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index f3a66eb86a7c..4f2cdb7231cd 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -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
diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index 915eda7fdb58..340f0d82f1b4 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -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|" \
diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index 9fb293050c09..1f83c9e43aa3 100644
--- a/chinese/auto-cn-l10n/Makefile
+++ b/chinese/auto-cn-l10n/Makefile
@@ -28,7 +28,7 @@ RELAXCONF_DESC= A set of utilities for FreeBSD LiveCD
.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}
diff --git a/chinese/bg5ps/Makefile b/chinese/bg5ps/Makefile
index a2b8d9c0ab25..5aa35ab28fc4 100644
--- a/chinese/bg5ps/Makefile
+++ b/chinese/bg5ps/Makefile
@@ -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
diff --git a/chinese/bg5ps/files/patch-bg5ps.conf b/chinese/bg5ps/files/patch-bg5ps.conf
deleted file mode 100644
index b7dde0daa4be..000000000000
--- a/chinese/bg5ps/files/patch-bg5ps.conf
+++ /dev/null
@@ -1,11 +0,0 @@
---- bg5ps.conf.orig Thu Nov 2 23:47:35 2000
-+++ bg5ps.conf Thu Nov 2 23:50:27 2000
-@@ -4,7 +4,7 @@
- Encoding="big5"
-
- #chineseFontPath: «ü©w¤¤¤å¦r«¬ªº¸ô®|(¹w³]­È: »P bg5ps ¦P)
--chineseFontPath="/usr/share/fonts/ttf/"
-+chineseFontPath="/usr/X11R6/lib/X11/fonts/TrueType"
-
- #modify the above line
-
diff --git a/chinese/bg5ps/files/patch-gb2312-bg5ps.conf b/chinese/bg5ps/files/patch-gb2312-bg5ps.conf
deleted file mode 100644
index 2405e24edceb..000000000000
--- a/chinese/bg5ps/files/patch-gb2312-bg5ps.conf
+++ /dev/null
@@ -1,9 +0,0 @@
---- gb2312-bg5ps.conf.orig Fri Nov 3 01:31:43 2000
-+++ gb2312-bg5ps.conf Fri Nov 3 01:31:49 2000
-@@ -1,5 +1,5 @@
- #chineseFontPath: «ü©w¤¤¤å¦r«¬ªº¸ô®|(¹w³]­È: »P bg5ps ¦P)
--chineseFontPath="/usr/share/fonts/ttf/"
-+chineseFontPath="/usr/X11R6/lib/X11/fonts/TrueType"
-
- #modify the above line
-
diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile
index bdf362b236ca..97a94528e776 100644
--- a/chinese/eterm/Makefile
+++ b/chinese/eterm/Makefile
@@ -18,6 +18,6 @@ CONFIGURE_ARGS= --enable-trans --enable-utmp \
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"
diff --git a/chinese/gugod-clean/Makefile b/chinese/gugod-clean/Makefile
index 5d3d585f05bc..d84ea3103665 100644
--- a/chinese/gugod-clean/Makefile
+++ b/chinese/gugod-clean/Makefile
@@ -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>
diff --git a/chinese/gugod-clean/pkg-plist b/chinese/gugod-clean/pkg-plist
index 47b6f9694f82..a7f784842381 100644
--- a/chinese/gugod-clean/pkg-plist
+++ b/chinese/gugod-clean/pkg-plist
@@ -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
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 40d615cf9752..667967e71599 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -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>
diff --git a/chinese/kcfonts/files/patch-Makefile b/chinese/kcfonts/files/patch-Makefile
index a0cb3c664a3e..751de03dea63 100644
--- a/chinese/kcfonts/files/patch-Makefile
+++ b/chinese/kcfonts/files/patch-Makefile
@@ -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
diff --git a/chinese/kcfonts/pkg-plist b/chinese/kcfonts/pkg-plist
index 0c15d8f384c6..d6580ecd9291 100644
--- a/chinese/kcfonts/pkg-plist
+++ b/chinese/kcfonts/pkg-plist
@@ -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
diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile
index 00cddb09f15d..5cc89fe833a3 100644
--- a/chinese/ttfm/Makefile
+++ b/chinese/ttfm/Makefile
@@ -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},' \
diff --git a/chinese/ttfm/Makefile.ttf b/chinese/ttfm/Makefile.ttf
index 590323dbd1cb..82efc0a3d77f 100644
--- a/chinese/ttfm/Makefile.ttf
+++ b/chinese/ttfm/Makefile.ttf
@@ -16,7 +16,8 @@ FONTSDIR?= ${PREFIX}/share/fonts/TrueType
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}
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 4521b2eb15cc..3a192afa02d3 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -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}/devel/doxygen \
${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"
diff --git a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
index 0940a52175da..0647d115fc03 100644
--- a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
+++ b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
@@ -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
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 55445b2e992c..e44ba6bae18d 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -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
diff --git a/deskutils/conkyforecast/Makefile b/deskutils/conkyforecast/Makefile
index e7281602ade0..dbb62100261f 100644
--- a/deskutils/conkyforecast/Makefile
+++ b/deskutils/conkyforecast/Makefile
@@ -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 conky
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
diff --git a/deskutils/conkyforecast/files/pkg-message.in b/deskutils/conkyforecast/files/pkg-message.in
index d0b42db317fe..bf2f51aa1820 100644
--- a/deskutils/conkyforecast/files/pkg-message.in
+++ b/deskutils/conkyforecast/files/pkg-message.in
@@ -5,7 +5,7 @@ line to the "Modules" section of your X Windows configuration file:
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
diff --git a/devel/rlvm/Makefile b/devel/rlvm/Makefile
index bcefde62420e..730f1b2a7351 100644
--- a/devel/rlvm/Makefile
+++ b/devel/rlvm/Makefile
@@ -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}/audio/libvorbis \
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,'
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 5c40357a6c1b..d7f4ffe96f4f 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \
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
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 1410bcc261b4..b30704c4a262 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -62,12 +62,12 @@ LIB_DEPENDS= libapr-1.so:${PORTSDIR}/devel/apr1 \
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= #
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 648f7c9eb474..b2e3ec3b973f 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -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
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index df8d7a822844..a789d21198ee 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -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
diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index a34086de80af..e73617d0414b 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
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}/include \
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
diff --git a/emulators/stonx/pkg-plist b/emulators/stonx/pkg-plist
index 240094f69467..9e5f8f597ddc 100644
--- a/emulators/stonx/pkg-plist
+++ b/emulators/stonx/pkg-plist
@@ -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
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 2785a9b633b5..a0a7521d1c3f 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -15,8 +15,8 @@ COMMENT= HP48 SX/GX graphic calculator emulator
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
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index fb2251d7a092..c356e2c78903 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -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
diff --git a/games/stonesoup/files/patch-Makefile b/games/stonesoup/files/patch-Makefile
index 30a8a7800833..de953b0b10d1 100644
--- a/games/stonesoup/files/patch-Makefile
+++ b/games/stonesoup/files/patch-Makefile
@@ -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
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 71aaf3729053..635dbeccac3c 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs \
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
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 0672c428d200..bbc2f6c4b50c 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -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=${DATADIR}
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
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 627680faed38..9cf74c64bee3 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -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>
diff --git a/games/xjewel/files/pkg-deinstall.in b/games/xjewel/files/pkg-deinstall.in
deleted file mode 100644
index 5acdd065022e..000000000000
--- a/games/xjewel/files/pkg-deinstall.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ "x$2" = "xPOST-DEINSTALL" ]; then
- cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
- ${PKG_PREFIX}/bin/xset fp rehash ||
- (
- echo "**********************************************************"
- echo "You should restart X server or do 'xset fp rehash' command"
- echo "to enable this update."
- echo "**********************************************************"
- )
- [ `wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
-fi
diff --git a/games/xjewel/files/pkg-install.in b/games/xjewel/files/pkg-install.in
deleted file mode 100644
index 77be2d3b8f9e..000000000000
--- a/games/xjewel/files/pkg-install.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "x$2" = "xPOST-INSTALL" ]; then
- cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir
- ${PKG_PREFIX}/bin/xset fp rehash ||
- (
- echo "**********************************************************"
- echo "You should restart X server or do 'xset fp rehash' command"
- echo "to enable this update."
- echo "**********************************************************"
- )
-fi
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 33ec6e1974cf..ff0a1104791e 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -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
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index 1e6828affeda..9bfa383a873e 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -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
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 3b9da8fcbbaa..72938ba10b02 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -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}
diff --git a/graphics/a2png/Makefile b/graphics/a2png/Makefile
index af2f5e20ba15..f07bc15bd7b7 100644
--- a/graphics/a2png/Makefile
+++ b/graphics/a2png/Makefile
@@ -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
diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile
index c280b079912f..3940065d43e3 100644
--- a/graphics/inventor/Makefile
+++ b/graphics/inventor/Makefile
@@ -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/-/}
diff --git a/graphics/inventor/files/patch-fl.c b/graphics/inventor/files/patch-fl.c
index e663ff3770a4..628a9ba4a4b0 100644
--- a/graphics/inventor/files/patch-fl.c
+++ b/graphics/inventor/files/patch-fl.c
@@ -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
diff --git a/graphics/inventor/files/pkg-message.in b/graphics/inventor/files/pkg-message.in
index 553fc454cd11..c3dbe6ba69a7 100644
--- a/graphics/inventor/files/pkg-message.in
+++ b/graphics/inventor/files/pkg-message.in
@@ -14,7 +14,7 @@ Open Inventor (TM) needs the following TrueType fonts:
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
diff --git a/graphics/lcdtest/Makefile b/graphics/lcdtest/Makefile
index c782aab77d3a..d0ce9e005f6a 100644
--- a/graphics/lcdtest/Makefile
+++ b/graphics/lcdtest/Makefile
@@ -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:
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index 9c4adae2437c..a48d428f2baa 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -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:
diff --git a/graphics/sk1libs/Makefile b/graphics/sk1libs/Makefile
index 5298a9faa61a..48620bda7ed3 100644
--- a/graphics/sk1libs/Makefile
+++ b/graphics/sk1libs/Makefile
@@ -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/
diff --git a/graphics/sk1libs/files/patch-src-utils-fs.py b/graphics/sk1libs/files/patch-src-utils-fs.py
index e7c5d30d3ab3..e7cb17e2751b 100644
--- a/graphics/sk1libs/files/patch-src-utils-fs.py
+++ b/graphics/sk1libs/files/patch-src-utils-fs.py
@@ -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:
diff --git a/hebrew/culmus/Makefile b/hebrew/culmus/Makefile
index a8cdcd0799c6..3e2e2261b0df 100644
--- a/hebrew/culmus/Makefile
+++ b/hebrew/culmus/Makefile
@@ -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>
diff --git a/hebrew/culmus/pkg-plist b/hebrew/culmus/pkg-plist
index 3564c0c4f98c..c145c931d6ec 100644
--- a/hebrew/culmus/pkg-plist
+++ b/hebrew/culmus/pkg-plist
@@ -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
+%%FONTSDIR%%/DrugulinCLM-Bold.pfa
+%%FONTSDIR%%/DrugulinCLM-Bold.afm
+%%FONTSDIR%%/DrugulinCLM-BoldItalic.pfa
+%%FONTSDIR%%/DrugulinCLM-BoldItalic.afm
+%%FONTSDIR%%/ElliniaCLM-Bold.pfa
+%%FONTSDIR%%/ElliniaCLM-Bold.afm
+%%FONTSDIR%%/ElliniaCLM-BoldItalic.pfa
+%%FONTSDIR%%/ElliniaCLM-BoldItalic.afm
+%%FONTSDIR%%/ElliniaCLM-Light.pfa
+%%FONTSDIR%%/ElliniaCLM-Light.afm
+%%FONTSDIR%%/ElliniaCLM-LightItalic.pfa
+%%FONTSDIR%%/ElliniaCLM-LightItalic.afm
+%%FONTSDIR%%/FrankRuehlCLM-Bold.ttf
+%%FONTSDIR%%/FrankRuehlCLM-BoldOblique.ttf
+%%FONTSDIR%%/FrankRuehlCLM-Medium.ttf
+%%FONTSDIR%%/FrankRuehlCLM-MediumOblique.ttf
+%%FONTSDIR%%/HadasimCLM-Bold.ttf
+%%FONTSDIR%%/HadasimCLM-BoldOblique.ttf
+%%FONTSDIR%%/HadasimCLM-Regular.ttf
+%%FONTSDIR%%/HadasimCLM-RegularOblique.ttf
+%%FONTSDIR%%/KeterYG-Bold.ttf
+%%FONTSDIR%%/KeterYG-BoldOblique.ttf
+%%FONTSDIR%%/KeterYG-Medium.ttf
+%%FONTSDIR%%/KeterYG-MediumOblique.ttf
+%%FONTSDIR%%/MiriamCLM-Bold.ttf
+%%FONTSDIR%%/MiriamCLM-Book.ttf
+%%FONTSDIR%%/MiriamMonoCLM-Bold.ttf
+%%FONTSDIR%%/MiriamMonoCLM-BoldOblique.ttf
+%%FONTSDIR%%/MiriamMonoCLM-Book.ttf
+%%FONTSDIR%%/MiriamMonoCLM-BookOblique.ttf
+%%FONTSDIR%%/NachlieliCLM-Bold.pfa
+%%FONTSDIR%%/NachlieliCLM-Bold.afm
+%%FONTSDIR%%/NachlieliCLM-BoldOblique.pfa
+%%FONTSDIR%%/NachlieliCLM-BoldOblique.afm
+%%FONTSDIR%%/NachlieliCLM-Light.pfa
+%%FONTSDIR%%/NachlieliCLM-Light.afm
+%%FONTSDIR%%/NachlieliCLM-LightOblique.pfa
+%%FONTSDIR%%/NachlieliCLM-LightOblique.afm
+%%FONTSDIR%%/ShofarDemi-Bold.ttf
+%%FONTSDIR%%/ShofarDemi-BoldOblique.ttf
+%%FONTSDIR%%/ShofarRegular.ttf
+%%FONTSDIR%%/ShofarRegularOblique.ttf
+%%FONTSDIR%%/SimpleCLM-Bold.ttf
+%%FONTSDIR%%/SimpleCLM-BoldOblique.ttf
+%%FONTSDIR%%/SimpleCLM-Medium.ttf
+%%FONTSDIR%%/SimpleCLM-MediumOblique.ttf
+%%FONTSDIR%%/StamAshkenazCLM.ttf
+%%FONTSDIR%%/StamSefaradCLM.ttf
+%%FONTSDIR%%/YehudaCLM-Bold.pfa
+%%FONTSDIR%%/YehudaCLM-Bold.afm
+%%FONTSDIR%%/YehudaCLM-Light.pfa
+%%FONTSDIR%%/YehudaCLM-Light.afm
diff --git a/hebrew/elmar-fonts/Makefile b/hebrew/elmar-fonts/Makefile
index f19d2c6c048b..3bfcc7fa0dc2 100644
--- a/hebrew/elmar-fonts/Makefile
+++ b/hebrew/elmar-fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= elmar-fonts
PORTVERSION= 3.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= hebrew x11-fonts
DISTNAME= H.fonts
EXTRACT_SUFX= .tar.Z
@@ -11,12 +11,14 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= cpm@fbsd.es
COMMENT= Collection of Hebrew fonts from El-Mar software Ltd
+USES= fonts
NO_WRKSUBDIR= yes
NO_BUILD= yes
+FONTNAME= hebrew
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/hebrew
- ${TAR} -C ${STAGEDIR}${PREFIX}/lib/X11/fonts/hebrew -xZpf \
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${TAR} -C ${STAGEDIR}${FONTSDIR} -xZpf \
${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
.include <bsd.port.mk>
diff --git a/hebrew/elmar-fonts/pkg-plist b/hebrew/elmar-fonts/pkg-plist
index 3bea78d303e4..e97a0ebdc585 100644
--- a/hebrew/elmar-fonts/pkg-plist
+++ b/hebrew/elmar-fonts/pkg-plist
@@ -1,52 +1,52 @@
-lib/X11/fonts/hebrew/10x20h.pcf
-lib/X11/fonts/hebrew/12x24h.pcf
-lib/X11/fonts/hebrew/6x13h.pcf
-lib/X11/fonts/hebrew/7x14h.pcf
-lib/X11/fonts/hebrew/8x13Bh.pcf
-lib/X11/fonts/hebrew/8x13h.pcf
-lib/X11/fonts/hebrew/8x16h.pcf
-lib/X11/fonts/hebrew/COPYRIGHT
-lib/X11/fonts/hebrew/H.fonts.lsm
-lib/X11/fonts/hebrew/bible7x8Ph.pcf
-lib/X11/fonts/hebrew/bible8x14h.pcf
-lib/X11/fonts/hebrew/bible8x16h.pcf
-lib/X11/fonts/hebrew/bible8x8h.pcf
-lib/X11/fonts/hebrew/bibleB18h.pcf
-lib/X11/fonts/hebrew/bibleB28h.pcf
-lib/X11/fonts/hebrew/bibleB45h.pcf
-lib/X11/fonts/hebrew/bibleBP18h.pcf
-lib/X11/fonts/hebrew/bibleO28h.pcf
-lib/X11/fonts/hebrew/bibleO45h.pcf
-lib/X11/fonts/hebrew/config
-lib/X11/fonts/hebrew/courh___.pfa
-lib/X11/fonts/hebrew/courhb__.pfa
-lib/X11/fonts/hebrew/courhbo_.pfa
-lib/X11/fonts/hebrew/courho__.pfa
-lib/X11/fonts/hebrew/fonts.alias
-lib/X11/fonts/hebrew/fonts.dir
-lib/X11/fonts/hebrew/maarivB40h.pcf
-lib/X11/fonts/hebrew/maarivBPh.pcf
-lib/X11/fonts/hebrew/maarivO40h.pcf
-lib/X11/fonts/hebrew/maarivOPh.pcf
-lib/X11/fonts/hebrew/maarivS40h.pcf
-lib/X11/fonts/hebrew/maarivSPh.pcf
-lib/X11/fonts/hebrew/menu10h.pcf
-lib/X11/fonts/hebrew/menu12h.pcf
-lib/X11/fonts/hebrew/new8x14h.pcf
-lib/X11/fonts/hebrew/new8x16h.pcf
-lib/X11/fonts/hebrew/ortic___.pfa
-lib/X11/fonts/hebrew/orticb__.pfa
-lib/X11/fonts/hebrew/orticbi_.pfa
-lib/X11/fonts/hebrew/ortici__.pfa
-lib/X11/fonts/hebrew/rashiBh.pcf
-lib/X11/fonts/hebrew/rashih.pcf
-lib/X11/fonts/hebrew/script14h.pcf
-lib/X11/fonts/hebrew/scriptB24h.pcf
-lib/X11/fonts/hebrew/termB36h.pcf
-lib/X11/fonts/hebrew/termC36h.pcf
-lib/X11/fonts/hebrew/termO36h.pcf
-lib/X11/fonts/hebrew/termS36h.pcf
-lib/X11/fonts/hebrew/timehb__.pfa
-lib/X11/fonts/hebrew/timehbi_.pfa
-lib/X11/fonts/hebrew/timehi__.pfa
-lib/X11/fonts/hebrew/timehr__.pfa
+%%FONTSDIR%%/10x20h.pcf
+%%FONTSDIR%%/12x24h.pcf
+%%FONTSDIR%%/6x13h.pcf
+%%FONTSDIR%%/7x14h.pcf
+%%FONTSDIR%%/8x13Bh.pcf
+%%FONTSDIR%%/8x13h.pcf
+%%FONTSDIR%%/8x16h.pcf
+%%FONTSDIR%%/COPYRIGHT
+%%FONTSDIR%%/H.fonts.lsm
+%%FONTSDIR%%/bible7x8Ph.pcf
+%%FONTSDIR%%/bible8x14h.pcf
+%%FONTSDIR%%/bible8x16h.pcf
+%%FONTSDIR%%/bible8x8h.pcf
+%%FONTSDIR%%/bibleB18h.pcf
+%%FONTSDIR%%/bibleB28h.pcf
+%%FONTSDIR%%/bibleB45h.pcf
+%%FONTSDIR%%/bibleBP18h.pcf
+%%FONTSDIR%%/bibleO28h.pcf
+%%FONTSDIR%%/bibleO45h.pcf
+%%FONTSDIR%%/config
+%%FONTSDIR%%/courh___.pfa
+%%FONTSDIR%%/courhb__.pfa
+%%FONTSDIR%%/courhbo_.pfa
+%%FONTSDIR%%/courho__.pfa
+%%FONTSDIR%%/fonts.alias
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/maarivB40h.pcf
+%%FONTSDIR%%/maarivBPh.pcf
+%%FONTSDIR%%/maarivO40h.pcf
+%%FONTSDIR%%/maarivOPh.pcf
+%%FONTSDIR%%/maarivS40h.pcf
+%%FONTSDIR%%/maarivSPh.pcf
+%%FONTSDIR%%/menu10h.pcf
+%%FONTSDIR%%/menu12h.pcf
+%%FONTSDIR%%/new8x14h.pcf
+%%FONTSDIR%%/new8x16h.pcf
+%%FONTSDIR%%/ortic___.pfa
+%%FONTSDIR%%/orticb__.pfa
+%%FONTSDIR%%/orticbi_.pfa
+%%FONTSDIR%%/ortici__.pfa
+%%FONTSDIR%%/rashiBh.pcf
+%%FONTSDIR%%/rashih.pcf
+%%FONTSDIR%%/script14h.pcf
+%%FONTSDIR%%/scriptB24h.pcf
+%%FONTSDIR%%/termB36h.pcf
+%%FONTSDIR%%/termC36h.pcf
+%%FONTSDIR%%/termO36h.pcf
+%%FONTSDIR%%/termS36h.pcf
+%%FONTSDIR%%/timehb__.pfa
+%%FONTSDIR%%/timehbi_.pfa
+%%FONTSDIR%%/timehi__.pfa
+%%FONTSDIR%%/timehr__.pfa
diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile
index bc37eb8261b3..3c71aae822c2 100644
--- a/japanese/alias-fonts/Makefile
+++ b/japanese/alias-fonts/Makefile
@@ -11,16 +11,15 @@ DISTFILES= # empty
MAINTAINER= CQG00620@nifty.ne.jp
COMMENT= Meta-port which setups Japanese fonts
-RUN_DEPENDS= ${FONTSDIR}/jpnhn4-iso.pcf.gz:${PORTSDIR}/japanese/elisa8x8 \
- ${FONTSDIR}/5x10B.pcf.gz:${PORTSDIR}/japanese/k10 \
- ${LOCALBASE}/share/font-shinonome/shnmk12.pcf.gz:${PORTSDIR}/japanese/font-shinonome \
- ${FONTSDIR}/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \
- ${FONTSDIR}/k20b.pcf.gz:${PORTSDIR}/japanese/kappa20 \
- ${FONTSDIR}/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \
- ${LOCALBASE}/lib/X11/fonts/jisx0213/K12-1.pcf.gz:${PORTSDIR}/japanese/font-jisx0213
+RUN_DEPENDS= ja-elisa8x8>0:${PORTSDIR}/japanese/elisa8x8 \
+ ja-naga10>0:${PORTSDIR}/japanese/k10 \
+ ja-font-shinonome>0:${PORTSDIR}/japanese/font-shinonome \
+ ja-kanji18>0:${PORTSDIR}/japanese/kanji18 \
+ ja-k20fonts>0:${PORTSDIR}/japanese/kappa20 \
+ ja-kanji26>0:${PORTSDIR}/japanese/kanji26 \
+ ja-font-jisx0213>0:${PORTSDIR}/japanese/font-jisx0213
NO_BUILD= yes
NO_INSTALL= yes
-FONTSDIR= ${LOCALBASE}/lib/X11/fonts/local
.include <bsd.port.mk>
diff --git a/japanese/alias-fonts/pkg-install b/japanese/alias-fonts/pkg-install
index 02b6c7207923..e6428e9c9b4a 100644
--- a/japanese/alias-fonts/pkg-install
+++ b/japanese/alias-fonts/pkg-install
@@ -5,7 +5,7 @@ if [ $2 != "POST-INSTALL" ]; then
exit 0
fi
-dir="${PKG_PREFIX}/lib/X11/fonts/local";
+dir="${PKG_PREFIX}/share/fonts/local";
to="$dir/fonts.alias";
from="$to.orig";
diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile
index a7ebc196ef36..82bb1368d7f1 100644
--- a/japanese/elisa8x8/Makefile
+++ b/japanese/elisa8x8/Makefile
@@ -3,7 +3,7 @@
PORTNAME= elisa8x8
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://www.bsdbbq.org/~toshi/distfiles/
DISTNAME= elisat10
@@ -11,18 +11,13 @@ DISTNAME= elisat10
MAINTAINER= toshi@tea.forus.or.jp
COMMENT= X11 8-dot Kanji font 'elisa font'
-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_WRKSUBDIR= yes
BDFTOPCF_CMD= ${PREFIX}/bin/bdftopcf
-MKFONTDIR_CMD= ${PREFIX}/bin/mkfontdir
-FONTSDIR= lib/X11/fonts/local
-INSTALLDIR= ${PREFIX}/${FONTSDIR}
MYPORTDOCS= elisa100.doc elisat10.doc elisat10.html
-PLIST_SUB= FONTSDIR=${FONTSDIR}
OPTIONS_DEFINE= DOCS
@@ -34,11 +29,11 @@ do-build:
)
do-install:
- @${MKDIR} ${STAGEDIR}${INSTALLDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
(cd ${WRKSRC} ;\
- ${INSTALL_DATA} elisat10.pcf.gz ${STAGEDIR}${INSTALLDIR} ;\
- ${INSTALL_DATA} jpnhn4-jis.pcf.gz ${STAGEDIR}${INSTALLDIR} ;\
- ${INSTALL_DATA} jpnhn4-iso.pcf.gz ${STAGEDIR}${INSTALLDIR} ;\
+ ${INSTALL_DATA} elisat10.pcf.gz ${STAGEDIR}${FONTSDIR} ; \
+ ${INSTALL_DATA} jpnhn4-jis.pcf.gz ${STAGEDIR}${FONTSDIR} ; \
+ ${INSTALL_DATA} jpnhn4-iso.pcf.gz ${STAGEDIR}${FONTSDIR} ; \
)
post-install:
diff --git a/japanese/elisa8x8/pkg-deinstall b/japanese/elisa8x8/files/pkg-deinstall.in
index 6923a68a49f7..b9e4cc9ddad3 100644
--- a/japanese/elisa8x8/pkg-deinstall
+++ b/japanese/elisa8x8/files/pkg-deinstall.in
@@ -4,7 +4,7 @@ if [ "$2" != "DEINSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=%%FONTSDIR%%
grepv() {
awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
diff --git a/japanese/elisa8x8/pkg-install b/japanese/elisa8x8/files/pkg-install.in
index 516a38e97f2d..bf9a9252507c 100644
--- a/japanese/elisa8x8/pkg-install
+++ b/japanese/elisa8x8/files/pkg-install.in
@@ -4,7 +4,7 @@ if [ "$2" != "POST-INSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=%%FONTSDIR%%
grepv() {
awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
diff --git a/japanese/elisa8x8/pkg-plist b/japanese/elisa8x8/pkg-plist
index e761cbc41ff5..4a9d543aaaa7 100644
--- a/japanese/elisa8x8/pkg-plist
+++ b/japanese/elisa8x8/pkg-plist
@@ -4,6 +4,3 @@
%%PORTDOCS%%%%DOCSDIR%%/elisa100.doc
%%PORTDOCS%%%%DOCSDIR%%/elisat10.doc
%%PORTDOCS%%%%DOCSDIR%%/elisat10.html
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/japanese/font-ipa-uigothic/Makefile b/japanese/font-ipa-uigothic/Makefile
index 920848a24f3c..88d87212d75b 100644
--- a/japanese/font-ipa-uigothic/Makefile
+++ b/japanese/font-ipa-uigothic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ipa-uigothic
PORTVERSION= 00203
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://info.openlab.ipa.go.jp/ipafont/fontdata/old/
PKGNAMEPREFIX= ja-font-
@@ -11,40 +11,28 @@ DISTNAME= IPAfont${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= IPA Japanese fonts, UIGothic
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
# ja-font-mplus-ipa-1.0.20060520.p1 has an old ipagui.ttf
CONFLICTS= ja-font-mplus-ipa-1.0.20060520.p1 \
ja-ipa-ttfonts-[0-9]*
-USES= zip
+USES= fonts zip
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= enduser_license.txt \
Readme${PORTVERSION}.txt
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= TTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/ipagui.ttf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipagui.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipagui.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/ipagui.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -54,9 +42,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-ipa-uigothic/files/pkg-install.in b/japanese/font-ipa-uigothic/files/pkg-install.in
index cfc345e57c50..a0aed6e54c8d 100644
--- a/japanese/font-ipa-uigothic/files/pkg-install.in
+++ b/japanese/font-ipa-uigothic/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%
catfontsdir ()
{
@@ -70,7 +70,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -78,7 +78,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -86,6 +86,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-ipa-uigothic/pkg-plist b/japanese/font-ipa-uigothic/pkg-plist
index ca01e72741d0..697ddf7deb50 100644
--- a/japanese/font-ipa-uigothic/pkg-plist
+++ b/japanese/font-ipa-uigothic/pkg-plist
@@ -1,8 +1,6 @@
%%DATADIR%%/ipagui.ttf
-%%LOCAL_FONTSDIR%%/TTF/ipagui.ttf
etc/fonts/conf.avail/20-unhint-ipa-uigothic.conf
etc/fonts/conf.avail/62-fonts-ipa-uigothic.conf
etc/fonts/conf.d/20-unhint-ipa-uigothic.conf
etc/fonts/conf.d/62-fonts-ipa-uigothic.conf
-%%X_FONTSDIR%%/TTF/ipagui.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/ipagui.ttf
diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index 198538c9c54d..b165ca144e1b 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ipa
PORTVERSION= 00303
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://info.openlab.ipa.go.jp/ipafont/fontdata/
PKGNAMEPREFIX= ja-font-
@@ -11,41 +11,29 @@ DISTNAME= IPAfont${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= IPA Japanese fonts
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
CONFLICTS= ja-ipa-ttfonts-[0-9]*
-USES= zip
+USES= fonts zip
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= IPA_Font_License_Agreement_v1.0.txt \
Readme_IPAfont${PORTVERSION}.txt
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= OTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-extract:
cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipa*.otf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF/ && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipa*.otf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR}/ && ${LN} -s -f \
+ ../../../${DATADIR_REL}/ipa*.otf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -55,9 +43,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-ipa/files/pkg-install.in b/japanese/font-ipa/files/pkg-install.in
index 09ce290836b0..7ae9e47a80bc 100644
--- a/japanese/font-ipa/files/pkg-install.in
+++ b/japanese/font-ipa/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/OTF
+FONTSDIR=%%FONTSDIR%%/OTF
catfontsdir ()
{
@@ -77,7 +77,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -85,7 +85,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -93,6 +93,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist
index 7592bfe1a89f..50d96f38d64e 100644
--- a/japanese/font-ipa/pkg-plist
+++ b/japanese/font-ipa/pkg-plist
@@ -2,16 +2,11 @@
%%DATADIR%%/ipam.otf
%%DATADIR%%/ipagp.otf
%%DATADIR%%/ipag.otf
-%%LOCAL_FONTSDIR%%/OTF/ipag.otf
-%%LOCAL_FONTSDIR%%/OTF/ipagp.otf
-%%LOCAL_FONTSDIR%%/OTF/ipam.otf
-%%LOCAL_FONTSDIR%%/OTF/ipamp.otf
etc/fonts/conf.avail/20-unhint-ipa.conf
etc/fonts/conf.avail/62-fonts-ipa.conf
etc/fonts/conf.d/20-unhint-ipa.conf
etc/fonts/conf.d/62-fonts-ipa.conf
-%%X_FONTSDIR%%/OTF/ipag.otf
-%%X_FONTSDIR%%/OTF/ipagp.otf
-%%X_FONTSDIR%%/OTF/ipam.otf
-%%X_FONTSDIR%%/OTF/ipamp.otf
-@fc %%X_FONTSDIR%%/OTF
+%%FONTSDIR%%/ipag.otf
+%%FONTSDIR%%/ipagp.otf
+%%FONTSDIR%%/ipam.otf
+%%FONTSDIR%%/ipamp.otf
diff --git a/japanese/font-ipaex/Makefile b/japanese/font-ipaex/Makefile
index df7a14339995..8a000394df9e 100644
--- a/japanese/font-ipaex/Makefile
+++ b/japanese/font-ipaex/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ipaex
PORTVERSION= 00201
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://info.openlab.ipa.go.jp/ipafont/fontdata/7bf84182a04a9632268dbcb03f100d05/
PKGNAMEPREFIX= ja-font-
@@ -13,20 +13,16 @@ COMMENT= IPAex Japanese fonts
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USES= zip
+USES= fonts zip
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
+PLIST_SUB= FONTSDIR=${FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= IPA_Font_License_Agreement_v1.0.txt \
Readme_IPAexfont${PORTVERSION}.txt
-
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
+FONTNAME= OTF
OPTIONS_DEFINE= DOCS
@@ -38,14 +34,10 @@ post-extract:
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF/ && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipaex*.otf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF/ && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipaex*.otf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
+ cd ${STAGEDIR}${FONTSDIR}; ${LN} -s -f ../../../${DATADIR_REL}/*.otf .
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
${FILESDIR}/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
@@ -53,9 +45,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-ipaex/files/pkg-install.in b/japanese/font-ipaex/files/pkg-install.in
index 7a411417ff31..5a04cd09d272 100644
--- a/japanese/font-ipaex/files/pkg-install.in
+++ b/japanese/font-ipaex/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/OTF
+FONTSDIR=%%FONTSDIR%%/OTF
catfontsdir ()
{
@@ -76,7 +76,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -84,7 +84,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -92,6 +92,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-ipaex/pkg-plist b/japanese/font-ipaex/pkg-plist
index 0bb77dadac1b..b421206c0017 100644
--- a/japanese/font-ipaex/pkg-plist
+++ b/japanese/font-ipaex/pkg-plist
@@ -1,11 +1,8 @@
%%DATADIR%%/ipaexg.otf
%%DATADIR%%/ipaexm.otf
-%%LOCAL_FONTSDIR%%/OTF/ipaexg.otf
-%%LOCAL_FONTSDIR%%/OTF/ipaexm.otf
etc/fonts/conf.avail/20-unhint-ipaex.conf
etc/fonts/conf.avail/62-fonts-ipaex.conf
etc/fonts/conf.d/20-unhint-ipaex.conf
etc/fonts/conf.d/62-fonts-ipaex.conf
-%%X_FONTSDIR%%/OTF/ipaexg.otf
-%%X_FONTSDIR%%/OTF/ipaexm.otf
-@fc %%X_FONTSDIR%%/OTF
+%%FONTSDIR%%/ipaexg.otf
+%%FONTSDIR%%/ipaexm.otf
diff --git a/japanese/font-ipamjm/Makefile b/japanese/font-ipamjm/Makefile
index 2ad09753318d..d5d2cd0d951b 100644
--- a/japanese/font-ipamjm/Makefile
+++ b/japanese/font-ipamjm/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ipamjm
PORTVERSION= 00301
+PORTREVISION= 1
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://dl.mojikiban.ipa.go.jp/IPAmjMincho/
PKGNAMEPREFIX= ja-font-
@@ -15,35 +16,23 @@ LICENSE_NAME= IPA Font License Agreement v1.0
LICENSE_FILE= ${WRKSRC}/IPA_Font_License_Agreement_v1.0.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= zip
+USES= fonts zip
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= Readme_${PORTNAME}003.01.txt
-
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
+FONTNAME= OTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/ipamjm.ttf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF/ && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipamjm.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF/ && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipamjm.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/ipamjm.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -53,9 +42,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-ipamjm/files/pkg-install.in b/japanese/font-ipamjm/files/pkg-install.in
index 57ce1a13d971..f3125bbbb3d6 100644
--- a/japanese/font-ipamjm/files/pkg-install.in
+++ b/japanese/font-ipamjm/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/OTF
+FONTSDIR=%%FONTSDIR%%
catfontsdir ()
{
@@ -73,7 +73,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -81,7 +81,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -89,6 +89,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-ipamjm/pkg-plist b/japanese/font-ipamjm/pkg-plist
index 65c39809e0eb..d88f470d1ef3 100644
--- a/japanese/font-ipamjm/pkg-plist
+++ b/japanese/font-ipamjm/pkg-plist
@@ -1,8 +1,6 @@
%%DATADIR%%/ipamjm.ttf
-%%LOCAL_FONTSDIR%%/OTF/ipamjm.ttf
etc/fonts/conf.avail/20-unhint-ipamjm.conf
etc/fonts/conf.avail/62-fonts-ipamjm.conf
etc/fonts/conf.d/20-unhint-ipamjm.conf
etc/fonts/conf.d/62-fonts-ipamjm.conf
-%%X_FONTSDIR%%/OTF/ipamjm.ttf
-@fc %%X_FONTSDIR%%/OTF
+%%FONTSDIR%%/ipamjm.ttf
diff --git a/japanese/font-jisx0213/Makefile b/japanese/font-jisx0213/Makefile
index bf6445757fa4..a01666468e47 100644
--- a/japanese/font-jisx0213/Makefile
+++ b/japanese/font-jisx0213/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jisx0213
PORTVERSION= 20040425
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://www12.ocn.ne.jp/~imamura/ \
LOCAL/hrs:yagi
@@ -26,15 +26,7 @@ NO_WRKSUBDIR= yes
EXTRACT_CMD= ${GZCAT}
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= > ${WRKDIR}/$${file%.gz}
-MAKE_ENV= STAGEDIR=${STAGEDIR} FONTDIR=${LOCALFONTDIR}
-PLIST_SUB= LOCALFONTSDIR=${LOCALFONTDIR}
+MAKE_ENV= FONTSDIR=${FONTSDIR}
MAKEFILE= ${FILESDIR}/Makefile
-LOCALFONTDIR= share/font-${PORTNAME}
-
-post-install:
- ${MKDIR} ${STAGEDIR}/${FONTSDIR}
- cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
- ../../../../${LOCALFONTDIR}/*.pcf.gz . \
-
.include <bsd.port.mk>
diff --git a/japanese/font-jisx0213/files/Makefile b/japanese/font-jisx0213/files/Makefile
index beed26ca22bf..fc7c7706742b 100644
--- a/japanese/font-jisx0213/files/Makefile
+++ b/japanese/font-jisx0213/files/Makefile
@@ -2,9 +2,6 @@
.SUFFIXES:
.SUFFIXES: .bdf .pcf
-.if defined(STAGEDIR) && !empty(STAGEDIR)
-PREFIX:= ${STAGEDIR}${PREFIX}
-.endif
LOCALBASE?= /usr/local
GZIP_CMD?= /usr/bin/gzip
MKBOLD_CMD?= ${LOCALBASE}/bin/mkbold
@@ -64,8 +61,8 @@ CLEANFILES+= ${B}i.bdf ${B}bi.bdf \
.endfor
install::
- mkdir -p ${PREFIX}/${FONTDIR}
- ${BSD_INSTALL_DATA} ${TARGETS} ${PREFIX}/${FONTDIR}
+ mkdir -p ${DESTDIR}${FONTSDIR}
+ ${BSD_INSTALL_DATA} ${TARGETS} ${DESTDIR}${FONTSDIR}
clean::
rm -f ${TARGETS} ${CLEANFILES}
diff --git a/japanese/font-jisx0213/pkg-plist b/japanese/font-jisx0213/pkg-plist
index bf1ae6e7e9b0..2f5cc5667748 100644
--- a/japanese/font-jisx0213/pkg-plist
+++ b/japanese/font-jisx0213/pkg-plist
@@ -1,43 +1,3 @@
-%%LOCALFONTSDIR%%/K12-1.pcf.gz
-%%LOCALFONTSDIR%%/K12-1b.pcf.gz
-%%LOCALFONTSDIR%%/K12-1bi.pcf.gz
-%%LOCALFONTSDIR%%/K12-1i.pcf.gz
-%%LOCALFONTSDIR%%/K12-2.pcf.gz
-%%LOCALFONTSDIR%%/K12-2b.pcf.gz
-%%LOCALFONTSDIR%%/K12-2bi.pcf.gz
-%%LOCALFONTSDIR%%/K12-2i.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-1.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-1b.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-1bi.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-1i.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-2.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-2b.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-2bi.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-2i.pcf.gz
-%%LOCALFONTSDIR%%/K14-2004-1.pcf.gz
-%%LOCALFONTSDIR%%/K14-2004-1b.pcf.gz
-%%LOCALFONTSDIR%%/K14-2004-1bi.pcf.gz
-%%LOCALFONTSDIR%%/K14-2004-1i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-1.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-1b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-1bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-1i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-2.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-2b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-2bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-2i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2004-1.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2004-1b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2004-1bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2004-1i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-1.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-1b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-1bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-1i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-2.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-2b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-2bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-2i.pcf.gz
%%FONTSDIR%%/K12-1.pcf.gz
%%FONTSDIR%%/K12-1b.pcf.gz
%%FONTSDIR%%/K12-1bi.pcf.gz
diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index 6111a2932558..2a30fb624394 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kochi
PORTVERSION= 20030809
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/efont/5411/
PKGNAMEPREFIX= ja-font-
@@ -12,38 +12,26 @@ DISTNAME= ${PORTNAME}-substitute-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Kochi Japanese TrueType font
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= tar:bzip2
+USES= fonts tar:bzip2
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
- DATADIR=share/font-${PORTNAME}
+PLIST_SUB= DATADIR=share/font-${PORTNAME}
WRKSRC= ${WRKDIR}/${DISTNAME}
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= TTF
PORTDOCS= README.ja COPYING docs
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -53,9 +41,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-kochi/files/pkg-install.in b/japanese/font-kochi/files/pkg-install.in
index 48ab317e8a8c..75d5e82733a5 100644
--- a/japanese/font-kochi/files/pkg-install.in
+++ b/japanese/font-kochi/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%
catfontsdir ()
{
@@ -77,7 +77,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -85,7 +85,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-kochi/pkg-plist b/japanese/font-kochi/pkg-plist
index 116644c1fbba..3eeae7a35636 100644
--- a/japanese/font-kochi/pkg-plist
+++ b/japanese/font-kochi/pkg-plist
@@ -1,11 +1,8 @@
%%DATADIR%%/kochi-mincho-subst.ttf
%%DATADIR%%/kochi-gothic-subst.ttf
-%%LOCAL_FONTSDIR%%/TTF/kochi-mincho-subst.ttf
-%%LOCAL_FONTSDIR%%/TTF/kochi-gothic-subst.ttf
etc/fonts/conf.avail/20-unhint-kochi.conf
etc/fonts/conf.avail/62-fonts-kochi.conf
etc/fonts/conf.d/20-unhint-kochi.conf
etc/fonts/conf.d/62-fonts-kochi.conf
-%%X_FONTSDIR%%/TTF/kochi-mincho-subst.ttf
-%%X_FONTSDIR%%/TTF/kochi-gothic-subst.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/kochi-mincho-subst.ttf
+%%FONTSDIR%%/kochi-gothic-subst.ttf
diff --git a/japanese/font-koruri/Makefile b/japanese/font-koruri/Makefile
index 058ca33e7c59..e6590c4552bc 100644
--- a/japanese/font-koruri/Makefile
+++ b/japanese/font-koruri/Makefile
@@ -3,7 +3,7 @@
PORTNAME= koruri
PORTVERSION= 20141224
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/koruri/62469
PKGNAMEPREFIX= ja-font-
@@ -14,33 +14,23 @@ COMMENT= Koruri Japanese TrueType fonts
LICENSE= APACHE20
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= tar:xz
+USES= fonts tar:xz
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= README.md
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= TTF
OPTIONS_DEFINE= DOCS
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -50,8 +40,6 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-
-post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
diff --git a/japanese/font-koruri/files/pkg-install.in b/japanese/font-koruri/files/pkg-install.in
index db0e7d1d2888..adb40a53a735 100644
--- a/japanese/font-koruri/files/pkg-install.in
+++ b/japanese/font-koruri/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/TTF
catfontsdir ()
{
@@ -78,7 +78,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -86,7 +86,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-koruri/pkg-plist b/japanese/font-koruri/pkg-plist
index 65fc06ba5ecd..d48e8f9c6e61 100644
--- a/japanese/font-koruri/pkg-plist
+++ b/japanese/font-koruri/pkg-plist
@@ -3,18 +3,12 @@
%%DATADIR%%/Koruri-Light.ttf
%%DATADIR%%/Koruri-Semibold.ttf
%%DATADIR%%/Koruri-Regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/Koruri-Bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/Koruri-Extrabold.ttf
-%%LOCAL_FONTSDIR%%/TTF/Koruri-Light.ttf
-%%LOCAL_FONTSDIR%%/TTF/Koruri-Semibold.ttf
-%%LOCAL_FONTSDIR%%/TTF/Koruri-Regular.ttf
etc/fonts/conf.avail/20-unhint-koruri.conf
etc/fonts/conf.avail/62-fonts-koruri.conf
etc/fonts/conf.d/20-unhint-koruri.conf
etc/fonts/conf.d/62-fonts-koruri.conf
-%%X_FONTSDIR%%/TTF/Koruri-Bold.ttf
-%%X_FONTSDIR%%/TTF/Koruri-Extrabold.ttf
-%%X_FONTSDIR%%/TTF/Koruri-Light.ttf
-%%X_FONTSDIR%%/TTF/Koruri-Semibold.ttf
-%%X_FONTSDIR%%/TTF/Koruri-Regular.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/Koruri-Bold.ttf
+%%FONTSDIR%%/Koruri-Extrabold.ttf
+%%FONTSDIR%%/Koruri-Light.ttf
+%%FONTSDIR%%/Koruri-Semibold.ttf
+%%FONTSDIR%%/Koruri-Regular.ttf
diff --git a/japanese/font-migmix/Makefile b/japanese/font-migmix/Makefile
index 0d28bf37711c..3f596e533c2d 100644
--- a/japanese/font-migmix/Makefile
+++ b/japanese/font-migmix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= migmix
PORTVERSION= 1.0.20130617
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/mix-mplus-ipa/59021
PKGNAMEPREFIX= ja-font-
@@ -14,26 +14,18 @@ DISTFILES= ${PORTNAME}-1m-${PORTVERSION:E}${EXTRACT_SUFX} \
MAINTAINER= hrs@FreeBSD.org
COMMENT= Mixed Japanese font with IPA Gothic and M-plus outline
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= zip
+USES= fonts zip
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
migmix-README.txt
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
+FONTNAME= TTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
cd ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/ && \
${INSTALL_DATA} ipag00303/*.txt \
@@ -46,12 +38,9 @@ do-install:
${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/*.ttf \
${WRKDIR}/${PORTNAME}-2p-${PORTVERSION:E}/*.ttf \
${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migmix*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migmix*.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/migmix*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -61,9 +50,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-migmix/files/pkg-install.in b/japanese/font-migmix/files/pkg-install.in
index 935ff1ec7132..48de6510ecfd 100644
--- a/japanese/font-migmix/files/pkg-install.in
+++ b/japanese/font-migmix/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/TTF
catfontsdir ()
{
@@ -89,7 +89,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -97,7 +97,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -105,6 +105,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-migmix/pkg-plist b/japanese/font-migmix/pkg-plist
index eb5ccd6874cb..9a61542edd0d 100644
--- a/japanese/font-migmix/pkg-plist
+++ b/japanese/font-migmix/pkg-plist
@@ -6,24 +6,15 @@
%%DATADIR%%/migmix-2m-regular.ttf
%%DATADIR%%/migmix-2p-bold.ttf
%%DATADIR%%/migmix-2p-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migmix-1m-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migmix-1m-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migmix-1p-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migmix-1p-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migmix-2m-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migmix-2m-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migmix-2p-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migmix-2p-regular.ttf
etc/fonts/conf.avail/20-unhint-migmix.conf
etc/fonts/conf.avail/62-fonts-migmix.conf
etc/fonts/conf.d/20-unhint-migmix.conf
etc/fonts/conf.d/62-fonts-migmix.conf
-%%X_FONTSDIR%%/TTF/migmix-1m-bold.ttf
-%%X_FONTSDIR%%/TTF/migmix-1m-regular.ttf
-%%X_FONTSDIR%%/TTF/migmix-1p-bold.ttf
-%%X_FONTSDIR%%/TTF/migmix-1p-regular.ttf
-%%X_FONTSDIR%%/TTF/migmix-2m-bold.ttf
-%%X_FONTSDIR%%/TTF/migmix-2m-regular.ttf
-%%X_FONTSDIR%%/TTF/migmix-2p-bold.ttf
-%%X_FONTSDIR%%/TTF/migmix-2p-regular.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/migmix-1m-bold.ttf
+%%FONTSDIR%%/migmix-1m-regular.ttf
+%%FONTSDIR%%/migmix-1p-bold.ttf
+%%FONTSDIR%%/migmix-1p-regular.ttf
+%%FONTSDIR%%/migmix-2m-bold.ttf
+%%FONTSDIR%%/migmix-2m-regular.ttf
+%%FONTSDIR%%/migmix-2p-bold.ttf
+%%FONTSDIR%%/migmix-2p-regular.ttf
diff --git a/japanese/font-migu/Makefile b/japanese/font-migu/Makefile
index 6baac0add243..c3525e3b79fd 100644
--- a/japanese/font-migu/Makefile
+++ b/japanese/font-migu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= migu
PORTVERSION= 1.0.20130617
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= mix-mplus-ipa/59022
@@ -15,27 +15,18 @@ DISTFILES= ${PORTNAME}-1p-${PORTVERSION:E}${EXTRACT_SUFX} \
MAINTAINER= hrs@FreeBSD.org
COMMENT= Another Japanese font set based on MigMix
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= zip
+USES= fonts zip
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
migu-README.txt
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= TTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
cd ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/ && \
${INSTALL_DATA} ipag00303/*.txt \
@@ -48,12 +39,9 @@ do-install:
${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \
${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \
${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migu*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migu*.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/migu*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -63,9 +51,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-migu/files/pkg-install.in b/japanese/font-migu/files/pkg-install.in
index 7477afe172fd..ae869ef1ae90 100644
--- a/japanese/font-migu/files/pkg-install.in
+++ b/japanese/font-migu/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/TTF
catfontsdir ()
{
@@ -91,7 +91,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -99,7 +99,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -107,6 +107,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-migu/pkg-plist b/japanese/font-migu/pkg-plist
index 748413ae2f57..03844e27533f 100644
--- a/japanese/font-migu/pkg-plist
+++ b/japanese/font-migu/pkg-plist
@@ -6,24 +6,15 @@
%%DATADIR%%/migu-1m-regular.ttf
%%DATADIR%%/migu-2m-bold.ttf
%%DATADIR%%/migu-2m-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1c-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1c-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1p-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1p-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1m-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-1m-regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-2m-bold.ttf
-%%LOCAL_FONTSDIR%%/TTF/migu-2m-regular.ttf
etc/fonts/conf.avail/20-unhint-migu.conf
etc/fonts/conf.avail/62-fonts-migu.conf
etc/fonts/conf.d/20-unhint-migu.conf
etc/fonts/conf.d/62-fonts-migu.conf
-%%X_FONTSDIR%%/TTF/migu-1c-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-1c-regular.ttf
-%%X_FONTSDIR%%/TTF/migu-1p-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-1p-regular.ttf
-%%X_FONTSDIR%%/TTF/migu-1m-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-1m-regular.ttf
-%%X_FONTSDIR%%/TTF/migu-2m-bold.ttf
-%%X_FONTSDIR%%/TTF/migu-2m-regular.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/migu-1c-bold.ttf
+%%FONTSDIR%%/migu-1c-regular.ttf
+%%FONTSDIR%%/migu-1p-bold.ttf
+%%FONTSDIR%%/migu-1p-regular.ttf
+%%FONTSDIR%%/migu-1m-bold.ttf
+%%FONTSDIR%%/migu-1m-regular.ttf
+%%FONTSDIR%%/migu-2m-bold.ttf
+%%FONTSDIR%%/migu-2m-regular.ttf
diff --git a/japanese/font-mona-ipa/Makefile b/japanese/font-mona-ipa/Makefile
index 06c53237919f..1fc684fd1d30 100644
--- a/japanese/font-mona-ipa/Makefile
+++ b/japanese/font-mona-ipa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mona-ipa
PORTVERSION= 1.0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://www.geocities.jp/ipa_mona/
PKGNAMEPREFIX= ja-font-
@@ -11,34 +11,22 @@ DISTNAME= opfc-ModuleHP-1.1.1_withIPAMonaFonts-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= IPA Japanese TrueType fonts with Mona font
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
+USES= fonts
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= COPYING.font.ja README_ipamona.txt
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/ipa*-mona.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/ipa*-mona.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/fonts/ipa*-mona.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -48,11 +36,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/fonts && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-mona-ipa/files/pkg-install.in b/japanese/font-mona-ipa/files/pkg-install.in
index 5f102b6d383a..e59d67675c5c 100644
--- a/japanese/font-mona-ipa/files/pkg-install.in
+++ b/japanese/font-mona-ipa/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/TTF
catfontsdir ()
{
@@ -75,7 +75,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -83,7 +83,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -91,6 +91,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-mona-ipa/pkg-plist b/japanese/font-mona-ipa/pkg-plist
index 00284b2cfedf..06b92e07901d 100644
--- a/japanese/font-mona-ipa/pkg-plist
+++ b/japanese/font-mona-ipa/pkg-plist
@@ -67,18 +67,12 @@
%%DATADIR%%/ChangeLog
%%DATADIR%%/COPYING
%%DATADIR%%/AUTHORS
-%%LOCAL_FONTSDIR%%/TTF/ipag-mona.ttf
-%%LOCAL_FONTSDIR%%/TTF/ipagp-mona.ttf
-%%LOCAL_FONTSDIR%%/TTF/ipagui-mona.ttf
-%%LOCAL_FONTSDIR%%/TTF/ipam-mona.ttf
-%%LOCAL_FONTSDIR%%/TTF/ipamp-mona.ttf
etc/fonts/conf.avail/20-unhint-mona-ipa.conf
etc/fonts/conf.avail/62-fonts-mona-ipa.conf
etc/fonts/conf.d/20-unhint-mona-ipa.conf
etc/fonts/conf.d/62-fonts-mona-ipa.conf
-%%X_FONTSDIR%%/TTF/ipag-mona.ttf
-%%X_FONTSDIR%%/TTF/ipagp-mona.ttf
-%%X_FONTSDIR%%/TTF/ipagui-mona.ttf
-%%X_FONTSDIR%%/TTF/ipam-mona.ttf
-%%X_FONTSDIR%%/TTF/ipamp-mona.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/ipag-mona.ttf
+%%FONTSDIR%%/ipagp-mona.ttf
+%%FONTSDIR%%/ipagui-mona.ttf
+%%FONTSDIR%%/ipam-mona.ttf
+%%FONTSDIR%%/ipamp-mona.ttf
diff --git a/japanese/font-motoya-al/Makefile b/japanese/font-motoya-al/Makefile
index 15872467b975..3b4e73cc8cdb 100644
--- a/japanese/font-motoya-al/Makefile
+++ b/japanese/font-motoya-al/Makefile
@@ -2,7 +2,7 @@
PORTNAME= font-motoya-al
PORTVERSION= 0.0.20100921
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= LOCAL
MASTER_SITE_SUBDIR= hrs
@@ -11,34 +11,22 @@ DISTNAME= motoya-al-fonts-${PORTVERSION:S,^0.0.,,}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Free Japanese fonts by MOTOYA
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= tar:bzip2
+USES= fonts tar:bzip2
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
PORTDOCS= newsrelease20100921.pdf
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= TTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/MTL*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/MTL*.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/MTL*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-motoya-al.conf \
@@ -48,11 +36,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-motoya-al.conf
${LN} -s -f ../conf.avail/62-fonts-motoya-al.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-motoya-al.conf
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-motoya-al/files/pkg-install.in b/japanese/font-motoya-al/files/pkg-install.in
index a680897e2e58..a4e47a941d82 100644
--- a/japanese/font-motoya-al/files/pkg-install.in
+++ b/japanese/font-motoya-al/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%
catfontsdir ()
{
@@ -76,7 +76,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -84,7 +84,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -92,6 +92,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-motoya-al/pkg-plist b/japanese/font-motoya-al/pkg-plist
index b8c4bc4098d2..aa9ba6e8acdf 100644
--- a/japanese/font-motoya-al/pkg-plist
+++ b/japanese/font-motoya-al/pkg-plist
@@ -1,11 +1,8 @@
%%DATADIR%%/MTLc3m.ttf
%%DATADIR%%/MTLmr3m.ttf
-%%LOCAL_FONTSDIR%%/TTF/MTLc3m.ttf
-%%LOCAL_FONTSDIR%%/TTF/MTLmr3m.ttf
etc/fonts/conf.avail/20-unhint-motoya-al.conf
etc/fonts/conf.avail/62-fonts-motoya-al.conf
etc/fonts/conf.d/20-unhint-motoya-al.conf
etc/fonts/conf.d/62-fonts-motoya-al.conf
-%%X_FONTSDIR%%/TTF/MTLc3m.ttf
-%%X_FONTSDIR%%/TTF/MTLmr3m.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/MTLc3m.ttf
+%%FONTSDIR%%/MTLmr3m.ttf
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 6ece9c1dce2a..4be26be0214d 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mplus-ipa
PORTVERSION= 1.0.20060520.p1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= hrs
@@ -12,39 +12,27 @@ DISTNAME= mixfont-mplus-ipa-TrueType-20060520p1
MAINTAINER= hrs@FreeBSD.org
COMMENT= Mixed Japanese font with IPA, M-plus outline, and Bitstream Vera
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
CONFLICTS= ja-ipa-ttfonts-[0-9]*
-USES= tar:bzip2
+USES= fonts tar:bzip2
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
Mplus-LICENSE_J.txt README.txt
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= TTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
cd ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus && \
${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/M+*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/M+*.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/fonts/M+*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -54,11 +42,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-mplus-ipa/files/pkg-install.in b/japanese/font-mplus-ipa/files/pkg-install.in
index c87696f080ad..55787236c51a 100644
--- a/japanese/font-mplus-ipa/files/pkg-install.in
+++ b/japanese/font-mplus-ipa/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/
catfontsdir ()
{
@@ -74,7 +74,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -82,7 +82,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -90,6 +90,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist
index b5ab1f635aaa..b260ac66b7b4 100644
--- a/japanese/font-mplus-ipa/pkg-plist
+++ b/japanese/font-mplus-ipa/pkg-plist
@@ -60,20 +60,13 @@
%%DATADIR%%/ChangeLog
%%DATADIR%%/COPYING
%%DATADIR%%/AUTHORS
-%%LOCAL_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+1VM+IPAG-circle.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+1P+IPAG.ttf
-%%LOCAL_FONTSDIR%%/TTF/M+1P+IPAG-circle.ttf
etc/fonts/conf.avail/20-unhint-mplus-ipa.conf
etc/fonts/conf.avail/62-fonts-mplus-ipa.conf
etc/fonts/conf.d/20-unhint-mplus-ipa.conf
etc/fonts/conf.d/62-fonts-mplus-ipa.conf
-%%X_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TTF/M+2P+IPAG.ttf
-%%X_FONTSDIR%%/TTF/M+2P+IPAG-circle.ttf
-%%X_FONTSDIR%%/TTF/M+1VM+IPAG-circle.ttf
-%%X_FONTSDIR%%/TTF/M+1P+IPAG.ttf
-%%X_FONTSDIR%%/TTF/M+1P+IPAG-circle.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/M+2VM+IPAG-circle.ttf
+%%FONTSDIR%%/M+2P+IPAG.ttf
+%%FONTSDIR%%/M+2P+IPAG-circle.ttf
+%%FONTSDIR%%/M+1VM+IPAG-circle.ttf
+%%FONTSDIR%%/M+1P+IPAG.ttf
+%%FONTSDIR%%/M+1P+IPAG-circle.ttf
diff --git a/japanese/font-ricty/Makefile b/japanese/font-ricty/Makefile
index edb60ddafb1f..98defe0ce467 100644
--- a/japanese/font-ricty/Makefile
+++ b/japanese/font-ricty/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ricty
PORTVERSION= 3.2.4
+PORTREVISION= 1
CATEGORIES= japanese x11-fonts
PKGNAMEPREFIX= ja-font-
@@ -29,7 +30,7 @@ PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
+X_FONTSDIR= share/fonts
.if !defined(PKGNAMESUFFIX)
OPTIONS_DEFINE= DISCORD DOCS
@@ -62,7 +63,6 @@ do-build:
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
.if !defined(PKGNAMESUFFIX)
diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index c441f1958865..f20e71263545 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sazanami
PORTVERSION= 20040629
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/efont/10087
PKGNAMEPREFIX= ja-font-
@@ -10,35 +10,23 @@ PKGNAMEPREFIX= ja-font-
MAINTAINER= hrs@FreeBSD.org
COMMENT= Sazanami Japanese TrueType fonts
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= tar:bzip2
+USES= fonts tar:bzip2
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= README doc
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= TTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR}/ && ${LN} -s -f \
+ ../../../${DATADIR_REL}/*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -48,11 +36,8 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-
-.if ${PORT_OPTIONS:MDOCS}
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-sazanami/files/pkg-install.in b/japanese/font-sazanami/files/pkg-install.in
index 8e2e77ee5ac3..cfc2a9f0ab0f 100644
--- a/japanese/font-sazanami/files/pkg-install.in
+++ b/japanese/font-sazanami/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/
catfontsdir ()
{
@@ -73,7 +73,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -81,7 +81,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-sazanami/pkg-plist b/japanese/font-sazanami/pkg-plist
index 773c43f672b2..ed65b0926fa8 100644
--- a/japanese/font-sazanami/pkg-plist
+++ b/japanese/font-sazanami/pkg-plist
@@ -1,11 +1,8 @@
%%DATADIR%%/sazanami-mincho.ttf
%%DATADIR%%/sazanami-gothic.ttf
-%%LOCAL_FONTSDIR%%/TTF/sazanami-mincho.ttf
-%%LOCAL_FONTSDIR%%/TTF/sazanami-gothic.ttf
etc/fonts/conf.avail/20-unhint-sazanami.conf
etc/fonts/conf.avail/62-fonts-sazanami.conf
etc/fonts/conf.d/20-unhint-sazanami.conf
etc/fonts/conf.d/62-fonts-sazanami.conf
-%%X_FONTSDIR%%/TTF/sazanami-mincho.ttf
-%%X_FONTSDIR%%/TTF/sazanami-gothic.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/sazanami-mincho.ttf
+%%FONTSDIR%%/sazanami-gothic.ttf
diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index 67dfa0d11124..e24654df4621 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -3,7 +3,7 @@
PORTNAME= shinonome
PORTVERSION= 0.9.11.p1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://openlab.jp/efont/dist/shinonome/%SUBDIR%/
MASTER_SITE_SUBDIR= . old
@@ -14,26 +14,18 @@ MAINTAINER= hrs@FreeBSD.org
COMMENT= Shinonome Japanese fonts, 12/14/16 dots
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USES= tar:bzip2
+USES= fonts tar:bzip2
WRKSRC= ${WRKDIR}/${PORTNAME:C/^font-//}-${PORTVERSION:C/.p.*$//}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
- FONTSALIAS=${DATADIR}/fonts.alias
+SUB_LIST= FONTSALIAS=${DATADIR}/fonts.alias
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
PORTDOCS= AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14 \
DESIGN.16 DESIGN.18 INSTALL README THANKS TODO LICENSE
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
FONTNAMES=\
shnm6x12a shnm6x12ab shnm6x12ai shnm6x12abi \
shnm6x12r shnm6x12rb shnm6x12ri shnm6x12rbi \
@@ -52,6 +44,7 @@ FONTNAMES=\
shnmk16 shnmk16b shnmk16i shnmk16bi \
shnmk16min shnmk16minb shnmk16mini shnmk16minbi
+FONTNAME= shinonome
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
@@ -69,14 +62,9 @@ do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${FONTNAMES:C/$/.pcf.gz/} fonts.alias \
${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/shinonome
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/shinonome && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.pcf.gz .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.pcf.gz .
-
-post-install:
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/*.pcf.gz .
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-shinonome/files/pkg-install.in b/japanese/font-shinonome/files/pkg-install.in
index df4a97d6f177..1b9a41f41c84 100644
--- a/japanese/font-shinonome/files/pkg-install.in
+++ b/japanese/font-shinonome/files/pkg-install.in
@@ -1,29 +1,16 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%
+FONTSDIR=%%FONTSDIR%%
case "$2" in
POST-INSTALL)
- %%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/misc
- cd ${X_FONTSDIR}/misc
- %%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
touch fonts.alias
grep -v -- "-shinonome-" fonts.alias > fonts.alias.tmp
(cat fonts.alias.tmp; grep -v "^!!" %%FONTSALIAS%%) > fonts.alias
rm -f fonts.alias.tmp
;;
POST-DEINSTALL)
- %%LOCALBASE%%/bin/fc-cache -f -v ${X_FONTSDIR}/misc
- rm -f ${X_FONTSDIR}/misc/fonts.cache-1
-
- cd ${X_FONTSDIR}/misc
-
- %%LOCALBASE%%/bin/mkfontdir ${X_FONTSDIR}/misc
- if [ -r ${X_FONTSDIR}/misc/fonts.dir -a `/usr/bin/wc -l < ${X_FONTSDIR}/misc/fonts.dir` = 1 ]; then
- rm -f ${X_FONTSDIR}/misc/fonts.dir
- fi
-
touch fonts.alias
grep -v -- "-shinonome-" fonts.alias > fonts.alias.tmp
if [ -s fonts.alias.tmp ]; then
@@ -31,13 +18,5 @@ POST-DEINSTALL)
else
rm -f fonts.alias.tmp fonts.alias
fi
-
- for D in misc
- do
- rmdir ${X_FONTSDIR}/${D} > /dev/null 2>&1 || true
- if [ -d ${X_FONTSDIR}/${D} ]; then
- %%LOCALBASE%%/bin/fc-cache -s -f -v ${X_FONTSDIR}/${D} || true
- fi
- done
;;
esac
diff --git a/japanese/font-shinonome/pkg-plist b/japanese/font-shinonome/pkg-plist
index e7e0c500ca51..5ffb23e6445e 100644
--- a/japanese/font-shinonome/pkg-plist
+++ b/japanese/font-shinonome/pkg-plist
@@ -63,131 +63,67 @@
%%DATADIR%%/shnmk16minbi.pcf.gz
%%DATADIR%%/shnmk16mini.pcf.gz
%%DATADIR%%/fonts.alias
-%%LOCAL_FONTSDIR%%/shinonome/shnm6x12a.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm6x12ab.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm6x12abi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm6x12ai.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm6x12r.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm6x12rb.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm6x12rbi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm6x12ri.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm7x14a.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm7x14ab.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm7x14abi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm7x14ai.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm7x14r.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm7x14rb.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm7x14rbi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm7x14ri.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm8x16a.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm8x16ab.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm8x16abi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm8x16ai.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm8x16r.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm8x16rb.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm8x16rbi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm8x16ri.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm9x18a.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm9x18ab.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm9x18abi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm9x18ai.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm9x18r.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm9x18rb.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm9x18rbi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnm9x18ri.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12b.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12bi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12i.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12maru.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12marub.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12marubi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12marui.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12min.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12minb.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12minbi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12mini.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12p.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12pb.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12pbi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk12pi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk14.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk14b.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk14bi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk14i.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk14min.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk14minb.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk14minbi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk14mini.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk16.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk16b.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk16bi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk16i.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk16min.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk16minb.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk16minbi.pcf.gz
-%%LOCAL_FONTSDIR%%/shinonome/shnmk16mini.pcf.gz
-%%X_FONTSDIR%%/misc/shnm6x12a.pcf.gz
-%%X_FONTSDIR%%/misc/shnm6x12ab.pcf.gz
-%%X_FONTSDIR%%/misc/shnm6x12abi.pcf.gz
-%%X_FONTSDIR%%/misc/shnm6x12ai.pcf.gz
-%%X_FONTSDIR%%/misc/shnm6x12r.pcf.gz
-%%X_FONTSDIR%%/misc/shnm6x12rb.pcf.gz
-%%X_FONTSDIR%%/misc/shnm6x12rbi.pcf.gz
-%%X_FONTSDIR%%/misc/shnm6x12ri.pcf.gz
-%%X_FONTSDIR%%/misc/shnm7x14a.pcf.gz
-%%X_FONTSDIR%%/misc/shnm7x14ab.pcf.gz
-%%X_FONTSDIR%%/misc/shnm7x14abi.pcf.gz
-%%X_FONTSDIR%%/misc/shnm7x14ai.pcf.gz
-%%X_FONTSDIR%%/misc/shnm7x14r.pcf.gz
-%%X_FONTSDIR%%/misc/shnm7x14rb.pcf.gz
-%%X_FONTSDIR%%/misc/shnm7x14rbi.pcf.gz
-%%X_FONTSDIR%%/misc/shnm7x14ri.pcf.gz
-%%X_FONTSDIR%%/misc/shnm8x16a.pcf.gz
-%%X_FONTSDIR%%/misc/shnm8x16ab.pcf.gz
-%%X_FONTSDIR%%/misc/shnm8x16abi.pcf.gz
-%%X_FONTSDIR%%/misc/shnm8x16ai.pcf.gz
-%%X_FONTSDIR%%/misc/shnm8x16r.pcf.gz
-%%X_FONTSDIR%%/misc/shnm8x16rb.pcf.gz
-%%X_FONTSDIR%%/misc/shnm8x16rbi.pcf.gz
-%%X_FONTSDIR%%/misc/shnm8x16ri.pcf.gz
-%%X_FONTSDIR%%/misc/shnm9x18a.pcf.gz
-%%X_FONTSDIR%%/misc/shnm9x18ab.pcf.gz
-%%X_FONTSDIR%%/misc/shnm9x18abi.pcf.gz
-%%X_FONTSDIR%%/misc/shnm9x18ai.pcf.gz
-%%X_FONTSDIR%%/misc/shnm9x18r.pcf.gz
-%%X_FONTSDIR%%/misc/shnm9x18rb.pcf.gz
-%%X_FONTSDIR%%/misc/shnm9x18rbi.pcf.gz
-%%X_FONTSDIR%%/misc/shnm9x18ri.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12b.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12bi.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12i.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12maru.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12marub.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12marubi.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12marui.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12min.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12minb.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12minbi.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12mini.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12p.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12pb.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12pbi.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk12pi.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk14.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk14b.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk14bi.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk14i.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk14min.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk14minb.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk14minbi.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk14mini.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk16.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk16b.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk16bi.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk16i.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk16min.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk16minb.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk16minbi.pcf.gz
-%%X_FONTSDIR%%/misc/shnmk16mini.pcf.gz
+%%FONTSDIR%%/shnm6x12a.pcf.gz
+%%FONTSDIR%%/shnm6x12ab.pcf.gz
+%%FONTSDIR%%/shnm6x12abi.pcf.gz
+%%FONTSDIR%%/shnm6x12ai.pcf.gz
+%%FONTSDIR%%/shnm6x12r.pcf.gz
+%%FONTSDIR%%/shnm6x12rb.pcf.gz
+%%FONTSDIR%%/shnm6x12rbi.pcf.gz
+%%FONTSDIR%%/shnm6x12ri.pcf.gz
+%%FONTSDIR%%/shnm7x14a.pcf.gz
+%%FONTSDIR%%/shnm7x14ab.pcf.gz
+%%FONTSDIR%%/shnm7x14abi.pcf.gz
+%%FONTSDIR%%/shnm7x14ai.pcf.gz
+%%FONTSDIR%%/shnm7x14r.pcf.gz
+%%FONTSDIR%%/shnm7x14rb.pcf.gz
+%%FONTSDIR%%/shnm7x14rbi.pcf.gz
+%%FONTSDIR%%/shnm7x14ri.pcf.gz
+%%FONTSDIR%%/shnm8x16a.pcf.gz
+%%FONTSDIR%%/shnm8x16ab.pcf.gz
+%%FONTSDIR%%/shnm8x16abi.pcf.gz
+%%FONTSDIR%%/shnm8x16ai.pcf.gz
+%%FONTSDIR%%/shnm8x16r.pcf.gz
+%%FONTSDIR%%/shnm8x16rb.pcf.gz
+%%FONTSDIR%%/shnm8x16rbi.pcf.gz
+%%FONTSDIR%%/shnm8x16ri.pcf.gz
+%%FONTSDIR%%/shnm9x18a.pcf.gz
+%%FONTSDIR%%/shnm9x18ab.pcf.gz
+%%FONTSDIR%%/shnm9x18abi.pcf.gz
+%%FONTSDIR%%/shnm9x18ai.pcf.gz
+%%FONTSDIR%%/shnm9x18r.pcf.gz
+%%FONTSDIR%%/shnm9x18rb.pcf.gz
+%%FONTSDIR%%/shnm9x18rbi.pcf.gz
+%%FONTSDIR%%/shnm9x18ri.pcf.gz
+%%FONTSDIR%%/shnmk12.pcf.gz
+%%FONTSDIR%%/shnmk12b.pcf.gz
+%%FONTSDIR%%/shnmk12bi.pcf.gz
+%%FONTSDIR%%/shnmk12i.pcf.gz
+%%FONTSDIR%%/shnmk12maru.pcf.gz
+%%FONTSDIR%%/shnmk12marub.pcf.gz
+%%FONTSDIR%%/shnmk12marubi.pcf.gz
+%%FONTSDIR%%/shnmk12marui.pcf.gz
+%%FONTSDIR%%/shnmk12min.pcf.gz
+%%FONTSDIR%%/shnmk12minb.pcf.gz
+%%FONTSDIR%%/shnmk12minbi.pcf.gz
+%%FONTSDIR%%/shnmk12mini.pcf.gz
+%%FONTSDIR%%/shnmk12p.pcf.gz
+%%FONTSDIR%%/shnmk12pb.pcf.gz
+%%FONTSDIR%%/shnmk12pbi.pcf.gz
+%%FONTSDIR%%/shnmk12pi.pcf.gz
+%%FONTSDIR%%/shnmk14.pcf.gz
+%%FONTSDIR%%/shnmk14b.pcf.gz
+%%FONTSDIR%%/shnmk14bi.pcf.gz
+%%FONTSDIR%%/shnmk14i.pcf.gz
+%%FONTSDIR%%/shnmk14min.pcf.gz
+%%FONTSDIR%%/shnmk14minb.pcf.gz
+%%FONTSDIR%%/shnmk14minbi.pcf.gz
+%%FONTSDIR%%/shnmk14mini.pcf.gz
+%%FONTSDIR%%/shnmk16.pcf.gz
+%%FONTSDIR%%/shnmk16b.pcf.gz
+%%FONTSDIR%%/shnmk16bi.pcf.gz
+%%FONTSDIR%%/shnmk16i.pcf.gz
+%%FONTSDIR%%/shnmk16min.pcf.gz
+%%FONTSDIR%%/shnmk16minb.pcf.gz
+%%FONTSDIR%%/shnmk16minbi.pcf.gz
+%%FONTSDIR%%/shnmk16mini.pcf.gz
diff --git a/japanese/font-takao/Makefile b/japanese/font-takao/Makefile
index dd46e2ab7280..7b41d540028d 100644
--- a/japanese/font-takao/Makefile
+++ b/japanese/font-takao/Makefile
@@ -2,7 +2,7 @@
PORTNAME= takao
PORTVERSION= 003.02.01
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://launchpadlibrarian.net/40218948/
PKGNAMEPREFIX= ja-font-
@@ -11,24 +11,18 @@ DISTNAME= ${PORTNAME}-fonts-ttf-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Improved IPA Japanese fonts
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
+USES= fonts
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= IPA_Font_License_Agreement_v1.0.txt \
README \
README.ja \
ChangeLog
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= OTF
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
@@ -39,12 +33,9 @@ post-extract:
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Takao*.otf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Takao*.otf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/Takao*.otf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -54,11 +45,7 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
diff --git a/japanese/font-takao/files/pkg-install.in b/japanese/font-takao/files/pkg-install.in
index f2ccc314072a..bd7c7c5d592b 100644
--- a/japanese/font-takao/files/pkg-install.in
+++ b/japanese/font-takao/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/OTF
+FONTSDIR=%%FONTSDIR%%
catfontsdir ()
{
@@ -76,7 +76,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -84,7 +84,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
@@ -92,6 +92,5 @@ POST-DEINSTALL)
if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
rm -f fonts.dir
fi
- rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
;;
esac
diff --git a/japanese/font-takao/pkg-plist b/japanese/font-takao/pkg-plist
index 28f9df253b21..f28770158397 100644
--- a/japanese/font-takao/pkg-plist
+++ b/japanese/font-takao/pkg-plist
@@ -4,20 +4,13 @@
%%DATADIR%%/TakaoPGothic.otf
%%DATADIR%%/TakaoGothic.otf
%%DATADIR%%/TakaoExGothic.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoGothic.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoPGothic.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoExGothic.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoMincho.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoPMincho.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoExMincho.otf
etc/fonts/conf.avail/20-unhint-takao.conf
etc/fonts/conf.avail/62-fonts-takao.conf
etc/fonts/conf.d/20-unhint-takao.conf
etc/fonts/conf.d/62-fonts-takao.conf
-%%X_FONTSDIR%%/OTF/TakaoGothic.otf
-%%X_FONTSDIR%%/OTF/TakaoPGothic.otf
-%%X_FONTSDIR%%/OTF/TakaoExGothic.otf
-%%X_FONTSDIR%%/OTF/TakaoMincho.otf
-%%X_FONTSDIR%%/OTF/TakaoPMincho.otf
-%%X_FONTSDIR%%/OTF/TakaoExMincho.otf
-@fc %%X_FONTSDIR%%/OTF
+%%FONTSDIR%%/TakaoGothic.otf
+%%FONTSDIR%%/TakaoPGothic.otf
+%%FONTSDIR%%/TakaoExGothic.otf
+%%FONTSDIR%%/TakaoMincho.otf
+%%FONTSDIR%%/TakaoPMincho.otf
+%%FONTSDIR%%/TakaoExMincho.otf
diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index ecd42f9e5a4f..fdf30f7a2618 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ume
PORTVERSION= 0.0.470
+PORTREVISION= 1
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= ${PORTNAME}-font/22212
@@ -11,22 +12,15 @@ DISTNAME= umefont_${PORTVERSION:E}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Ume Japanese TrueType fonts
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= tar:xz
+USES= fonts tar:xz
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= license.html
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= TTF
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
@@ -34,12 +28,9 @@ OPTIONS_DEFINE= DOCS
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -49,8 +40,6 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-
-post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-ume/files/pkg-install.in b/japanese/font-ume/files/pkg-install.in
index 56994519c7b0..b3c4b942061e 100644
--- a/japanese/font-ume/files/pkg-install.in
+++ b/japanese/font-ume/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/
catfontsdir ()
{
@@ -80,7 +80,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
exec < fonts.dir; rm -f fonts.dir
(catfontsdir; addentries) > fonts.dir
@@ -90,7 +90,7 @@ POST-INSTALL)
chmod 0444 fonts.dir
;;
DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
exec < fonts.dir; rm -f fonts.dir
catfontsdir > fonts.dir
_num=`nfonts fonts.dir`
diff --git a/japanese/font-ume/pkg-plist b/japanese/font-ume/pkg-plist
index 49402940a565..63b4c42074fa 100644
--- a/japanese/font-ume/pkg-plist
+++ b/japanese/font-ume/pkg-plist
@@ -16,44 +16,25 @@
%%DATADIR%%/ume-tms3.ttf
%%DATADIR%%/ume-ugo4.ttf
%%DATADIR%%/ume-ugo5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgc4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgc5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgo4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgo5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgs4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pgs5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pmo3.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-pms3.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgc4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgc5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgo4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgo5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgs4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tgs5.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tmo3.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-tms3.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-ugo4.ttf
-%%LOCAL_FONTSDIR%%/TTF/ume-ugo5.ttf
etc/fonts/conf.avail/20-unhint-ume.conf
etc/fonts/conf.avail/62-fonts-ume.conf
etc/fonts/conf.d/20-unhint-ume.conf
etc/fonts/conf.d/62-fonts-ume.conf
-%%X_FONTSDIR%%/TTF/ume-pgc4.ttf
-%%X_FONTSDIR%%/TTF/ume-pgc5.ttf
-%%X_FONTSDIR%%/TTF/ume-pgo4.ttf
-%%X_FONTSDIR%%/TTF/ume-pgo5.ttf
-%%X_FONTSDIR%%/TTF/ume-pgs4.ttf
-%%X_FONTSDIR%%/TTF/ume-pgs5.ttf
-%%X_FONTSDIR%%/TTF/ume-pmo3.ttf
-%%X_FONTSDIR%%/TTF/ume-pms3.ttf
-%%X_FONTSDIR%%/TTF/ume-tgc4.ttf
-%%X_FONTSDIR%%/TTF/ume-tgc5.ttf
-%%X_FONTSDIR%%/TTF/ume-tgo4.ttf
-%%X_FONTSDIR%%/TTF/ume-tgo5.ttf
-%%X_FONTSDIR%%/TTF/ume-tgs4.ttf
-%%X_FONTSDIR%%/TTF/ume-tgs5.ttf
-%%X_FONTSDIR%%/TTF/ume-tmo3.ttf
-%%X_FONTSDIR%%/TTF/ume-tms3.ttf
-%%X_FONTSDIR%%/TTF/ume-ugo4.ttf
-%%X_FONTSDIR%%/TTF/ume-ugo5.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/ume-pgc4.ttf
+%%FONTSDIR%%/ume-pgc5.ttf
+%%FONTSDIR%%/ume-pgo4.ttf
+%%FONTSDIR%%/ume-pgo5.ttf
+%%FONTSDIR%%/ume-pgs4.ttf
+%%FONTSDIR%%/ume-pgs5.ttf
+%%FONTSDIR%%/ume-pmo3.ttf
+%%FONTSDIR%%/ume-pms3.ttf
+%%FONTSDIR%%/ume-tgc4.ttf
+%%FONTSDIR%%/ume-tgc5.ttf
+%%FONTSDIR%%/ume-tgo4.ttf
+%%FONTSDIR%%/ume-tgo5.ttf
+%%FONTSDIR%%/ume-tgs4.ttf
+%%FONTSDIR%%/ume-tgs5.ttf
+%%FONTSDIR%%/ume-tmo3.ttf
+%%FONTSDIR%%/ume-tms3.ttf
+%%FONTSDIR%%/ume-ugo4.ttf
+%%FONTSDIR%%/ume-ugo5.ttf
diff --git a/japanese/font-vlgothic/Makefile b/japanese/font-vlgothic/Makefile
index fd558700cc09..32b027d21ab0 100644
--- a/japanese/font-vlgothic/Makefile
+++ b/japanese/font-vlgothic/Makefile
@@ -3,6 +3,7 @@
PORTNAME= vlgothic
PORTVERSION= 20141206
+PORTREVISION= 1
CATEGORIES= japanese x11-fonts
MASTER_SITES= SFJP/vlgothic/62375
PKGNAMEPREFIX= ja-font-
@@ -11,37 +12,25 @@ DISTNAME= VLGothic-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= VLGothic Japanese TrueType fonts
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= tar:xz
+USES= fonts tar:xz
NO_BUILD= yes
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
SUB_FILES= pkg-install
-SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \
- LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
DATADIR= ${PREFIX}/share/font-${PORTNAME}
PORTDOCS= Changelog LICENSE LICENSE.en LICENSE_E.mplus LICENSE_J.mplus \
README README.sazanami README_J.mplus
WRKSRC= ${WRKDIR}/VLGothic
-LOCAL_FONTSDIR= share/fonts
-X_FONTSDIR= lib/X11/fonts
-
+FONTNAME= TTF
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \
- ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
- ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF
- cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \
- ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf .
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+ ../../../${DATADIR_REL}/*.ttf .
${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d
${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -51,8 +40,6 @@ do-install:
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
-
-post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-vlgothic/files/pkg-install.in b/japanese/font-vlgothic/files/pkg-install.in
index ec205277dbf7..e7903675a690 100644
--- a/japanese/font-vlgothic/files/pkg-install.in
+++ b/japanese/font-vlgothic/files/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD$
-X_FONTSDIR=%%X_FONTSDIR%%/TTF
+FONTSDIR=%%FONTSDIR%%/TTF
catfontsdir ()
{
@@ -72,7 +72,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -80,7 +80,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
DEINSTALL)
- cd ${X_FONTSDIR}
+ cd ${FONTSDIR}
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir
diff --git a/japanese/font-vlgothic/pkg-plist b/japanese/font-vlgothic/pkg-plist
index a8d80d00ae2f..790e9ed72c59 100644
--- a/japanese/font-vlgothic/pkg-plist
+++ b/japanese/font-vlgothic/pkg-plist
@@ -1,11 +1,8 @@
%%DATADIR%%/VL-PGothic-Regular.ttf
%%DATADIR%%/VL-Gothic-Regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/VL-PGothic-Regular.ttf
-%%LOCAL_FONTSDIR%%/TTF/VL-Gothic-Regular.ttf
etc/fonts/conf.avail/20-unhint-vlgothic.conf
etc/fonts/conf.avail/62-fonts-vlgothic.conf
etc/fonts/conf.d/20-unhint-vlgothic.conf
etc/fonts/conf.d/62-fonts-vlgothic.conf
-%%X_FONTSDIR%%/TTF/VL-PGothic-Regular.ttf
-%%X_FONTSDIR%%/TTF/VL-Gothic-Regular.ttf
-@fc %%X_FONTSDIR%%/TTF
+%%FONTSDIR%%/VL-PGothic-Regular.ttf
+%%FONTSDIR%%/VL-Gothic-Regular.ttf
diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 0d0ab51bd794..67f883d7700a 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -3,7 +3,7 @@
PORTNAME= naga10
PORTVERSION= 1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://hp.vector.co.jp/authors/VA013391/fonts/
DISTNAME= knj10-${PORTVERSION}
@@ -13,12 +13,10 @@ COMMENT= X11 10-dot Kanji font 'naga10 font'
BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-FONTSDIR= lib/X11/fonts/local
-MAKE_ENV= FONTSDIR=${FONTSDIR}
-PLIST_SUB= FONTSDIR=${FONTSDIR}
+USES= fonts
+
+MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,}
OPTIONS_DEFINE= DOCS
@@ -26,7 +24,7 @@ post-extract:
${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/naga10
- ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/naga10/
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/japanese/k10/pkg-deinstall b/japanese/k10/pkg-deinstall
index ac83eee41ef8..e6f3a362f8a8 100644
--- a/japanese/k10/pkg-deinstall
+++ b/japanese/k10/pkg-deinstall
@@ -4,7 +4,7 @@ if [ "$2" != "DEINSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=${PKG_PREFIX}/share/fonts/kanji
grepv() {
awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
diff --git a/japanese/k10/pkg-install b/japanese/k10/pkg-install
index 19b1d654069d..f83ed947612b 100644
--- a/japanese/k10/pkg-install
+++ b/japanese/k10/pkg-install
@@ -4,7 +4,7 @@ if [ "$2" != "POST-INSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=${PKG_PREFIX}/share/fonts/kanji
grepv() {
awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
diff --git a/japanese/k10/pkg-plist b/japanese/k10/pkg-plist
index ef0b0a45ecfc..e89b63e1e9aa 100644
--- a/japanese/k10/pkg-plist
+++ b/japanese/k10/pkg-plist
@@ -11,6 +11,3 @@
%%FONTSDIR%%/knj10Bi.pcf.gz
%%FONTSDIR%%/5x10rkbi.pcf.gz
%%PORTDOCS%%share/doc/naga10/README
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index e30d317bb4bb..45b804869865 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kaname12
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
DISTNAME= kaname_k12_bdf
@@ -14,18 +14,16 @@ EXTRACT_ONLY= knm_new_linux.tar.gz
MAINTAINER= CQG00620@nifty.ne.jp
COMMENT= X11 12-dot Kanji font
+USES= fonts
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
WRKSRC= ${WRKDIR}/fonts
-FONTSDIR= lib/X11/fonts/${PORTNAME}
-MAKE_ENV= FONTSDIR=${FONTSDIR} MKDIR="${MKDIR}"
+MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,g} MKDIR="${MKDIR}"
PLIST_SUB= FONTSDIR=${FONTSDIR}
DOCSDIR= ${PREFIX}/share/doc/k12
SUB_FILES= pkg-message
-SUB_LIST= FONTSDIR=${FONTSDIR}
OPTIONS_DEFINE= DOCS
@@ -35,7 +33,7 @@ post-extract:
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${FILESDIR}/fonts.alias \
- ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ ${STAGEDIR}${FONTSDIR}
${INSTALL_DATA} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc.orig/* ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/k12/pkg-plist b/japanese/k12/pkg-plist
index 2296e7b07641..947deb5ddb95 100644
--- a/japanese/k12/pkg-plist
+++ b/japanese/k12/pkg-plist
@@ -5,7 +5,6 @@
%%FONTSDIR%%/knmhn12x.pcf.gz
%%FONTSDIR%%/knmzn12x.pcf.gz
%%FONTSDIR%%/knmzn12xb.pcf.gz
-@fontsdir %%FONTSDIR%%
%%PORTDOCS%%%%DOCSDIR%%/gijutsu-siryou.doc
%%PORTDOCS%%%%DOCSDIR%%/kaname.doc
%%PORTDOCS%%%%DOCSDIR%%/readme
diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile
index 6e5e38ac309e..ae9b9dbb651f 100644
--- a/japanese/kanji18/Makefile
+++ b/japanese/kanji18/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kanji
PORTVERSION?= 1.0
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
MASTER_SITE_SUBDIR= ${DISTNAME}
@@ -14,15 +14,12 @@ DISTFILES?= 573.z 574.z 575.z 576.z 577.z 578.z 579.z 580.z 581.z
MAINTAINER= sanpei@FreeBSD.org
COMMENT= X11 ${PKGNAMESUFFIX}-dot Kanji font
+USES= fonts
EXTRACT_DEPENDS= gunshar:${PORTSDIR}/archivers/sharutils
BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
- bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+ bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
DIST_SUBDIR= ${DISTNAME}
-FONTSDIR= lib/X11/fonts/local
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${GZCAT}
@@ -31,8 +28,7 @@ EXTRACT_AFTER_ARGS= | ${AWK} '/bin\/sh/{P=1} {if (P==1) print;}' | \
${LOCALBASE}/bin/gunshar -d $(WRKDIR)
PKGINSTALL= ${WRKSRC}/INSTALL
PKGDEINSTALL= ${WRKSRC}/DEINSTALL
-MAKE_ENV= FONTSDIR=${FONTSDIR}
-PLIST_SUB= FONTSDIR=${FONTSDIR}
+MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,}
README_FILE?= 573.z
RESIZESED_FILE?= 18to16.sed
RESIZED_ALIAS_FILE?= kanji16.alias
diff --git a/japanese/kanji18/pkg-descr b/japanese/kanji18/pkg-descr
index 3736148b6a6e..44d4bc677e81 100644
--- a/japanese/kanji18/pkg-descr
+++ b/japanese/kanji18/pkg-descr
@@ -1,6 +1,6 @@
Japanese 18 dot gothic font.
Bitmap font is installed the following directory tree:
- ${LOCALBASE}/lib/X11/fonts/local/
+ ${LOCALBASE}/share/fonts/kanji/
MIHIRA Yoshiro
diff --git a/japanese/kanji26/pkg-descr b/japanese/kanji26/pkg-descr
index aceb1a13a264..7fc761daa846 100644
--- a/japanese/kanji26/pkg-descr
+++ b/japanese/kanji26/pkg-descr
@@ -1,6 +1,6 @@
Japanese 26 dot mincho font.
Bitmap font is installed the following directory tree:
- ${LOCALBASE}/lib/X11/fonts/local/
+ ${LOCALBASE}/share/fonts/kanji/
MIHIRA Yoshiro
diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index 32a863de728b..c47067f562f9 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -3,7 +3,7 @@
PORTNAME= k20fonts
PORTVERSION= 0.396
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_NETBSD:S/$/:kappa20/:S/%SUBDIR%/LOCAL_PORTS/} \
SFJP/x-tt/8412/:ayu20
@@ -15,18 +15,14 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ginga-freebsd@ginganet.org
COMMENT= X11 20-dot Kanji font 'Kappa20dot + ayu font'
-USES= tar:bzip2
+USES= fonts tar:bzip2
AYUDISTNAME= ayu20gothic-1.6
AYU_SUFFIX= .tar.gz
BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-FONTSDIR= lib/X11/fonts/local
-MAKE_ARGS= FONTSDIR="${FONTSDIR}"
-PLIST_SUB= FONTSDIR=${FONTSDIR}
+MAKE_ARGS= FONTSDIR="${FONTSDIR:S,${PREFIX},,}"
DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME}
OPTIONS_DEFINE= DOCS
diff --git a/japanese/kappa20/pkg-deinstall b/japanese/kappa20/pkg-deinstall
index f43798383f48..7ffa6a66e4cd 100644
--- a/japanese/kappa20/pkg-deinstall
+++ b/japanese/kappa20/pkg-deinstall
@@ -4,7 +4,7 @@ if [ "$2" != "DEINSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=${PKG_PREFIX}/share/fonts/k20fonts
FAFILE=${PKG_PREFIX}/share/doc/ja/k20fonts/fonts.alias
grepv() {
diff --git a/japanese/kappa20/pkg-install b/japanese/kappa20/pkg-install
index 422367fe5a86..4c9317a55a2d 100644
--- a/japanese/kappa20/pkg-install
+++ b/japanese/kappa20/pkg-install
@@ -4,7 +4,7 @@ if [ "$2" != "POST-INSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=${PKG_PREFIX}/share/fonts/k20fonts
FAFILE=${PKG_PREFIX}/share/doc/ja/k20fonts/fonts.alias
grepv() {
diff --git a/japanese/kappa20/pkg-plist b/japanese/kappa20/pkg-plist
index 6690462f895c..ec12c7b2a5e2 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/kappa20/pkg-plist
@@ -64,6 +64,3 @@
%%FONTSDIR%%/vk20mi.pcf.gz
%%PORTDOCS%%%%DOCSDIR%%/README.euc-jp
%%PORTDOCS%%%%DOCSDIR%%/fonts.alias
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index ccb01e5a9222..0ded7946dd8b 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -37,6 +37,7 @@ COMMENT= Xterm variant with Japanese support
BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
USES= imake
+VGAFONT_USES= fonts
USE_XORG= xaw
CFLAGS+= -Wno-return-type
PORTDOCS= README.kt README.wallpaper.ja dot.termcap
@@ -76,9 +77,9 @@ post-extract:
cd ${WRKDIR}/pcemu1.01alpha && \
${LOCALBASE}/bin/bdftopcf vga.bdf | ${GZIP_CMD} > vga.pcf.gz
post-install-vgafont:
- ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/misc
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/misc
+ ${STAGEDIR}${FONTSDIR}
post-install: post-install-vgafont
.endif
diff --git a/japanese/kterm/pkg-plist b/japanese/kterm/pkg-plist
index 2bf3ab5539ae..f54a3f08f712 100644
--- a/japanese/kterm/pkg-plist
+++ b/japanese/kterm/pkg-plist
@@ -2,6 +2,4 @@ bin/kterm
man/ja/man1/kterm.1.gz
man/man1/kterm.1.gz
lib/X11/app-defaults/KTerm
-%%VGAFONT%%lib/X11/fonts/misc/vga.pcf.gz
-%%VGAFONT%%@exec %D/bin/mkfontdir %D/lib/X11/fonts/misc
-%%VGAFONT%%@unexec %D/bin/mkfontdir %D/lib/X11/fonts/misc; if [ `/usr/bin/wc -c < %D/lib/X11/fonts/misc/fonts.dir` = 2 ]; then /bin/rm -f %D/lib/X11/fonts/misc/fonts.dir; fi
+%%VGAFONT%%%%FONTSDIR%%/vga.pcf.gz
diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile
index 24ca6a7e04e4..88ae4619c8e5 100644
--- a/japanese/marumoji-fonts/Makefile
+++ b/japanese/marumoji-fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= marumoji-fonts
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese x11-fonts
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= yoichi
@@ -19,17 +19,16 @@ COMMENT= Japanese marumoji fonts
BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+USES= fonts
NO_WRKSUBDIR= yes
-FONTSDIR= lib/X11/fonts/local
+FONTNAME= marumoji
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= -p
EXTRACT_AFTER_ARGS= ${WRKDIR}
-MAKE_ENV= FONTSDIR=${FONTSDIR}
-PLIST_SUB= FONTSDIR=${FONTSDIR}
+MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,}
OPTIONS_DEFINE= DOCS
diff --git a/japanese/marumoji-fonts/pkg-deinstall b/japanese/marumoji-fonts/pkg-deinstall
index b09929c2a327..ac50c41030af 100644
--- a/japanese/marumoji-fonts/pkg-deinstall
+++ b/japanese/marumoji-fonts/pkg-deinstall
@@ -4,7 +4,7 @@ if [ "$2" != "DEINSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=${PKG_PREFIX}/share/fonts/marumoji
grepv() {
awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
diff --git a/japanese/marumoji-fonts/pkg-install b/japanese/marumoji-fonts/pkg-install
index b7ba26d53c05..a2e26735679c 100644
--- a/japanese/marumoji-fonts/pkg-install
+++ b/japanese/marumoji-fonts/pkg-install
@@ -4,7 +4,7 @@ if [ "$2" != "POST-INSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=${PKG_PREFIX}/share/fonts/marumoji
grepv() {
awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
diff --git a/japanese/marumoji-fonts/pkg-plist b/japanese/marumoji-fonts/pkg-plist
index 04a776cbddab..1523006196d4 100644
--- a/japanese/marumoji-fonts/pkg-plist
+++ b/japanese/marumoji-fonts/pkg-plist
@@ -35,6 +35,3 @@
%%FONTSDIR%%/maru18bi.pcf.gz
%%FONTSDIR%%/maru18i.pcf.gz
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-@exec cd %D/%%FONTSDIR%% ; mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/japanese/mikachan-ttfonts/Makefile b/japanese/mikachan-ttfonts/Makefile
index 7ac3ccc019e0..a92f50f84c15 100644
--- a/japanese/mikachan-ttfonts/Makefile
+++ b/japanese/mikachan-ttfonts/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mikachan-ttfonts
PORTVERSION= 9.1
+PORTREVISION= 1
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://mikachan.sourceforge.jp/
DISTNAME= ver${PORTVERSION}
@@ -13,6 +14,7 @@ COMMENT= Handwritten Japanese TrueType fonts by Mika-chan
EXTRACT_DEPENDS= lha:${PORTSDIR}/archivers/lha
+USES= fonts
NO_CDROM= Do not sell distfile
EXTRACT_CMD= lha
EXTRACT_BEFORE_ARGS= pq
@@ -21,15 +23,13 @@ DIST_SUBDIR= ${PORTNAME}
NO_BUILD= yes
NO_WRKSUBDIR= yes
MAKE_ENV= FONTSDIR=${FONTSDIR}
-PLIST_SUB= FONTSDIR=${FONTSDIR}
-FONTSDIR= lib/X11/fonts/TrueType
+FONTNAME= TrueType
do-install:
- ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
${INSTALL_DATA} \
${WRKDIR}/mika.ttf ${FILESDIR}/fonts.dir.mika \
- ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/japanese/mikachan-ttfonts/pkg-deinstall b/japanese/mikachan-ttfonts/pkg-deinstall
index f1ade519c898..c5a978ddaedd 100644
--- a/japanese/mikachan-ttfonts/pkg-deinstall
+++ b/japanese/mikachan-ttfonts/pkg-deinstall
@@ -2,7 +2,7 @@
if [ "$2" != "DEINSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
+FONTDIR=${PKG_PREFIX}/share/fonts/TrueType
cd ${FONTDIR}
sed -e '/-mikachan-/d' fonts.dir > fonts.dir.tmp
numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
diff --git a/japanese/mikachan-ttfonts/pkg-install b/japanese/mikachan-ttfonts/pkg-install
index 7d304a9cf669..30b86e5ca3d5 100644
--- a/japanese/mikachan-ttfonts/pkg-install
+++ b/japanese/mikachan-ttfonts/pkg-install
@@ -1,13 +1,6 @@
#!/bin/sh
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
+FONTDIR=${PKG_PREFIX}/share/fonts/TrueType
if [ "$2" = "PRE-INSTALL" ]; then
- if [ ! -d ${FONTDIR} ]; then
- echo "*********************************************************"
- echo "Please add ${FONTDIR} to your font path"
- echo "and load 'xtt' module in /etc/X11/xorg.conf ."
- echo "*********************************************************"
- mkdir $FONTDIR
- fi
exit 0
fi
cd ${FONTDIR}
diff --git a/japanese/mikachan-ttfonts/pkg-plist b/japanese/mikachan-ttfonts/pkg-plist
index 8ec8fc922e4b..d609fc575935 100644
--- a/japanese/mikachan-ttfonts/pkg-plist
+++ b/japanese/mikachan-ttfonts/pkg-plist
@@ -1,3 +1,2 @@
%%FONTSDIR%%/fonts.dir.mika
%%FONTSDIR%%/mika.ttf
-%%FONTSDIR%%/fonts.dir
diff --git a/japanese/monafonts-ttf/Makefile b/japanese/monafonts-ttf/Makefile
index 3a337d103924..8cc98db19913 100644
--- a/japanese/monafonts-ttf/Makefile
+++ b/japanese/monafonts-ttf/Makefile
@@ -11,15 +11,14 @@ DISTNAME= monafont-ttf-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= X11 TrueType Kanji fonts
-USES= zip
+USES= fonts zip
NO_BUILD= yes
NO_WRKSUBDIR= yes
-FONTSDIR= lib/X11/fonts/TrueType
-MAKE_ENV= FONTSDIR=${FONTSDIR}
-PLIST_SUB= FONTSDIR=${FONTSDIR}
+FONTNAME= TrueType
+MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,}
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${WRKDIR}/mona.ttf ${FILESDIR}/fonts.dir.mona ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/mona.ttf ${FILESDIR}/fonts.dir.mona ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/japanese/monafonts-ttf/pkg-deinstall b/japanese/monafonts-ttf/pkg-deinstall
index 0f2f4b70ba2d..91ff15d38ff5 100644
--- a/japanese/monafonts-ttf/pkg-deinstall
+++ b/japanese/monafonts-ttf/pkg-deinstall
@@ -2,7 +2,7 @@
if [ "$2" != "DEINSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
+FONTDIR=${PKG_PREFIX}/share/fonts/TrueType
cd ${FONTDIR}
sed -e '/-mona-/d' fonts.dir > fonts.dir.tmp
numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc)
diff --git a/japanese/monafonts-ttf/pkg-descr b/japanese/monafonts-ttf/pkg-descr
index 66c6b0d91d17..259b0b9f61e0 100644
--- a/japanese/monafonts-ttf/pkg-descr
+++ b/japanese/monafonts-ttf/pkg-descr
@@ -2,6 +2,6 @@ TrueType kanji proportional fonts that have same metric and order as
Japanese Windows font. This is named after ASCII art 'mona' used in
'2 channel', notorious huge Web BBS.
-This font is installed in {LOCALBASE}/lib/X11/fonts/TrueType.
+This font is installed in {LOCALBASE}/share/fonts/TrueType.
WWW: http://monafont.sourceforge.net/
diff --git a/japanese/monafonts-ttf/pkg-install b/japanese/monafonts-ttf/pkg-install
index 288173d8301c..db9478adfe53 100644
--- a/japanese/monafonts-ttf/pkg-install
+++ b/japanese/monafonts-ttf/pkg-install
@@ -1,5 +1,5 @@
#!/bin/sh
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/TrueType
+FONTDIR=${PKG_PREFIX}/share/fonts/TrueType
if [ "$2" = "PRE-INSTALL" ]; then
if [ ! -d ${FONTDIR} ]; then
echo "**************************************************************"
diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile
index 4b957f4cfe0d..913d68edbfa4 100644
--- a/japanese/monafonts/Makefile
+++ b/japanese/monafonts/Makefile
@@ -14,14 +14,11 @@ COMMENT= X11 12,14,16-dot Kanji fonts
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-USES= perl5 tar:bzip2
+USES= fonts perl5 tar:bzip2
USE_PERL5= build
+MAKE_ENV= FONTSDIR=${FONTSDIR}
-FONTSDIR= lib/X11/fonts/local
ALL_TARGET= bdf
-PLIST_SUB= FONTSDIR=${FONTSDIR}
-
.include <bsd.port.mk>
diff --git a/japanese/monafonts/files/patch-Makefile b/japanese/monafonts/files/patch-Makefile
index bda17e280d37..e62bad50d62a 100644
--- a/japanese/monafonts/files/patch-Makefile
+++ b/japanese/monafonts/files/patch-Makefile
@@ -9,7 +9,7 @@
-BDFTOPCF = $(X11BINDIR)/bdftopcf
-MKDIRHIER = $(X11BINDIR)/mkdirhier # 'mkdir -p' may also work.
-MKFONTDIR = $(X11BINDIR)/mkfontdir
-+X11FONTDIR = $(DESTDIR)$(PREFIX)/lib/X11/fonts/local
++X11FONTDIR = $(DESTDIR)$(FONTSDIR)
+BDFTOPCF = bdftopcf
+MKDIRHIER = mkdir -p # 'mkdir -p' may also work.
+MKFONTDIR = mkfontdir
diff --git a/japanese/monafonts/pkg-deinstall b/japanese/monafonts/pkg-deinstall
index b036f74e8915..1945794b2d96 100644
--- a/japanese/monafonts/pkg-deinstall
+++ b/japanese/monafonts/pkg-deinstall
@@ -4,7 +4,7 @@ if [ "$2" != "DEINSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=${PKG_PREFIX}/share/fonts/monafonts
grepv() {
awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
diff --git a/japanese/monafonts/pkg-descr b/japanese/monafonts/pkg-descr
index 4ab62fe13033..847349458aa1 100644
--- a/japanese/monafonts/pkg-descr
+++ b/japanese/monafonts/pkg-descr
@@ -3,6 +3,6 @@ Japanese Windows font. This is named after ASCII art 'mona' used in
'2 channel', notorious huge Web BBS.
Bitmap font is installed the following directory tree:
- ${LOCALBASE}/lib/X11/fonts/local/
+ ${LOCALBASE}/share/fonts/monafont/
WWW: http://monafont.sourceforge.net/
diff --git a/japanese/monafonts/pkg-install b/japanese/monafonts/pkg-install
index 9a32a9b28850..2551f63b15d9 100644
--- a/japanese/monafonts/pkg-install
+++ b/japanese/monafonts/pkg-install
@@ -4,7 +4,7 @@ if [ "$2" != "POST-INSTALL" ]; then
exit 0
fi
-FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
+FONTDIR=${PKG_PREFIX}/share/fonts/monafont
grepv() {
awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
diff --git a/japanese/monafonts/pkg-plist b/japanese/monafonts/pkg-plist
index 6e6a4fe4626a..d33c685708d7 100644
--- a/japanese/monafonts/pkg-plist
+++ b/japanese/monafonts/pkg-plist
@@ -47,7 +47,3 @@
%%FONTSDIR%%/monau16B.pcf.gz
%%FONTSDIR%%/monau16BI.pcf.gz
%%FONTSDIR%%/monau16I.pcf.gz
-@mode
-@exec cd %D/%%FONTSDIR%% ; mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index 7f42a3a782e8..617c13c42c30 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -30,7 +30,7 @@ LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}
OPTIONS_DEFINE= DOCS X11
OPTIONS_DEFAULT=DOCS X11
-X11_RUN_DEPENDS=${LOCALBASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts
+X11_RUN_DEPENDS=${LOCALBASE}/share/fonts/monafonts/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/ngraph-fonts/Makefile b/japanese/ngraph-fonts/Makefile
index 8ba4f6536b1c..8506d91d57e4 100644
--- a/japanese/ngraph-fonts/Makefile
+++ b/japanese/ngraph-fonts/Makefile
@@ -12,16 +12,11 @@ MAINTAINER= sanpei@FreeBSD.org
COMMENT= Japanese Font Setup for math/ngraph
RUN_DEPENDS= \
- ${LOCALBASE}/lib/X11/fonts/local/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \
- ${LOCALBASE}/lib/X11/fonts/local/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26
-
-BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+ ${LOCALBASE}/share/fonts/kanji/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \
+ ${LOCALBASE}/share/fonts/kanji/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26
NO_BUILD= yes
NO_MTREE= yes
-
-do-install: # empty
+NO_INSTALL= yes
.include <bsd.port.mk>
diff --git a/korean/aleefonts-ttf/Makefile b/korean/aleefonts-ttf/Makefile
index be6919081f54..081a1a72be4e 100644
--- a/korean/aleefonts-ttf/Makefile
+++ b/korean/aleefonts-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= aleefonts
PORTVERSION= 12
+PORTREVISION= 1
CATEGORIES= korean x11-fonts
MASTER_SITES= DEBIAN
MASTER_SITE_SUBDIR= pool/main/t/ttf-alee
@@ -15,26 +16,17 @@ COMMENT= A-Lee's Hangul truetype fonts #'
LICENSE= ART10
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+USES= fonts
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
-FONTSDIR= lib/X11/fonts/alee${PKGNAMESUFFIX}
FONTLIST= Bandal Bangwool Eunjin EunjinNakseo Guseul
-FONTFILES= ${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale
+FONTFILES= ${FONTLIST:S/$/.ttf/}
+NO_BUILD= yes
PLIST_FILES= ${FONTFILES:S|^|${FONTSDIR}/|}
-do-build:
- ${LOCALBASE}/bin/mkfontscale ${WRKSRC}
- ${LOCALBASE}/bin/mkfontdir ${WRKSRC}
-
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-
-post-install:
- @${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
- @${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile
index b564bc239d86..46421b2e6439 100644
--- a/korean/baekmukfonts-bdf/Makefile
+++ b/korean/baekmukfonts-bdf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= baekmukfonts
PORTVERSION= 2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= korean x11-fonts
MASTER_SITES= ftp://ftp.mizi.com/pub/baekmuk/obsoletes/ \
ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
@@ -32,12 +32,9 @@ FONTLIST= batang10 batang10b batang12 batang12b batang14 batang14b \
FONTLIST_MANUAL= batang10 batang10b gulim10 gulim10b
BDFTOPCF= ${PREFIX}/bin/bdftopcf
-MKFONTDIR= ${PREFIX}/bin/mkfontdir
CHARSETSUB= s/ksx1001.1997/ksc5601.1987/g
-FONTSDIR= lib/X11/fonts/local
-MAKE_ENV= FONTSDIR=${FONTSDIR}
-PLIST_SUB= FONTSDIR=${FONTSDIR}
-USES= perl5
+MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,}
+USES= fonts perl5
USE_PERL5= build
# manually install hinted fonts
@@ -56,10 +53,10 @@ do-build:
.endfor
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
.for FONTNAME in ${FONTLIST}
${INSTALL_DATA} ${WRKDIR}/${FONTNAME}.pcf.gz \
- ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ ${STAGEDIR}${FONTSDIR}
.endfor
.include <bsd.port.mk>
diff --git a/korean/baekmukfonts-bdf/pkg-plist b/korean/baekmukfonts-bdf/pkg-plist
index 51e631f00dd2..f9017fac420f 100644
--- a/korean/baekmukfonts-bdf/pkg-plist
+++ b/korean/baekmukfonts-bdf/pkg-plist
@@ -40,6 +40,3 @@
%%FONTSDIR%%/hline18.pcf.gz
%%FONTSDIR%%/hline20.pcf.gz
%%FONTSDIR%%/hline24.pcf.gz
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/korean/baekmukfonts-ttf/Makefile b/korean/baekmukfonts-ttf/Makefile
index 5f8d6484cdcb..44f6aaa02dd0 100644
--- a/korean/baekmukfonts-ttf/Makefile
+++ b/korean/baekmukfonts-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= baekmukfonts
PORTVERSION= 2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean
MASTER_SITES= http://kldp.net/frs/download.php/1429/
PKGNAMESUFFIX= -ttf
@@ -17,16 +17,13 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT
NO_BUILD= yes
+USES= fonts
FONTNAME= baekmuk
-FONTSDIR= lib/X11/fonts/${FONTNAME}${PKGNAMESUFFIX}
-PLIST_SUB= FONTSDIR=${FONTSDIR}
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} COPYRIGHT COPYRIGHT.ks README \
- contrib/hconfig.ps ttf/*.ttf ttf/fonts.dir \
- ${STAGEDIR}${PREFIX}/${FONTSDIR})
- ${INSTALL_DATA} ${WRKSRC}/ttf/fonts.scale.xtt \
- ${STAGEDIR}${PREFIX}/${FONTSDIR}/fonts.scale
+ contrib/hconfig.ps ttf/*.ttf \
+ ${STAGEDIR}${FONTSDIR})
.include <bsd.port.mk>
diff --git a/korean/baekmukfonts-ttf/pkg-plist b/korean/baekmukfonts-ttf/pkg-plist
index 10692d587ce7..b7f868680c4c 100644
--- a/korean/baekmukfonts-ttf/pkg-plist
+++ b/korean/baekmukfonts-ttf/pkg-plist
@@ -3,10 +3,6 @@
%%FONTSDIR%%/README
%%FONTSDIR%%/batang.ttf
%%FONTSDIR%%/dotum.ttf
-%%FONTSDIR%%/fonts.dir
-%%FONTSDIR%%/fonts.scale
%%FONTSDIR%%/gulim.ttf
%%FONTSDIR%%/hconfig.ps
%%FONTSDIR%%/hline.ttf
-@exec fc-cache -s %D/%%FONTSDIR%% 2>/dev/null || true
-@unexec fc-cache -s %D/%%FONTSDIR%% 2>/dev/null || true
diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index 3ba279dd406d..917ba715bc00 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -12,7 +12,7 @@ COMMENT= Serial controlling software, with gtk+ widget
LICENSE= GPLv2
-RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
+RUN_DEPENDS= ${LOCALBASE}/share/fonts/baekmukfonts/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
USES= gettext pathfix perl5 pkgconfig
PATHFIX_MAKEFILEIN= Makefile*in
diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile
index f688b80611e5..85f86ec13fef 100644
--- a/korean/hanyangfonts/Makefile
+++ b/korean/hanyangfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hanyangfonts
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= korean x11-fonts
MASTER_SITES= http://ftp.kaist.ac.kr/hangul/fonts/ \
ftp://ftp.kaist.ac.kr/hangul/fonts/ \
@@ -13,13 +13,11 @@ DISTNAME= hanyang-font-pcf
MAINTAINER= ports@FreeBSD.org
COMMENT= Hanyang Hangul fonts for X11
-RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
SUB_FILES= pkg-message
+USES= fonts
NO_WRKSUBDIR= yes
+FONTNAME= hanyang
FONTS= hgm10 hgm12 hgm14 hgm16 hgm18 hgm20 \
hmm10 hmm12 hmm14 hmm16 hmm18 hmm20
@@ -32,10 +30,10 @@ do-build:
done; \
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/local
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
.for f in ${FONTS}
${INSTALL_DATA} ${WRKSRC}/${f}.pcf.gz \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/local
+ ${STAGEDIR}${FONTSDIR}
.endfor
.include <bsd.port.mk>
diff --git a/korean/hanyangfonts/files/pkg-message.in b/korean/hanyangfonts/files/pkg-message.in
index 81fa8573b653..c33af528bff2 100644
--- a/korean/hanyangfonts/files/pkg-message.in
+++ b/korean/hanyangfonts/files/pkg-message.in
@@ -9,12 +9,12 @@ Please note:
Section "Files"
...
- FontPath "%%PREFIX%%/lib/X11/fonts/local/"
+ FontPath "%%FONTSDIR%%"
...
Or, run this command at your X desktop:
- # xset +fp %%PREFIX%%/lib/X11/fonts/local/ && xset fp rehash
+ # xset +fp %%FONTSDIR%% && xset fp rehash
Don't forget to add the directory to your /etc/XF86Config, for
add the correct font path after you reboots X.
diff --git a/korean/hanyangfonts/pkg-plist b/korean/hanyangfonts/pkg-plist
index 1a659f351248..f5ffc052d823 100644
--- a/korean/hanyangfonts/pkg-plist
+++ b/korean/hanyangfonts/pkg-plist
@@ -1,15 +1,12 @@
-lib/X11/fonts/local/hmm10.pcf.gz
-lib/X11/fonts/local/hmm12.pcf.gz
-lib/X11/fonts/local/hmm14.pcf.gz
-lib/X11/fonts/local/hmm16.pcf.gz
-lib/X11/fonts/local/hmm18.pcf.gz
-lib/X11/fonts/local/hmm20.pcf.gz
-lib/X11/fonts/local/hgm10.pcf.gz
-lib/X11/fonts/local/hgm12.pcf.gz
-lib/X11/fonts/local/hgm14.pcf.gz
-lib/X11/fonts/local/hgm16.pcf.gz
-lib/X11/fonts/local/hgm18.pcf.gz
-lib/X11/fonts/local/hgm20.pcf.gz
-@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
+%%FONTSDIR%%/hmm10.pcf.gz
+%%FONTSDIR%%/hmm12.pcf.gz
+%%FONTSDIR%%/hmm14.pcf.gz
+%%FONTSDIR%%/hmm16.pcf.gz
+%%FONTSDIR%%/hmm18.pcf.gz
+%%FONTSDIR%%/hmm20.pcf.gz
+%%FONTSDIR%%/hgm10.pcf.gz
+%%FONTSDIR%%/hgm12.pcf.gz
+%%FONTSDIR%%/hgm14.pcf.gz
+%%FONTSDIR%%/hgm16.pcf.gz
+%%FONTSDIR%%/hgm18.pcf.gz
+%%FONTSDIR%%/hgm20.pcf.gz
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index 98dd38e2de6c..527433f3d79c 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -14,12 +14,10 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= X11 KAIST font(ksc5601.1987-0 encoding) collection
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-USES= gmake
+USES= fonts gmake
NO_WRKSUBDIR= yes
-MAKE_ENV= DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
+MAKE_ENV= DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}" FONTSDIR="${FONTSDIR}"
do-extract:
@${RM} -fr ${WRKDIR} && \
diff --git a/korean/kaistfonts/files/patch-Makefile b/korean/kaistfonts/files/patch-Makefile
index b387e1c1e64a..916074523093 100644
--- a/korean/kaistfonts/files/patch-Makefile
+++ b/korean/kaistfonts/files/patch-Makefile
@@ -10,9 +10,9 @@
+all: ${PCF}
+
+install:
-+ -mkdir -p ${DESTDIR}${PREFIX}/lib/X11/fonts/local
++ -mkdir -p ${DESTDIR}${FONTSDIR}
+ for i in ${PCF}; do \
-+ gzip -c < $$i > ${DESTDIR}${PREFIX}/lib/X11/fonts/local/$$i.gz; \
++ gzip -c < $$i > ${DESTDIR}${FONTSDIR}/$$i.gz; \
+ done
+
+.bdf.pcf:
diff --git a/korean/kaistfonts/pkg-plist b/korean/kaistfonts/pkg-plist
index e9891fe2282f..29600bf4a861 100644
--- a/korean/kaistfonts/pkg-plist
+++ b/korean/kaistfonts/pkg-plist
@@ -1,7 +1,4 @@
-lib/X11/fonts/local/kaist-newmj16.pcf.gz
-lib/X11/fonts/local/kaist-newmj18.pcf.gz
-lib/X11/fonts/local/ks_iyagi16.pcf.gz
-lib/X11/fonts/local/ks_philgi16.pcf.gz
-@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
+%%FONTSDIR%%/kaist-newmj16.pcf.gz
+%%FONTSDIR%%/kaist-newmj18.pcf.gz
+%%FONTSDIR%%/ks_iyagi16.pcf.gz
+%%FONTSDIR%%/ks_philgi16.pcf.gz
diff --git a/korean/nanumcoding-ttf/Makefile b/korean/nanumcoding-ttf/Makefile
index edf3eaf29976..5484abec5dc7 100644
--- a/korean/nanumcoding-ttf/Makefile
+++ b/korean/nanumcoding-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= nanumcoding
PORTVERSION= 2.0
+PORTREVISION= 1
CATEGORIES= korean
MASTER_SITES= http://dev.naver.com/frs/download.php/441/ \
LOCAL
@@ -14,15 +15,13 @@ COMMENT= NanumGothic Coding Hangul font (TrueType)
LICENSE= OFL11
-BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
NO_WRKSUBDIR= yes
-USES= zip
-FONTSDIR= lib/X11/fonts/nanum-coding${PKGNAMESUFFIX}
+NO_BUILD= yes
+USES= fonts zip
+FONTNAME= nanum-coding${PKGNAMESUFFIX}
FONTLIST= NanumGothicCoding \
NanumGothicCoding-Bold
-FONTFILES= ${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale
+FONTFILES= ${FONTLIST:S/$/.ttf/}
PLIST_FILES= ${FONTFILES:S|^|${FONTSDIR}/|}
@@ -32,16 +31,8 @@ post-extract:
${MV} ${WRKSRC}/*.ttf ${WRKSRC}/NanumGothicCoding.ttf
${MV} ${WRKSRC}/*-Bold.tmp ${WRKSRC}/NanumGothicCoding-Bold.ttf
-do-build:
- ${LOCALBASE}/bin/mkfontscale ${WRKSRC}
- ${LOCALBASE}/bin/mkfontdir ${WRKSRC}
-
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-
-post-install:
- @${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
- @${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/korean/nanumfonts-otf/Makefile b/korean/nanumfonts-otf/Makefile
index e3f50d41fe59..afbd2871dd98 100644
--- a/korean/nanumfonts-otf/Makefile
+++ b/korean/nanumfonts-otf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= nanumfonts
PORTVERSION= 3.1
+PORTREVISION= 1
CATEGORIES= korean
MASTER_SITES= http://cdn.naver.com/naver/NanumFont/fontfiles/ \
LOCAL
@@ -17,18 +18,16 @@ COMMENT= Nanum family Hangul fonts (${FONTFORMAT})
LICENSE= OFL11
-BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
DISTINFO_FILE= ${PKGDIR}/distinfo.${FONTTYPE}
NO_WRKSUBDIR= yes
-USES= zip
+NO_BUILD= yes
+USES= fonts zip
FONTTYPE?= otf
FONTFORMAT?= OpenType
-FONTSDIR= lib/X11/fonts/nanum-${FONTTYPE}
+FONTNAME= nanum-${FONTTYPE}
FONTLIST= NanumBrush \
NanumGothic \
NanumGothicBold \
@@ -44,20 +43,12 @@ FONTLIST= NanumBrush \
NanumMyeongjoEcoExtraBold \
NanumMyeongjoExtraBold \
NanumPen
-FONTFILES= ${FONTLIST:S/$/.${FONTTYPE}/} fonts.dir fonts.scale
+FONTFILES= ${FONTLIST:S/$/.${FONTTYPE}/}
PLIST_FILES= ${FONTFILES:S|^|${FONTSDIR}/|}
-do-build:
- ${LOCALBASE}/bin/mkfontscale ${WRKSRC}
- ${LOCALBASE}/bin/mkfontdir ${WRKSRC}
-
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-
-post-install:
- @${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
- @${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/korean/unfonts-core/Makefile b/korean/unfonts-core/Makefile
index 72bf6b290e1c..7a8cc27a2f30 100644
--- a/korean/unfonts-core/Makefile
+++ b/korean/unfonts-core/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unfonts
PORTVERSION?= 1.0.2.080608
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= korean x11-fonts
MASTER_SITES?= http://kldp.net/frs/download.php/4695/
PKGNAMESUFFIX= -${FONTCAT}
@@ -15,13 +15,13 @@ COMMENT= GPL'd Korean TrueType Fonts by UN Koaunghi (${FONTCAT})
LICENSE= GPLv2
LICENSE_FILE= ${FILESDIR}/COPYING
-BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+USES= fonts
+NO_BUILD= yes
DISTINFO_FILE= ${PKGDIR}/distinfo.${FONTCAT}-ttf
WRKSRC= ${WRKDIR}/un-fonts
-FONTSDIR= lib/X11/fonts/${PORTNAME}-${FONTCAT}
+FONTNAME= ${PORTNAME}-${FONTCAT}
FONTCAT?= core
FONTLIST?= UnBatang \
UnBatangBold \
@@ -35,20 +35,12 @@ FONTLIST?= UnBatang \
UnGungseo \
UnPilgi \
UnPilgiBold
-FONTFILES= ${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale
+FONTFILES= ${FONTLIST:S/$/.ttf/}
PLIST_FILES= ${FONTFILES:S|^|${FONTSDIR}/|}
-do-build:
- ${LOCALBASE}/bin/mkfontscale ${WRKSRC}
- ${LOCALBASE}/bin/mkfontdir ${WRKSRC}
-
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-
-post-install:
- @${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
- @${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/korean/xpdf/Makefile b/korean/xpdf/Makefile
index 46e6caaf39b1..861a2d4cb6b5 100644
--- a/korean/xpdf/Makefile
+++ b/korean/xpdf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xpdf
PORTVERSION= 3.03
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= korean
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/
PKGNAMESUFFIX= -kofont
@@ -23,7 +23,7 @@ SUB_LIST= ADOBECMAPDIR=${ADOBECMAPDIR} \
FONTSDIR=${FONTSDIR}
PLIST_SUB= EXTRARC=${EXTRARC}
-FONTSDIR= ${LOCALBASE}/lib/X11/fonts/unfonts-core
+FONTSDIR= ${LOCALBASE}/share/fonts/unfonts-core
EXTRARC= ${DATADIR}/korean/dot.xpdfrc
ADOBECMAPDIR= ${LOCALBASE}/share/fonts/adobe-cmaps
INSTALL_FILES= Adobe-Korea1.cidToUnicode ISO-2022-KR.unicodeMap \
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index f19b52529cbf..7096cd1fdd3d 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -37,7 +37,7 @@ CMAKE_ARGS= -DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \
CFLAGS+= -D_IS_BUILDING_PLPLOT_PORT_
USE_LDCONFIG= yes
-FREEFONT_DIR= ${LOCALBASE}/lib/X11/fonts/freefont-ttf
+FREEFONT_DIR= ${LOCALBASE}/share/fonts/freefont-ttf
.include <bsd.port.options.mk>
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 216a54afbaba..8ef8fd86f8cf 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -62,10 +62,10 @@ PLIST_FORMATS+= ${O:tl:S,_,-,}
.if ${PORT_OPTIONS:MPDF} || ${PORT_OPTIONS:MPS}
BUILD_DEPENDS+= fop:${PORTSDIR}/textproc/fop \
- ${LOCALBASE}/lib/X11/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
- ${LOCALBASE}/lib/X11/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
- ${LOCALBASE}/lib/X11/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
- ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu \
+ ${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
+ ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
+ ${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
+ ${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu \
${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa
.endif
diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index 6b93ee361232..1d60a69c85c5 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE= IBUS NLS
OPTIONS_DEFAULT= IBUS
IBUS_DESC= iBus support
-DEJAVU_FONTSDIR= ${LOCALBASE}/lib/X11/fonts/dejavu
+DEJAVU_FONTSDIR= ${LOCALBASE}/share/fonts/dejavu
DEJAVU_FONTFILE= ${DEJAVU_FONTSDIR}/DejaVuSans.ttf
IBUS_RUN_DEPENDS= ibus-daemon:${PORTSDIR}/textproc/ibus
diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index 719c3504c6aa..82bb0bbe406b 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dvd-slideshow
PORTVERSION= 0.8.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2 \
SF/${PORTNAME}/${PORTNAME}-themes/${THEMEVERSION}-1:themes
@@ -21,7 +21,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
jhead:${PORTSDIR}/graphics/jhead \
flvtool2:${PORTSDIR}/multimedia/rubygem-flvtool2 \
- ${LOCALBASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf \
+ ${LOCALBASE}/share/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf \
cdrecord:${PORTSDIR}/sysutils/cdrtools
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-2
@@ -49,7 +49,7 @@ PLIST_SUB+= NOTHEMES="@comment "
post-patch:
.for f in dvd-slideshow dvd-menu dir2slideshow gallery1-to-slideshow jigl2slideshow
@${REINPLACE_CMD} -e 's|!/bin/bash|!${PREFIX}/bin/bash|g ; \
- s|/usr/share/fonts/|${LOCALBASE}/lib/X11/fonts/|g ; \
+ s|/usr/share/fonts/|${LOCALBASE}/share/fonts/|g ; \
s|seq |seq2 |g' ${WRKSRC}/${f}
. if ${PORT_OPTIONS:MTHEMES}
@${REINPLACE_CMD} -e 's|/opt/dvd-slideshow/themes|${DATADIR}/themes|g' \
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 56795302b514..924911474e69 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES= http://linuxtv.org/downloads/xawtv/
MAINTAINER= oliver@FreeBSD.org
COMMENT= TV viewing application and a few TV utilities
-BUILD_DEPENDS= ${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
-RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
+BUILD_DEPENDS= ${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
+RUN_DEPENDS= ${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
libjpeg.so:${PORTSDIR}/graphics/jpeg
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 62765d880019..2594eea00c5a 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tightvnc
PORTVERSION= 1.3.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net java
MASTER_SITES= SF/vnc-tight/TightVNC-unix/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}_unixsrc
diff --git a/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile b/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
index 26bd2d6f5e73..ce42359c5f83 100644
--- a/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
@@ -6,7 +6,7 @@
-#ifdef DefaultFontPath
-DEFAULTFONTPATH = DefaultFontPath
-+DEFAULTFONTPATH = ${LOCALBASE}/lib/X11/fonts/misc
++DEFAULTFONTPATH = ${LOCALBASE}/share/fonts/misc
SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\"
-#endif
diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index 9e5a9b73a0de..23d5dfecce6b 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tridiavnc
PORTVERSION= 1.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=dwcjr
diff --git a/net/tridiavnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile b/net/tridiavnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
index 12392d7656a2..34bc9753fc6b 100644
--- a/net/tridiavnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
+++ b/net/tridiavnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
@@ -5,7 +5,7 @@
#ifdef DefaultFontPath
-DEFAULTFONTPATH = DefaultFontPath
-+DEFAULTFONTPATH = ${PREFIX}/lib/X11/fonts/misc
++DEFAULTFONTPATH = ${PREFIX}/share/fonts/misc
SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\"
#endif
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 895010c864cd..817f81ce37af 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -56,7 +56,7 @@ MAKE_ARGS= AR='ar rc'
RUN_DEPENDS+= xauth:${PORTSDIR}/x11/xauth \
xorg-fonts-miscbitmaps>0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
- ${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias
+ ${LOCALBASE}/share/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias
EXTRA_PATCHES+= ${WRKSRC}/xc.patch \
${PATCHDIR}/vnc.def-patch \
diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index fa49a1c403aa..b6b5dfd632e3 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -27,7 +27,7 @@ BUILD_DEPENDS= pdftexi2dvi:${PORTSDIR}/print/texinfo \
${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts
RUN_DEPENDS= mftrace:${PORTSDIR}/print/mftrace \
- ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu
+ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu
LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile \
libgmp.so:${PORTSDIR}/math/gmp \
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index d83d37dbf23a..b81fad7678bb 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -28,7 +28,7 @@ BUILD_DEPENDS= pdftexi2dvi:${PORTSDIR}/print/texinfo \
${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts
RUN_DEPENDS= mftrace:${PORTSDIR}/print/mftrace \
- ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu
+ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu
LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile \
libgmp.so:${PORTSDIR}/math/gmp \
diff --git a/russian/artwiz-ru/Makefile b/russian/artwiz-ru/Makefile
index 02c127258c53..6d2c0e886794 100644
--- a/russian/artwiz-ru/Makefile
+++ b/russian/artwiz-ru/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-ru
PORTVERSION= 20041031
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= russian x11-fonts
MASTER_SITES= http://dev.gentoo.org/~sergey/ \
${MASTER_SITE_LOCAL}
@@ -13,23 +13,14 @@ DISTNAME= artwiz_ru
MAINTAINER= novel@FreeBSD.org
COMMENT= Russian Artwiz fonts
-BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES= tar:bzip2
+USES= fonts tar:bzip2
NO_BUILD= yes
WRKSRC= ${WRKDIR}/fonts
-PKGMESSAGE= ${WRKDIR}/pkg-message
-
-FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-
-post-patch:
- @${SED} -e 's,LOCALBASE,${LOCALBASE},g' \
- ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+SUB_FILES= pkg-message
do-install:
- @${MKDIR} ${STAGEDIR}${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.pcf ${STAGEDIR}${FONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.pcf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/russian/artwiz-ru/files/pkg-message.in b/russian/artwiz-ru/files/pkg-message.in
index 04de2512ddae..e3812ed04bf4 100644
--- a/russian/artwiz-ru/files/pkg-message.in
+++ b/russian/artwiz-ru/files/pkg-message.in
@@ -1,8 +1,8 @@
============================================================
-You'll have to add LOCALBASE/lib/X11/fonts/artwiz-ru
+You'll have to add LOCALBASE/share/fonts/artwiz-ru
to your X font path by either:
-$ xset fp+ LOCALBASE/lib/X11/fonts/artwiz-ru
+$ xset fp+ LOCALBASE/share/fonts/artwiz-ru
$ xset fp rehash
or by adding it to your X-server configuration file and
diff --git a/russian/artwiz-ru/pkg-plist b/russian/artwiz-ru/pkg-plist
index fecb59cd862a..03de6396d4e6 100644
--- a/russian/artwiz-ru/pkg-plist
+++ b/russian/artwiz-ru/pkg-plist
@@ -1,21 +1,21 @@
-lib/X11/fonts/artwiz-ru/anorexia-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/anorexia-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/anorexia.pcf
-lib/X11/fonts/artwiz-ru/cure-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/cure-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/cure.pcf
-lib/X11/fonts/artwiz-ru/gelly-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/gelly-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/gelly.pcf
-lib/X11/fonts/artwiz-ru/glisp-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/glisp-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/glisp.pcf
-lib/X11/fonts/artwiz-ru/mints-mild-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/mints-mild-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/mints-mild.pcf
-lib/X11/fonts/artwiz-ru/nu-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/nu-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/nu.pcf
-lib/X11/fonts/artwiz-ru/snap-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/snap-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/snap.pcf
+%%FONTSDIR%%/anorexia-koi8-r.pcf
+%%FONTSDIR%%/anorexia-microsoft-cp1251.pcf
+%%FONTSDIR%%/anorexia.pcf
+%%FONTSDIR%%/cure-koi8-r.pcf
+%%FONTSDIR%%/cure-microsoft-cp1251.pcf
+%%FONTSDIR%%/cure.pcf
+%%FONTSDIR%%/gelly-koi8-r.pcf
+%%FONTSDIR%%/gelly-microsoft-cp1251.pcf
+%%FONTSDIR%%/gelly.pcf
+%%FONTSDIR%%/glisp-koi8-r.pcf
+%%FONTSDIR%%/glisp-microsoft-cp1251.pcf
+%%FONTSDIR%%/glisp.pcf
+%%FONTSDIR%%/mints-mild-koi8-r.pcf
+%%FONTSDIR%%/mints-mild-microsoft-cp1251.pcf
+%%FONTSDIR%%/mints-mild.pcf
+%%FONTSDIR%%/nu-koi8-r.pcf
+%%FONTSDIR%%/nu-microsoft-cp1251.pcf
+%%FONTSDIR%%/nu.pcf
+%%FONTSDIR%%/snap-koi8-r.pcf
+%%FONTSDIR%%/snap-microsoft-cp1251.pcf
+%%FONTSDIR%%/snap.pcf
diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index 1ac779fe7f4f..e967806557a8 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asusoled
PORTVERSION= 0.10
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jkim
@@ -24,7 +24,7 @@ SUB_FILES= pkg-message
MAKE_ARGS+= TTF_FONT=${FONTDIR}/TTF/luxisr.ttf
-FONTDIR?= ${LOCALBASE}/lib/X11/fonts
+FONTDIR?= ${LOCALBASE}/share/fonts
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/grub2-efi/Makefile b/sysutils/grub2-efi/Makefile
index 5d2ea5f7ed39..d1ede0f2ec62 100644
--- a/sysutils/grub2-efi/Makefile
+++ b/sysutils/grub2-efi/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ENV= CPP="${CC} -E" \
.include <bsd.port.pre.mk>
post-patch:
- @${LN} -s ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
+ @${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
pre-configure:
diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index b7f433ff5535..ddf92c410f5b 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= grub2-pcbsd
PORTVERSION= 2.02p
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= sysutils
MASTER_SITES= http://www.pcbsd.org/~kris/software/ \
ftp://ftp.pcbsd.org/pub/software/
@@ -54,8 +54,8 @@ PLIST_SUB+= EFIEMU=${EFIEMU}
.if ${PORT_OPTIONS:MMKFONT}
LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
- ${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
+BUILD_DEPENDS+= ${LOCALBASE}//fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
+ ${LOCALBASE}/share/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
MAN1+= grub-mkfont.1
CONFIGURE_ARGS+= --enable-grub-mkfont
.else
diff --git a/sysutils/grub2-pcbsd/files/patch-configure.ac b/sysutils/grub2-pcbsd/files/patch-configure.ac
index 571912f437c5..277076798861 100644
--- a/sysutils/grub2-pcbsd/files/patch-configure.ac
+++ b/sysutils/grub2-pcbsd/files/patch-configure.ac
@@ -5,7 +5,7 @@
if test x"$starfield_excuse" = x; then
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
-+ for dir in . /usr/src /usr/local/lib/X11/fonts/dejavu /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
++ for dir in . /usr/src /usr/local/share/fonts/dejavu /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
if test -f "$dir/DejaVuSans.$ext"; then
DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
break 2
@@ -14,7 +14,7 @@
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
-+ for dir in . /usr/src /usr/local/lib/X11/fonts/local /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
++ for dir in . /usr/src /usr/local/share/fonts/local /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
if test -f "$dir/unifont.$ext"; then
md5="$(md5sum "$dir/unifont.$ext"|awk '{ print $1; }')"
# PCF and BDF from version 6.3 isn't hanled properly by libfreetype.
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index b7b4fda1caf3..f8ebf8b5fbc3 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -41,7 +41,7 @@ FUSE_DESC= Build grub-mount (require FUSE)
MKFONT_CONFIGURE_ENABLE= grub-mkfont
MKFONT_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
-MKFONT_BUILD_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
+MKFONT_BUILD_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
FUSE_CONFIGURE_ENABLE= grub-mount
FUSE_LIB_DEPENDS= libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
@@ -55,7 +55,7 @@ PLIST_SUB+= EFIEMU=""
.endif
post-patch:
- @${LN} -s ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
+ @${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
post-configure:
diff --git a/sysutils/jfbterm/Makefile b/sysutils/jfbterm/Makefile
index 3f18d870aa01..fde8f91d8618 100644
--- a/sysutils/jfbterm/Makefile
+++ b/sysutils/jfbterm/Makefile
@@ -90,7 +90,7 @@ TERMCAP_DEL_RECORD= ${DO_NADA}
.endif
.if ${PORT_OPTIONS:MUNIFONT}
-RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
+RUN_DEPENDS+= ${LOCALBASE}/share/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
.endif
post-extract: .SILENT
diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
index 272edad5aaf2..4eeed14f9299 100644
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -55,10 +55,10 @@ DBLATEX_RUN_DEPENDS= dblatex:${PORTSDIR}/textproc/dblatex \
${FONTS}
DBLATEX_USE= TEX=xetex
-FONTS= ${LOCALBASE}/lib/X11/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
- ${LOCALBASE}/lib/X11/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
- ${LOCALBASE}/lib/X11/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
- ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu
+FONTS= ${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
+ ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
+ ${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
+ ${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu
FONTS_CJK=${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa
diff --git a/ukrainian/monacofonts/Makefile b/ukrainian/monacofonts/Makefile
index ca5e1812fcab..27dd97b9942b 100644
--- a/ukrainian/monacofonts/Makefile
+++ b/ukrainian/monacofonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= monaco
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ukrainian x11-fonts
MASTER_SITES= http://www.brama.com/compute/unix/
PKGNAMEPREFIX= koi8-u-
@@ -17,15 +17,13 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-USES= zip
+USES= fonts zip
WRKSRC= ${WRKDIR}/Monaco.bdf
+FONTNAME= koi8-u-monaco
MAKEFILE= ${FILESDIR}/Makefile
MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}"
-MAKE_ENV+= STAGEDIR="${STAGEDIR}"
-
-post-install:
- ${CAT} ${PKGMESSAGE}
+MAKE_ENV+= FONTSDIR="${FONTSDIR}"
.include <bsd.port.mk>
diff --git a/ukrainian/monacofonts/files/Makefile b/ukrainian/monacofonts/files/Makefile
index 62dc78e6c636..f7278976b9cc 100644
--- a/ukrainian/monacofonts/files/Makefile
+++ b/ukrainian/monacofonts/files/Makefile
@@ -24,8 +24,6 @@ fonts.alias: fonts.dir
print $$2 " " name; gsub("koi8-u", "koi8-r", $$2); \
print $$2 " " name}' < fonts.dir > fonts.alias
-DIR= ${STAGEDIR}${LOCALBASE}/lib/X11/fonts/koi8u-monaco
-
install: all
- ${MKDIR} ${DIR}
- ${INSTALL_DATA} ${PCFS} fonts.dir fonts.alias ${DIR}
+ ${MKDIR} ${DESTDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${PCFS} fonts.alias ${DESTDIR}${FONTSDIR}
diff --git a/ukrainian/monacofonts/pkg-message b/ukrainian/monacofonts/pkg-message
index 9552676cd9be..5f74f2fff40d 100644
--- a/ukrainian/monacofonts/pkg-message
+++ b/ukrainian/monacofonts/pkg-message
@@ -1,6 +1,6 @@
For your X-server to use the fonts, you have to add
- the ${LOCALBASE}/lib/X11/fonts/koi8u-monaco (LOCALBASE is,
+ the ${LOCALBASE}/share/fonts/koi8u-monaco (LOCALBASE is,
usually, /usr/local) to the server's font-path. Use
``xset fp+'' ${LOCALBASE} to do this for the current X-session and
consult your X-server's documentation to make this
diff --git a/ukrainian/monacofonts/pkg-plist b/ukrainian/monacofonts/pkg-plist
index f4070ed308e0..f26925d9c231 100644
--- a/ukrainian/monacofonts/pkg-plist
+++ b/ukrainian/monacofonts/pkg-plist
@@ -1,7 +1,6 @@
-lib/X11/fonts/koi8u-monaco/italic09.pcf.gz
-lib/X11/fonts/koi8u-monaco/italic12.pcf.gz
-lib/X11/fonts/koi8u-monaco/roman09.pcf.gz
-lib/X11/fonts/koi8u-monaco/roman10.pcf.gz
-lib/X11/fonts/koi8u-monaco/roman12.pcf.gz
-lib/X11/fonts/koi8u-monaco/fonts.dir
-lib/X11/fonts/koi8u-monaco/fonts.alias
+%%FONTSDIR%%/italic09.pcf.gz
+%%FONTSDIR%%/italic12.pcf.gz
+%%FONTSDIR%%/roman09.pcf.gz
+%%FONTSDIR%%/roman10.pcf.gz
+%%FONTSDIR%%/roman12.pcf.gz
+%%FONTSDIR%%/fonts.alias
diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index 492830e329ca..f7016f0baf43 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unicode-uhoai
PORTVERSION= 2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= vietnamese x11-fonts
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= obrien
@@ -12,19 +12,15 @@ DISTNAME= uhoaiw21
MAINTAINER= obrien@FreeBSD.org
COMMENT= Unicode TrueType Font with UHoai Vietnamese encoding
-USES= zip:infozip
+USES= fonts zip:infozip
NO_WRKSUBDIR= yes
NO_BUILD= taken care of in do-install target
-BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir \
- bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-
+FONTNAME= TrueType
EXTRACT_BEFORE_ARGS= -qoL
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/TrueType
- ${INSTALL_DATA} ${WRKSRC}/uhoaiw21.ttf \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/TrueType
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/uhoaiw21.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/vietnamese/unicode-uhoai/pkg-deinstall b/vietnamese/unicode-uhoai/pkg-deinstall
deleted file mode 100644
index a4eff4621184..000000000000
--- a/vietnamese/unicode-uhoai/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "POST-DEINSTALL" ]; then
- exit 0
-fi
-
-cd ${PKG_PREFIX}/lib/X11/fonts/TrueType
-${PKG_PREFIX}/bin/ttmkfdir -o fonts.scale
-if [ `cat fonts.scale` = "0" ]; then
- rm -f fonts.scale
- rm -f fonts.dir
-fi
diff --git a/vietnamese/unicode-uhoai/pkg-install b/vietnamese/unicode-uhoai/pkg-install
deleted file mode 100644
index 3795ab95170e..000000000000
--- a/vietnamese/unicode-uhoai/pkg-install
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "POST-INSTALL" ]; then
- exit 0
-fi
-
-cd ${PKG_PREFIX}/lib/X11/fonts/TrueType
-${PKG_PREFIX}/bin/mkfontdir >/dev/null 2>&1
-${PKG_PREFIX}/bin/ttmkfdir -o fonts.scale
-chmod a+r fonts.scale
diff --git a/vietnamese/unicode-uhoai/pkg-plist b/vietnamese/unicode-uhoai/pkg-plist
index aa920ddbc9bd..430fcfdf6c70 100644
--- a/vietnamese/unicode-uhoai/pkg-plist
+++ b/vietnamese/unicode-uhoai/pkg-plist
@@ -1 +1 @@
-lib/X11/fonts/TrueType/uhoaiw21.ttf
+%%FONTSDIR%%/uhoaiw21.ttf
diff --git a/www/awffull/Makefile b/www/awffull/Makefile
index c2be7dafa1fc..569d0fa1d938 100644
--- a/www/awffull/Makefile
+++ b/www/awffull/Makefile
@@ -3,7 +3,7 @@
PORTNAME= awffull
PORTVERSION= 3.10.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES?= www
MASTER_SITES= http://www.stedee.id.au/files/
@@ -12,7 +12,7 @@ COMMENT= AWFFull is a webserver log analysis tool forked from Webalizer
LICENSE= GPLv3
-BUILD_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
+BUILD_DEPENDS= ${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \
libpng.so:${PORTSDIR}/graphics/png \
libpcre.so:${PORTSDIR}/devel/pcre
@@ -20,8 +20,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS?= ja-awffull-[0-9]*
-FONTDEFAULT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/VeraBd.ttf
-FONTLABEL?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
+FONTDEFAULT?= ${LOCALBASE}/share/fonts/bitstream-vera/VeraBd.ttf
+FONTLABEL?= ${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf
OPTIONS_DEFINE= GEOIP DOCS EXAMPLES NLS
OPTIONS_SUB= yes
diff --git a/x11-fonts/alegreya-sans/Makefile b/x11-fonts/alegreya-sans/Makefile
index b4e6c44cfd9d..b11298e842ff 100644
--- a/x11-fonts/alegreya-sans/Makefile
+++ b/x11-fonts/alegreya-sans/Makefile
@@ -2,6 +2,7 @@
PORTNAME= alegreya-sans
PORTVERSION= 1.002
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fonts
@@ -10,6 +11,8 @@ COMMENT= Humanist sans serif font with a calligraphic feeling
LICENSE= OFL11
+USES= fonts
+
USE_GITHUB= yes
GH_ACCOUNT= juandelperal
GH_PROJECT= Alegreya-Sans
@@ -18,11 +21,9 @@ GH_COMMIT= 2d2a4b0
NO_BUILD= yes
-FONTDIR= ${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
-
do-install:
- ${MKDIR} ${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
cd ${WRKSRC}/otf && \
- ${INSTALL_DATA} *.otf ${FONTDIR}
+ ${INSTALL_DATA} *.otf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/alegreya-sans/pkg-plist b/x11-fonts/alegreya-sans/pkg-plist
index 05df804053b6..be5d04ef4df1 100644
--- a/x11-fonts/alegreya-sans/pkg-plist
+++ b/x11-fonts/alegreya-sans/pkg-plist
@@ -1,28 +1,28 @@
-lib/X11/fonts/alegreya-sans/AlegreyaSans-Black.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-BlackItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-Bold.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-BoldItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-ExtraBold.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-ExtraBoldItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-Italic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-Light.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-LightItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-Medium.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-MediumItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-Regular.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-Thin.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSans-ThinItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Black.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-BlackItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Bold.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-BoldItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-ExtraBold.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-ExtraBoldItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Italic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Light.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-LightItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Medium.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-MediumItalic.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Regular.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Thin.otf
-lib/X11/fonts/alegreya-sans/AlegreyaSansSC-ThinItalic.otf
+%%FONTSDIR%%/AlegreyaSans-Black.otf
+%%FONTSDIR%%/AlegreyaSans-BlackItalic.otf
+%%FONTSDIR%%/AlegreyaSans-Bold.otf
+%%FONTSDIR%%/AlegreyaSans-BoldItalic.otf
+%%FONTSDIR%%/AlegreyaSans-ExtraBold.otf
+%%FONTSDIR%%/AlegreyaSans-ExtraBoldItalic.otf
+%%FONTSDIR%%/AlegreyaSans-Italic.otf
+%%FONTSDIR%%/AlegreyaSans-Light.otf
+%%FONTSDIR%%/AlegreyaSans-LightItalic.otf
+%%FONTSDIR%%/AlegreyaSans-Medium.otf
+%%FONTSDIR%%/AlegreyaSans-MediumItalic.otf
+%%FONTSDIR%%/AlegreyaSans-Regular.otf
+%%FONTSDIR%%/AlegreyaSans-Thin.otf
+%%FONTSDIR%%/AlegreyaSans-ThinItalic.otf
+%%FONTSDIR%%/AlegreyaSansSC-Black.otf
+%%FONTSDIR%%/AlegreyaSansSC-BlackItalic.otf
+%%FONTSDIR%%/AlegreyaSansSC-Bold.otf
+%%FONTSDIR%%/AlegreyaSansSC-BoldItalic.otf
+%%FONTSDIR%%/AlegreyaSansSC-ExtraBold.otf
+%%FONTSDIR%%/AlegreyaSansSC-ExtraBoldItalic.otf
+%%FONTSDIR%%/AlegreyaSansSC-Italic.otf
+%%FONTSDIR%%/AlegreyaSansSC-Light.otf
+%%FONTSDIR%%/AlegreyaSansSC-LightItalic.otf
+%%FONTSDIR%%/AlegreyaSansSC-Medium.otf
+%%FONTSDIR%%/AlegreyaSansSC-MediumItalic.otf
+%%FONTSDIR%%/AlegreyaSansSC-Regular.otf
+%%FONTSDIR%%/AlegreyaSansSC-Thin.otf
+%%FONTSDIR%%/AlegreyaSansSC-ThinItalic.otf
diff --git a/x11-fonts/anonymous-pro/Makefile b/x11-fonts/anonymous-pro/Makefile
index 2f7718c1d683..5f6c4727857f 100644
--- a/x11-fonts/anonymous-pro/Makefile
+++ b/x11-fonts/anonymous-pro/Makefile
@@ -3,7 +3,7 @@
PORTNAME= anonymous-pro
PORTVERSION= 1.002
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.marksimonson.com/assets/content/fonts/
DISTNAME= AnonymousPro-${PORTVERSION}
@@ -16,9 +16,6 @@ LICENSE= OFL11
USES= fonts zip
NO_BUILD= yes
-PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
-FONTSDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-SUB_LIST= FONTSDIR=${FONTSDIR}
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/${DISTNAME}.001
diff --git a/x11-fonts/artwiz-aleczapka-de/Makefile b/x11-fonts/artwiz-aleczapka-de/Makefile
index dcb4d472558d..d05834dbf7ab 100644
--- a/x11-fonts/artwiz-aleczapka-de/Makefile
+++ b/x11-fonts/artwiz-aleczapka-de/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-aleczapka-de
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
@@ -11,22 +11,16 @@ MAINTAINER= herbert.skuhra@gmx.at
COMMENT= Set of (improved) artwiz fonts
NO_BUILD= yes
-USES= tar:bzip2
-PKGMESSAGE= ${WRKDIR}/pkg-message
+USES= fonts tar:bzip2
+SUB_FILES= pkg-message
FONTS= anorexia.de aqui.de cure.de drift.de edges.de fkp.de gelly.de \
glisp-bold.de glisp.de kates.de lime.de mints-mild.de \
mints-strong.de nu.de smoothansi.de snap.de
-FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
-FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias \
- ${WRKSRC}/fonts.dir
+FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias
do-install:
- ${MKDIR} ${STAGEDIR}${FONTDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${STAGEDIR}${FONTDIR}
-
-post-install:
- @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \
- ${PKGDIR}/pkg-message >${PKGMESSAGE}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/artwiz-aleczapka-de/pkg-message b/x11-fonts/artwiz-aleczapka-de/files/pkg-message.in
index 11bfafeb896f..68a0e7225b1f 100644
--- a/x11-fonts/artwiz-aleczapka-de/pkg-message
+++ b/x11-fonts/artwiz-aleczapka-de/files/pkg-message.in
@@ -6,11 +6,6 @@
Add the following line to the "Files" section and restart XFree86.
- FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-de"
-
- Additionally you have to do:
-
- # cd ${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-de
- # fc-cache -v .
+ FontPath "%%FONTSDIR%%"
------------------------------------------------------------------
diff --git a/x11-fonts/artwiz-aleczapka-de/pkg-plist b/x11-fonts/artwiz-aleczapka-de/pkg-plist
index dab48490a753..2267792f00bc 100644
--- a/x11-fonts/artwiz-aleczapka-de/pkg-plist
+++ b/x11-fonts/artwiz-aleczapka-de/pkg-plist
@@ -1,20 +1,17 @@
-lib/X11/fonts/artwiz-aleczapka-de/anorexia.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/aqui.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/cure.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/drift.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/edges.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/fkp.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/gelly.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/glisp-bold.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/glisp.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/kates.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/lime.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/mints-mild.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/mints-strong.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/nu.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/smoothansi.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/snap.de.pcf
-lib/X11/fonts/artwiz-aleczapka-de/fonts.alias
-@unexec rm -f %D/lib/X11/fonts/artwiz-aleczapka-de/fonts.cache-1
-lib/X11/fonts/artwiz-aleczapka-de/fonts.dir
-@dirrm lib/X11/fonts/artwiz-aleczapka-de
+%%FONTSDIR%%/anorexia.de.pcf
+%%FONTSDIR%%/aqui.de.pcf
+%%FONTSDIR%%/cure.de.pcf
+%%FONTSDIR%%/drift.de.pcf
+%%FONTSDIR%%/edges.de.pcf
+%%FONTSDIR%%/fkp.de.pcf
+%%FONTSDIR%%/gelly.de.pcf
+%%FONTSDIR%%/glisp-bold.de.pcf
+%%FONTSDIR%%/glisp.de.pcf
+%%FONTSDIR%%/kates.de.pcf
+%%FONTSDIR%%/lime.de.pcf
+%%FONTSDIR%%/mints-mild.de.pcf
+%%FONTSDIR%%/mints-strong.de.pcf
+%%FONTSDIR%%/nu.de.pcf
+%%FONTSDIR%%/smoothansi.de.pcf
+%%FONTSDIR%%/snap.de.pcf
+%%FONTSDIR%%/fonts.alias
diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile
index 4d78fd88a9af..53bd4f6bcf02 100644
--- a/x11-fonts/artwiz-aleczapka-se/Makefile
+++ b/x11-fonts/artwiz-aleczapka-se/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-aleczapka-se
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
@@ -11,21 +11,16 @@ MAINTAINER= herbert.skuhra@gmx.at
COMMENT= Set of (improved) artwiz fonts
NO_BUILD= yes
-USES= tar:bzip2
-PKGMESSAGE= ${WRKDIR}/pkg-message
+USES= fonts tar:bzip2
+SUB_FILES= pkg-message
FONTS= anorexia.se aqui.se cure.se drift.se edges.se fkp.se gelly.se \
glisp-bold.se glisp.se kates.se lime.se mints-mild.se \
mints-strong.se nu.se smoothansi.se snap.se
-FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
-FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias ${WRKSRC}/fonts.dir
+FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias
do-install:
- ${MKDIR} ${STAGEDIR}${FONTDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${STAGEDIR}${FONTDIR}
-
-post-install:
- @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \
- ${PKGDIR}/pkg-message >${PKGMESSAGE}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/artwiz-aleczapka-se/pkg-message b/x11-fonts/artwiz-aleczapka-se/files/pkg-message.in
index c4cd0b845dfb..68a0e7225b1f 100644
--- a/x11-fonts/artwiz-aleczapka-se/pkg-message
+++ b/x11-fonts/artwiz-aleczapka-se/files/pkg-message.in
@@ -6,11 +6,6 @@
Add the following line to the "Files" section and restart XFree86.
- FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se"
-
- Additionally you have to do:
-
- # cd ${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se
- # fc-cache -v .
+ FontPath "%%FONTSDIR%%"
------------------------------------------------------------------
diff --git a/x11-fonts/artwiz-aleczapka-se/pkg-plist b/x11-fonts/artwiz-aleczapka-se/pkg-plist
index 0c2101c9ada6..91fff9a0f447 100644
--- a/x11-fonts/artwiz-aleczapka-se/pkg-plist
+++ b/x11-fonts/artwiz-aleczapka-se/pkg-plist
@@ -1,20 +1,17 @@
-lib/X11/fonts/artwiz-aleczapka-se/anorexia.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/aqui.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/cure.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/drift.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/edges.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/fkp.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/gelly.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/glisp-bold.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/glisp.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/kates.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/lime.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/mints-mild.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/mints-strong.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/nu.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/smoothansi.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/snap.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/fonts.alias
-@unexec rm -f %D/lib/X11/fonts/artwiz-aleczapka-se/fonts.cache-1
-lib/X11/fonts/artwiz-aleczapka-se/fonts.dir
-@dirrm lib/X11/fonts/artwiz-aleczapka-se
+%%FONTSDIR%%/anorexia.se.pcf
+%%FONTSDIR%%/aqui.se.pcf
+%%FONTSDIR%%/cure.se.pcf
+%%FONTSDIR%%/drift.se.pcf
+%%FONTSDIR%%/edges.se.pcf
+%%FONTSDIR%%/fkp.se.pcf
+%%FONTSDIR%%/gelly.se.pcf
+%%FONTSDIR%%/glisp-bold.se.pcf
+%%FONTSDIR%%/glisp.se.pcf
+%%FONTSDIR%%/kates.se.pcf
+%%FONTSDIR%%/lime.se.pcf
+%%FONTSDIR%%/mints-mild.se.pcf
+%%FONTSDIR%%/mints-strong.se.pcf
+%%FONTSDIR%%/nu.se.pcf
+%%FONTSDIR%%/smoothansi.se.pcf
+%%FONTSDIR%%/snap.se.pcf
+%%FONTSDIR%%/fonts.alias
diff --git a/x11-fonts/artwiz-aleczapka/Makefile b/x11-fonts/artwiz-aleczapka/Makefile
index 709dc2031a43..7b6de0a6b9d8 100644
--- a/x11-fonts/artwiz-aleczapka/Makefile
+++ b/x11-fonts/artwiz-aleczapka/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-aleczapka-en
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
@@ -11,21 +11,17 @@ MAINTAINER= garga@FreeBSD.org
COMMENT= Set of (improved) artwiz fonts
NO_BUILD= yes
-USES= tar:bzip2
-PKGMESSAGE= ${WRKDIR}/pkg-message
+USES= fonts tar:bzip2
FONTS= anorexia aqui cure cursor drift edges fkp gelly \
glisp-bold glisp kates lime mints-mild mints-strong \
nu smoothansi snap
-FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
-FILES= ${FONTS:S,$,.pcf,} fonts.alias fonts.cache-1 fonts.dir
-
-.include <bsd.port.pre.mk>
+FILES= ${FONTS:S,$,.pcf,}
do-install:
- @${MKDIR} ${STAGEDIR}${FONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
.for f in ${FILES}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${FONTDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${FONTSDIR}
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/artwiz-aleczapka/files/pkg-message.in b/x11-fonts/artwiz-aleczapka/files/pkg-message.in
index b62b4bdffbbc..68a0e7225b1f 100644
--- a/x11-fonts/artwiz-aleczapka/files/pkg-message.in
+++ b/x11-fonts/artwiz-aleczapka/files/pkg-message.in
@@ -6,6 +6,6 @@
Add the following line to the "Files" section and restart XFree86.
- FontPath "%%LOCALBASE%%/lib/X11/fonts/artwiz-aleczapka-en"
+ FontPath "%%FONTSDIR%%"
------------------------------------------------------------------
diff --git a/x11-fonts/artwiz-aleczapka/pkg-plist b/x11-fonts/artwiz-aleczapka/pkg-plist
index b68ab587eae8..2f7274aedd68 100644
--- a/x11-fonts/artwiz-aleczapka/pkg-plist
+++ b/x11-fonts/artwiz-aleczapka/pkg-plist
@@ -1,20 +1,17 @@
-lib/X11/fonts/artwiz-aleczapka-en/anorexia.pcf
-lib/X11/fonts/artwiz-aleczapka-en/aqui.pcf
-lib/X11/fonts/artwiz-aleczapka-en/cure.pcf
-lib/X11/fonts/artwiz-aleczapka-en/cursor.pcf
-lib/X11/fonts/artwiz-aleczapka-en/drift.pcf
-lib/X11/fonts/artwiz-aleczapka-en/edges.pcf
-lib/X11/fonts/artwiz-aleczapka-en/fkp.pcf
-lib/X11/fonts/artwiz-aleczapka-en/gelly.pcf
-lib/X11/fonts/artwiz-aleczapka-en/glisp-bold.pcf
-lib/X11/fonts/artwiz-aleczapka-en/glisp.pcf
-lib/X11/fonts/artwiz-aleczapka-en/kates.pcf
-lib/X11/fonts/artwiz-aleczapka-en/lime.pcf
-lib/X11/fonts/artwiz-aleczapka-en/mints-mild.pcf
-lib/X11/fonts/artwiz-aleczapka-en/mints-strong.pcf
-lib/X11/fonts/artwiz-aleczapka-en/nu.pcf
-lib/X11/fonts/artwiz-aleczapka-en/smoothansi.pcf
-lib/X11/fonts/artwiz-aleczapka-en/snap.pcf
-lib/X11/fonts/artwiz-aleczapka-en/fonts.alias
-lib/X11/fonts/artwiz-aleczapka-en/fonts.cache-1
-lib/X11/fonts/artwiz-aleczapka-en/fonts.dir
+%%FONTSDIR%%/anorexia.pcf
+%%FONTSDIR%%/aqui.pcf
+%%FONTSDIR%%/cure.pcf
+%%FONTSDIR%%/cursor.pcf
+%%FONTSDIR%%/drift.pcf
+%%FONTSDIR%%/edges.pcf
+%%FONTSDIR%%/fkp.pcf
+%%FONTSDIR%%/gelly.pcf
+%%FONTSDIR%%/glisp-bold.pcf
+%%FONTSDIR%%/glisp.pcf
+%%FONTSDIR%%/kates.pcf
+%%FONTSDIR%%/lime.pcf
+%%FONTSDIR%%/mints-mild.pcf
+%%FONTSDIR%%/mints-strong.pcf
+%%FONTSDIR%%/nu.pcf
+%%FONTSDIR%%/smoothansi.pcf
+%%FONTSDIR%%/snap.pcf
diff --git a/x11-fonts/artwiz-fonts/Makefile b/x11-fonts/artwiz-fonts/Makefile
index 2ad19fbe9738..a449d4d841eb 100644
--- a/x11-fonts/artwiz-fonts/Makefile
+++ b/x11-fonts/artwiz-fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-fonts
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://kobyla.info/soft/distfiles/ \
LOCAL/garga/artwiz/
@@ -13,21 +13,17 @@ MAINTAINER= garga@FreeBSD.org
COMMENT= Set of free fonts for X11 desktops
NO_BUILD= yes
-USES= tar:bzip2
+USES= fonts tar:bzip2
PKGMESSAGE= ${WRKDIR}/pkg-message
WRKSRC= ${WRKDIR}/fluxbox-${PORTNAME}
FONTS= anorexia aqui cure cursor drift edges gelly glisp-bold \
glisp lime mints-mild mints-strong nu snap
-FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
SUB_FILES= pkg-message
do-install:
- @${MKDIR} ${STAGEDIR}${FONTDIR}
-.for f in ${FONTS}
- ${INSTALL_DATA} ${WRKSRC}/${f}.pcf.gz ${STAGEDIR}${FONTDIR}
-.endfor
- ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${STAGEDIR}${FONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/artwiz-fonts/files/pkg-message.in b/x11-fonts/artwiz-fonts/files/pkg-message.in
index d897c0299605..68a0e7225b1f 100644
--- a/x11-fonts/artwiz-fonts/files/pkg-message.in
+++ b/x11-fonts/artwiz-fonts/files/pkg-message.in
@@ -6,6 +6,6 @@
Add the following line to the "Files" section and restart XFree86.
- FontPath "%%LOCALBASE%%/lib/X11/fonts/artwiz-fonts"
+ FontPath "%%FONTSDIR%%"
------------------------------------------------------------------
diff --git a/x11-fonts/artwiz-fonts/pkg-plist b/x11-fonts/artwiz-fonts/pkg-plist
index 6748d4eb1e7f..38e0932a0196 100644
--- a/x11-fonts/artwiz-fonts/pkg-plist
+++ b/x11-fonts/artwiz-fonts/pkg-plist
@@ -1,15 +1,14 @@
-lib/X11/fonts/artwiz-fonts/anorexia.pcf.gz
-lib/X11/fonts/artwiz-fonts/aqui.pcf.gz
-lib/X11/fonts/artwiz-fonts/cure.pcf.gz
-lib/X11/fonts/artwiz-fonts/cursor.pcf.gz
-lib/X11/fonts/artwiz-fonts/drift.pcf.gz
-lib/X11/fonts/artwiz-fonts/edges.pcf.gz
-lib/X11/fonts/artwiz-fonts/gelly.pcf.gz
-lib/X11/fonts/artwiz-fonts/glisp-bold.pcf.gz
-lib/X11/fonts/artwiz-fonts/glisp.pcf.gz
-lib/X11/fonts/artwiz-fonts/lime.pcf.gz
-lib/X11/fonts/artwiz-fonts/mints-mild.pcf.gz
-lib/X11/fonts/artwiz-fonts/mints-strong.pcf.gz
-lib/X11/fonts/artwiz-fonts/nu.pcf.gz
-lib/X11/fonts/artwiz-fonts/snap.pcf.gz
-lib/X11/fonts/artwiz-fonts/fonts.dir
+%%FONTSDIR%%/anorexia.pcf.gz
+%%FONTSDIR%%/aqui.pcf.gz
+%%FONTSDIR%%/cure.pcf.gz
+%%FONTSDIR%%/cursor.pcf.gz
+%%FONTSDIR%%/drift.pcf.gz
+%%FONTSDIR%%/edges.pcf.gz
+%%FONTSDIR%%/gelly.pcf.gz
+%%FONTSDIR%%/glisp-bold.pcf.gz
+%%FONTSDIR%%/glisp.pcf.gz
+%%FONTSDIR%%/lime.pcf.gz
+%%FONTSDIR%%/mints-mild.pcf.gz
+%%FONTSDIR%%/mints-strong.pcf.gz
+%%FONTSDIR%%/nu.pcf.gz
+%%FONTSDIR%%/snap.pcf.gz
diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index 64819bf97892..f7d1bdc3a187 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bitstream-vera
PORTVERSION= 1.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-fonts
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/ttf-${PORTNAME}/1.10
@@ -16,8 +16,6 @@ COMMENT= Bitstream Vera TrueType font collection
USES= fonts tar:bzip2
NO_BUILD= yes
-FONTNAME= ${PORTNAME}
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
SUB_FILES= pkg-message
OPTIONS_DEFINE= DOCS
diff --git a/x11-fonts/bitter/Makefile b/x11-fonts/bitter/Makefile
index b2e0fb608c8e..007f2d57c6d8 100644
--- a/x11-fonts/bitter/Makefile
+++ b/x11-fonts/bitter/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bitter
PORTVERSION= 20130930
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.huertatipografica.com/free_download/eo0pZGbJPxy2YyRkWQXx?dummy=
@@ -12,15 +13,13 @@ LICENSE= OFL11
FETCH_BEFORE_ARGS= -o ${DISTFILES}
-USES= zip
+USES= fonts zip
NO_BUILD= yes
NO_WRKSUBDIR= yes
-FONTDIR= ${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
-
do-install:
- ${MKDIR} ${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
cd ${WRKSRC} && \
- ${INSTALL_DATA} *.otf ${FONTDIR}
+ ${INSTALL_DATA} *.otf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/bitter/pkg-plist b/x11-fonts/bitter/pkg-plist
index ebf6a3f749a0..4ce053ee3c3c 100644
--- a/x11-fonts/bitter/pkg-plist
+++ b/x11-fonts/bitter/pkg-plist
@@ -1,4 +1,4 @@
-lib/X11/fonts/bitter/Bitter-Bold.otf
-lib/X11/fonts/bitter/Bitter-BoldItalic.otf
-lib/X11/fonts/bitter/Bitter-Italic.otf
-lib/X11/fonts/bitter/Bitter-Regular.otf
+%%FONTSDIR%%/Bitter-Bold.otf
+%%FONTSDIR%%/Bitter-BoldItalic.otf
+%%FONTSDIR%%/Bitter-Italic.otf
+%%FONTSDIR%%/Bitter-Regular.otf
diff --git a/x11-fonts/c64bdf/Makefile b/x11-fonts/c64bdf/Makefile
index 6c4f73fa8352..90364425c27d 100644
--- a/x11-fonts/c64bdf/Makefile
+++ b/x11-fonts/c64bdf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= c64bdf
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://beej.us/c64bdf/
DISTNAME= ${PORTNAME}
@@ -15,12 +15,11 @@ COMMENT= Commodore 64 X11 fonts
NO_BUILD= yes
FONTS= c64 c64d
-FONTDIR= lib/X11/fonts/${PORTNAME}
-FILES= ${FONTS:S,$,.bdf,} fonts.dir
-PLIST_FILES= ${FILES:S,^,${FONTDIR}/,}
+FILES= ${FONTS:S,$,.bdf,}
+PLIST_FILES= ${FILES:S,^,${FONTSDIR}/,}
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${STAGEDIR}${PREFIX}/${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/clearsans/Makefile b/x11-fonts/clearsans/Makefile
index 17aa05b7bc31..ff10dd53c95e 100644
--- a/x11-fonts/clearsans/Makefile
+++ b/x11-fonts/clearsans/Makefile
@@ -2,6 +2,7 @@
PORTNAME= clearsans
PORTVERSION= 1.00
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://01.org/sites/default/files/downloads/
@@ -10,15 +11,13 @@ COMMENT= Versatile OpenType font for screen, print, and Web
LICENSE= APACHE20
-USES= zip
+USES= fonts zip
NO_BUILD= yes
NO_WRKSUBDIR= yes
-FONTDIR= ${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
-
do-install:
- ${MKDIR} ${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
cd ${WRKSRC}/TTF && \
- ${INSTALL_DATA} *.ttf ${FONTDIR}
+ ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/clearsans/pkg-plist b/x11-fonts/clearsans/pkg-plist
index 794c90fe1429..6ed6fd3358b0 100644
--- a/x11-fonts/clearsans/pkg-plist
+++ b/x11-fonts/clearsans/pkg-plist
@@ -1,8 +1,8 @@
-lib/X11/fonts/clearsans/ClearSans-Bold.ttf
-lib/X11/fonts/clearsans/ClearSans-BoldItalic.ttf
-lib/X11/fonts/clearsans/ClearSans-Italic.ttf
-lib/X11/fonts/clearsans/ClearSans-Light.ttf
-lib/X11/fonts/clearsans/ClearSans-Medium.ttf
-lib/X11/fonts/clearsans/ClearSans-MediumItalic.ttf
-lib/X11/fonts/clearsans/ClearSans-Regular.ttf
-lib/X11/fonts/clearsans/ClearSans-Thin.ttf
+%%FONTSDIR%%/ClearSans-Bold.ttf
+%%FONTSDIR%%/ClearSans-BoldItalic.ttf
+%%FONTSDIR%%/ClearSans-Italic.ttf
+%%FONTSDIR%%/ClearSans-Light.ttf
+%%FONTSDIR%%/ClearSans-Medium.ttf
+%%FONTSDIR%%/ClearSans-MediumItalic.ttf
+%%FONTSDIR%%/ClearSans-Regular.ttf
+%%FONTSDIR%%/ClearSans-Thin.ttf
diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 5f7a9fccd720..1fe5a8359572 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -3,7 +3,7 @@
PORTNAME= code2000
PORTVERSION= 1.171
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= thierry/${DIST_SUBDIR}
@@ -17,17 +17,11 @@ USES= fonts zip
SUB_FILES= pkg-message
-FONTNAME= ${PORTNAME}
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
NO_BUILD= yes
-post-extract: move-fonts rename-license
-
-move-fonts:
+post-extract:
${MKDIR} ${WRKSRC}
${MV} ${WRKDIR}/CODE2000.TTF ${WRKSRC}/${FONTNAME}.ttf
-
-rename-license:
${MV} ${WRKDIR}/CODE2000.HTM ${WRKSRC}/${FONTNAME}.html
do-install:
diff --git a/x11-fonts/code2001/Makefile b/x11-fonts/code2001/Makefile
index bbfd4ceaa7a1..d90abe7e6364 100644
--- a/x11-fonts/code2001/Makefile
+++ b/x11-fonts/code2001/Makefile
@@ -3,7 +3,7 @@
PORTNAME= code2001
PORTVERSION= 0.919
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= CENKES/myports/${DIST_SUBDIR}
DISTFILES= CODE2001.ZIP
@@ -13,8 +13,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Free Plane 1 Unicode-based Font
USES= fonts zip
-FONTNAME= ${PORTNAME}
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
NO_BUILD= yes
PLIST_FILES= ${FONTSDIR}/${FONTNAME}.ttf
diff --git a/x11-fonts/comfortaa-ttf/Makefile b/x11-fonts/comfortaa-ttf/Makefile
index 1d352ec15189..aa464015486f 100644
--- a/x11-fonts/comfortaa-ttf/Makefile
+++ b/x11-fonts/comfortaa-ttf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= comfortaa-ttf
PORTVERSION= 2.004
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/
DISTNAME= comfortaa
@@ -12,15 +12,14 @@ COMMENT= Stylish, modern and free sans-serif true type font
LICENSE= OFL11
-USES= zip
+USES= fonts zip
-FONTDIR= lib/X11/fonts/Comfortaa
+FONTNAME= Comfortaa
NO_BUILD= yes
-PLIST_SUB= FONTDIR=${FONTDIR}
WRKSRC= ${WRKDIR}/Comfortaa
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}/
- cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf ${STAGEDIR}${PREFIX}/${FONTDIR}/
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}/
+ cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}/
.include <bsd.port.mk>
diff --git a/x11-fonts/comfortaa-ttf/pkg-plist b/x11-fonts/comfortaa-ttf/pkg-plist
index c61ecd5b3b83..80a7c4a07b96 100644
--- a/x11-fonts/comfortaa-ttf/pkg-plist
+++ b/x11-fonts/comfortaa-ttf/pkg-plist
@@ -1,3 +1,3 @@
-%%FONTDIR%%/Comfortaa-Bold.ttf
-%%FONTDIR%%/Comfortaa-Light.ttf
-%%FONTDIR%%/Comfortaa-Regular.ttf
+%%FONTSDIR%%/Comfortaa-Bold.ttf
+%%FONTSDIR%%/Comfortaa-Light.ttf
+%%FONTSDIR%%/Comfortaa-Regular.ttf
diff --git a/x11-fonts/comic-neue/Makefile b/x11-fonts/comic-neue/Makefile
index 31ee5f65020d..cfadeaddd50b 100644
--- a/x11-fonts/comic-neue/Makefile
+++ b/x11-fonts/comic-neue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= comic-neue
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://comicneue.com/
@@ -17,7 +17,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= fonts zip
NO_BUILD= yes
-FONTSDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/x11-fonts/consolamono-ttf/Makefile b/x11-fonts/consolamono-ttf/Makefile
index 5e3ff800bffc..7fcab07f290b 100644
--- a/x11-fonts/consolamono-ttf/Makefile
+++ b/x11-fonts/consolamono-ttf/Makefile
@@ -12,15 +12,14 @@ COMMENT= Monospace font created for programming, text editors and terminal-use
LICENSE= OFL11
-USES= zip
+USES= fonts zip
-FONTDIR= lib/X11/fonts/ConsolaMono
+FONTNAME= ConsolaMono
NO_BUILD= yes
-PLIST_SUB= FONTDIR=${FONTDIR}
WRKSRC= ${WRKDIR}/Consola\ Mono
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}/
- cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf ${STAGEDIR}${PREFIX}/${FONTDIR}/
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}/
+ cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}/
.include <bsd.port.mk>
diff --git a/x11-fonts/consolamono-ttf/pkg-plist b/x11-fonts/consolamono-ttf/pkg-plist
index 1333d25103d3..7ffd39442241 100644
--- a/x11-fonts/consolamono-ttf/pkg-plist
+++ b/x11-fonts/consolamono-ttf/pkg-plist
@@ -1,2 +1,2 @@
-%%FONTDIR%%/ConsolaMono.ttf
-%%FONTDIR%%/ConsolaMono-Bold.ttf
+%%FONTSDIR%%/ConsolaMono.ttf
+%%FONTSDIR%%/ConsolaMono-Bold.ttf
diff --git a/x11-fonts/croscorefonts-fonts-ttf/Makefile b/x11-fonts/croscorefonts-fonts-ttf/Makefile
index 3deb87a50320..a0e3136d033b 100644
--- a/x11-fonts/croscorefonts-fonts-ttf/Makefile
+++ b/x11-fonts/croscorefonts-fonts-ttf/Makefile
@@ -19,11 +19,9 @@ COMMENT= Fonts created from by Google for ChromeOS to replace MS TTF
USES= fonts
USE_XORG= x11
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
SUB_FILES= pkg-message
FONTNAME= ChromeOS
-FONTSDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME}
NO_BUILD= yes
do-install:
diff --git a/x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in b/x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in
index dca252c8f1d3..58071a80c57f 100644
--- a/x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in
+++ b/x11-fonts/croscorefonts-fonts-ttf/files/pkg-message.in
@@ -2,4 +2,4 @@ You can start using the fonts by following these instructions:
Add the following line to the "Files" section of your x.org configuration file:
- FontPath "%%FONTDIR%%/"
+ FontPath "%%FONTSDIR%%/"
diff --git a/x11-fonts/crosextrafonts-caladea-ttf/Makefile b/x11-fonts/crosextrafonts-caladea-ttf/Makefile
index 2f55eba71ab6..a07c63870988 100644
--- a/x11-fonts/crosextrafonts-caladea-ttf/Makefile
+++ b/x11-fonts/crosextrafonts-caladea-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crosextrafonts
PORTVERSION= 20130214
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://gsdview.appspot.com/chromeos-localmirror/distfiles/
PKGNAMESUFFIX= -caladea
@@ -11,32 +12,16 @@ COMMENT= Font created by Google for ChromeOS to replace MS Cambria
LICENSE= APACHE20
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
+USES= fonts
USE_XORG= x11
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
-
SUB_FILES= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
-SUB_LIST= FONTDIR=${FONTDIR}
+NO_BUILD= yes
FONTNAME= Caladea
-FONTDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME}
-INSTDAT= fonts.dir fonts.scale
-
-MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir
-
-do-build:
- cd ${WRKSRC} && ${MKFONTSCL_CMD}
- ${REINPLACE_CMD} -e 's|-misc-|-google-|' ${WRKSRC}/fonts.scale
- cd ${WRKSRC} && ${MKFONTDIR_CMD}
do-install:
- ${MKDIR} ${STAGEDIR}${FONTDIR}
- cd ${WRKSRC} && \
- ${INSTALL_DATA} ${INSTDAT} *.ttf ${STAGEDIR}${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/crosextrafonts-caladea-ttf/files/pkg-message.in b/x11-fonts/crosextrafonts-caladea-ttf/files/pkg-message.in
index dca252c8f1d3..58071a80c57f 100644
--- a/x11-fonts/crosextrafonts-caladea-ttf/files/pkg-message.in
+++ b/x11-fonts/crosextrafonts-caladea-ttf/files/pkg-message.in
@@ -2,4 +2,4 @@ You can start using the fonts by following these instructions:
Add the following line to the "Files" section of your x.org configuration file:
- FontPath "%%FONTDIR%%/"
+ FontPath "%%FONTSDIR%%/"
diff --git a/x11-fonts/crosextrafonts-caladea-ttf/pkg-plist b/x11-fonts/crosextrafonts-caladea-ttf/pkg-plist
index 32841ff7211d..74afd81afd97 100644
--- a/x11-fonts/crosextrafonts-caladea-ttf/pkg-plist
+++ b/x11-fonts/crosextrafonts-caladea-ttf/pkg-plist
@@ -1,7 +1,4 @@
-%%FONTDIR%%/Caladea-Bold.ttf
-%%FONTDIR%%/Caladea-BoldItalic.ttf
-%%FONTDIR%%/Caladea-Italic.ttf
-%%FONTDIR%%/Caladea-Regular.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
+%%FONTSDIR%%/Caladea-Bold.ttf
+%%FONTSDIR%%/Caladea-BoldItalic.ttf
+%%FONTSDIR%%/Caladea-Italic.ttf
+%%FONTSDIR%%/Caladea-Regular.ttf
diff --git a/x11-fonts/crosextrafonts-carlito-ttf/Makefile b/x11-fonts/crosextrafonts-carlito-ttf/Makefile
index f00af9729a02..b094988e5d5c 100644
--- a/x11-fonts/crosextrafonts-carlito-ttf/Makefile
+++ b/x11-fonts/crosextrafonts-carlito-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= crosextrafonts-carlito
PORTVERSION= 20130920
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://gsdview.appspot.com/chromeos-localmirror/distfiles/
@@ -10,32 +11,17 @@ COMMENT= Font created by Google for ChromeOS to replace MS Calibri
LICENSE= OFL11
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
+USES= fonts
USE_XORG= x11
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
-
SUB_FILES= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
-SUB_LIST= FONTDIR=${FONTDIR}
FONTNAME= Carlito
-FONTDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME}
-INSTDAT= fonts.dir fonts.scale
-
-MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir
-
-do-build:
- cd ${WRKSRC} && ${MKFONTSCL_CMD}
- ${REINPLACE_CMD} -e 's|-misc-|-google-|' ${WRKSRC}/fonts.scale
- cd ${WRKSRC} && ${MKFONTDIR_CMD}
+NO_BUILD= yes
do-install:
- ${MKDIR} ${STAGEDIR}${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
cd ${WRKSRC} && \
- ${INSTALL_DATA} ${INSTDAT} *.ttf ${STAGEDIR}${FONTDIR}
+ ${INSTALL_DATA} ${INSTDAT} *.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/crosextrafonts-carlito-ttf/pkg-plist b/x11-fonts/crosextrafonts-carlito-ttf/pkg-plist
index 7af5de9192b6..bbb2408c80e0 100644
--- a/x11-fonts/crosextrafonts-carlito-ttf/pkg-plist
+++ b/x11-fonts/crosextrafonts-carlito-ttf/pkg-plist
@@ -1,7 +1,4 @@
-%%FONTDIR%%/Carlito-Bold.ttf
-%%FONTDIR%%/Carlito-BoldItalic.ttf
-%%FONTDIR%%/Carlito-Italic.ttf
-%%FONTDIR%%/Carlito-Regular.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
+%%FONTSDIR%%/Carlito-Bold.ttf
+%%FONTSDIR%%/Carlito-BoldItalic.ttf
+%%FONTSDIR%%/Carlito-Italic.ttf
+%%FONTSDIR%%/Carlito-Regular.ttf
diff --git a/x11-fonts/cyberbit-ttfonts/Makefile b/x11-fonts/cyberbit-ttfonts/Makefile
index 8db7b12bf4af..88002de292df 100644
--- a/x11-fonts/cyberbit-ttfonts/Makefile
+++ b/x11-fonts/cyberbit-ttfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cyberbit-ttfonts
PORTVERSION= 2.0.20050220
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://ftp.netscape.com/pub/communicator/extras/fonts/windows/ \
http://aol-4.vo.llnwd.net/pub/communicator/extras/fonts/windows/ \
@@ -21,8 +21,6 @@ RESTRICTED= Redistribution not permitted; single user license only.
USES= fonts zip
-FONTSDIR= lib/X11/fonts/Cyberbit
-
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}
@@ -34,8 +32,8 @@ OPTIONS_DEFINE= DOCS
NO_BUILD= yes
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/Cyberbit.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/Cyberbit.ttf ${STAGEDIR}${FONTSDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in ${PORTDOCS}
${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/x11-fonts/cyberbit-ttfonts/files/pkg-message.in b/x11-fonts/cyberbit-ttfonts/files/pkg-message.in
index 17a60385be9a..c793d50b7fdb 100644
--- a/x11-fonts/cyberbit-ttfonts/files/pkg-message.in
+++ b/x11-fonts/cyberbit-ttfonts/files/pkg-message.in
@@ -1,10 +1,10 @@
You can start using the font(s) by following these instructions:
Eiter type the following in an X terminal:
- xset fp+ %%FONTDIR%%
+ xset fp+ %%FONTSDIR%%
xset fp rehash
Or, more permanently, add the following line to the "Files" section of your
X.Org configuration file:
- FontPath "%%FONTDIR%%/"
+ FontPath "%%FONTSDIR%%/"
and make sure you have the "freetype" module loaded, then restart X.
diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile
index 14f4866e6781..f27d02772658 100644
--- a/x11-fonts/cyr-rfx/Makefile
+++ b/x11-fonts/cyr-rfx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cyr-rfx-${CYR_RFX_ENCODING}
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts ukrainian russian
MASTER_SITES= ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/%SUBDIR%/ \
ftp://ftp.inp.nsk.su/%SUBDIR%/
@@ -14,22 +14,17 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Cyrillic X11 bitmap fonts from CYR-RFX project
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-USES= fmake
+USES= fonts fmake
USE_XORG= x11
-# See WWW for other available encodings
CYR_RFX_ENCODING?= koi8-o
WRKSRC= ${WRKDIR}/${CYR_RFX_ENCODING}
MAKEFILE= ${FILESDIR}/Makefile.bdf2pcf
-INST_DIR= "lib/X11/fonts/${PORTNAME}"
-MAKE_ENV+= INST_DIR="${STAGEDIR}${PREFIX}/${INST_DIR}" MKDIR="${MKDIR}"
-PLIST_SUB= INST_DIR="${INST_DIR}"
+MAKE_ENV+= INST_DIR="${STAGEDIR}${FONTSDIR}" MKDIR="${MKDIR}"
-SUB_LIST= CYR_RFX_ENCODING="${CYR_RFX_ENCODING}"
SUB_FILES= pkg-message
.include <bsd.port.mk>
diff --git a/x11-fonts/cyr-rfx/files/pkg-message.in b/x11-fonts/cyr-rfx/files/pkg-message.in
index 9a3f6f896933..cfe5c11b7149 100644
--- a/x11-fonts/cyr-rfx/files/pkg-message.in
+++ b/x11-fonts/cyr-rfx/files/pkg-message.in
@@ -1,10 +1,10 @@
This port provides Cyrillic replacements for most of the standard
- %%PREFIX%%/lib/X11/fonts/misc
+ %%PREFIX%%/share/fonts/misc
and
- %%PREFIX%%/lib/X11/fonts/75dpi
+ %%PREFIX%%/share/fonts/75dpi
fonts.
You may want to make sure, the
- %%PREFIX%%/lib/X11/fonts/cyr-rfx-%%CYR_RFX_ENCODING%%
+ %%FONTSDIR%%
is listed in your fontpath before those two paths.
diff --git a/x11-fonts/cyr-rfx/pkg-plist b/x11-fonts/cyr-rfx/pkg-plist
index 2c6825f37580..90a998ccff83 100644
--- a/x11-fonts/cyr-rfx/pkg-plist
+++ b/x11-fonts/cyr-rfx/pkg-plist
@@ -1,132 +1,132 @@
-%%INST_DIR%%/courB08o.pcf.gz
-%%INST_DIR%%/courB10o.pcf.gz
-%%INST_DIR%%/courB12o.pcf.gz
-%%INST_DIR%%/courB14o.pcf.gz
-%%INST_DIR%%/courB18o.pcf.gz
-%%INST_DIR%%/courB24o.pcf.gz
-%%INST_DIR%%/courBO08o.pcf.gz
-%%INST_DIR%%/courBO10o.pcf.gz
-%%INST_DIR%%/courBO12o.pcf.gz
-%%INST_DIR%%/courBO14o.pcf.gz
-%%INST_DIR%%/courBO18o.pcf.gz
-%%INST_DIR%%/courBO24o.pcf.gz
-%%INST_DIR%%/courO08o.pcf.gz
-%%INST_DIR%%/courO10o.pcf.gz
-%%INST_DIR%%/courO12o.pcf.gz
-%%INST_DIR%%/courO14o.pcf.gz
-%%INST_DIR%%/courO18o.pcf.gz
-%%INST_DIR%%/courO24o.pcf.gz
-%%INST_DIR%%/courR08o.pcf.gz
-%%INST_DIR%%/courR10o.pcf.gz
-%%INST_DIR%%/courR12o.pcf.gz
-%%INST_DIR%%/courR14o.pcf.gz
-%%INST_DIR%%/courR18o.pcf.gz
-%%INST_DIR%%/courR24o.pcf.gz
-%%INST_DIR%%/helvB08o.pcf.gz
-%%INST_DIR%%/helvB10o.pcf.gz
-%%INST_DIR%%/helvB12o.pcf.gz
-%%INST_DIR%%/helvB14o.pcf.gz
-%%INST_DIR%%/helvB18o.pcf.gz
-%%INST_DIR%%/helvB24o.pcf.gz
-%%INST_DIR%%/helvBO08o.pcf.gz
-%%INST_DIR%%/helvBO10o.pcf.gz
-%%INST_DIR%%/helvBO12o.pcf.gz
-%%INST_DIR%%/helvBO14o.pcf.gz
-%%INST_DIR%%/helvBO18o.pcf.gz
-%%INST_DIR%%/helvBO24o.pcf.gz
-%%INST_DIR%%/helvO08o.pcf.gz
-%%INST_DIR%%/helvO10o.pcf.gz
-%%INST_DIR%%/helvO12o.pcf.gz
-%%INST_DIR%%/helvO14o.pcf.gz
-%%INST_DIR%%/helvO18o.pcf.gz
-%%INST_DIR%%/helvO24o.pcf.gz
-%%INST_DIR%%/helvR08o.pcf.gz
-%%INST_DIR%%/helvR10o.pcf.gz
-%%INST_DIR%%/helvR12o.pcf.gz
-%%INST_DIR%%/helvR14o.pcf.gz
-%%INST_DIR%%/helvR18o.pcf.gz
-%%INST_DIR%%/helvR24o.pcf.gz
-%%INST_DIR%%/luBIS08o.pcf.gz
-%%INST_DIR%%/luBIS10o.pcf.gz
-%%INST_DIR%%/luBIS12o.pcf.gz
-%%INST_DIR%%/luBIS14o.pcf.gz
-%%INST_DIR%%/luBIS18o.pcf.gz
-%%INST_DIR%%/luBIS19o.pcf.gz
-%%INST_DIR%%/luBIS24o.pcf.gz
-%%INST_DIR%%/luBS08o.pcf.gz
-%%INST_DIR%%/luBS10o.pcf.gz
-%%INST_DIR%%/luBS12o.pcf.gz
-%%INST_DIR%%/luBS14o.pcf.gz
-%%INST_DIR%%/luBS18o.pcf.gz
-%%INST_DIR%%/luBS19o.pcf.gz
-%%INST_DIR%%/luBS24o.pcf.gz
-%%INST_DIR%%/luIS08o.pcf.gz
-%%INST_DIR%%/luIS10o.pcf.gz
-%%INST_DIR%%/luIS12o.pcf.gz
-%%INST_DIR%%/luIS14o.pcf.gz
-%%INST_DIR%%/luIS18o.pcf.gz
-%%INST_DIR%%/luIS19o.pcf.gz
-%%INST_DIR%%/luIS24o.pcf.gz
-%%INST_DIR%%/luRS08o.pcf.gz
-%%INST_DIR%%/luRS10o.pcf.gz
-%%INST_DIR%%/luRS12o.pcf.gz
-%%INST_DIR%%/luRS14o.pcf.gz
-%%INST_DIR%%/luRS18o.pcf.gz
-%%INST_DIR%%/luRS19o.pcf.gz
-%%INST_DIR%%/luRS24o.pcf.gz
-%%INST_DIR%%/lutBS08o.pcf.gz
-%%INST_DIR%%/lutBS10o.pcf.gz
-%%INST_DIR%%/lutBS12o.pcf.gz
-%%INST_DIR%%/lutBS14o.pcf.gz
-%%INST_DIR%%/lutBS18o.pcf.gz
-%%INST_DIR%%/lutBS19o.pcf.gz
-%%INST_DIR%%/lutBS24o.pcf.gz
-%%INST_DIR%%/lutRS08o.pcf.gz
-%%INST_DIR%%/lutRS10o.pcf.gz
-%%INST_DIR%%/lutRS12o.pcf.gz
-%%INST_DIR%%/lutRS14o.pcf.gz
-%%INST_DIR%%/lutRS18o.pcf.gz
-%%INST_DIR%%/lutRS19o.pcf.gz
-%%INST_DIR%%/lutRS24o.pcf.gz
-%%INST_DIR%%/timB08o.pcf.gz
-%%INST_DIR%%/timB10o.pcf.gz
-%%INST_DIR%%/timB12o.pcf.gz
-%%INST_DIR%%/timB14o.pcf.gz
-%%INST_DIR%%/timB18o.pcf.gz
-%%INST_DIR%%/timB24o.pcf.gz
-%%INST_DIR%%/timBI08o.pcf.gz
-%%INST_DIR%%/timBI10o.pcf.gz
-%%INST_DIR%%/timBI12o.pcf.gz
-%%INST_DIR%%/timBI14o.pcf.gz
-%%INST_DIR%%/timBI18o.pcf.gz
-%%INST_DIR%%/timBI24o.pcf.gz
-%%INST_DIR%%/timI08o.pcf.gz
-%%INST_DIR%%/timI10o.pcf.gz
-%%INST_DIR%%/timI12o.pcf.gz
-%%INST_DIR%%/timI14o.pcf.gz
-%%INST_DIR%%/timI18o.pcf.gz
-%%INST_DIR%%/timI24o.pcf.gz
-%%INST_DIR%%/timR08o.pcf.gz
-%%INST_DIR%%/timR10o.pcf.gz
-%%INST_DIR%%/timR12o.pcf.gz
-%%INST_DIR%%/timR14o.pcf.gz
-%%INST_DIR%%/timR18o.pcf.gz
-%%INST_DIR%%/timR24o.pcf.gz
-%%INST_DIR%%/10x20o.pcf.gz
-%%INST_DIR%%/12x24o.pcf.gz
-%%INST_DIR%%/5x7o.pcf.gz
-%%INST_DIR%%/6x10o.pcf.gz
-%%INST_DIR%%/6x13Bo.pcf.gz
-%%INST_DIR%%/6x13o.pcf.gz
-%%INST_DIR%%/7x13Bo.pcf.gz
-%%INST_DIR%%/7x13o.pcf.gz
-%%INST_DIR%%/7x14Bo.pcf.gz
-%%INST_DIR%%/7x14o.pcf.gz
-%%INST_DIR%%/8x13Bo.pcf.gz
-%%INST_DIR%%/8x13o.pcf.gz
-%%INST_DIR%%/8x16o.pcf.gz
-%%INST_DIR%%/9x15Bo.pcf.gz
-%%INST_DIR%%/9x15o.pcf.gz
-%%INST_DIR%%/fonts.alias
-%%INST_DIR%%/fonts.dir
-%%INST_DIR%%/nil2o.pcf.gz
+%%FONTSDIR%%/courB08o.pcf.gz
+%%FONTSDIR%%/courB10o.pcf.gz
+%%FONTSDIR%%/courB12o.pcf.gz
+%%FONTSDIR%%/courB14o.pcf.gz
+%%FONTSDIR%%/courB18o.pcf.gz
+%%FONTSDIR%%/courB24o.pcf.gz
+%%FONTSDIR%%/courBO08o.pcf.gz
+%%FONTSDIR%%/courBO10o.pcf.gz
+%%FONTSDIR%%/courBO12o.pcf.gz
+%%FONTSDIR%%/courBO14o.pcf.gz
+%%FONTSDIR%%/courBO18o.pcf.gz
+%%FONTSDIR%%/courBO24o.pcf.gz
+%%FONTSDIR%%/courO08o.pcf.gz
+%%FONTSDIR%%/courO10o.pcf.gz
+%%FONTSDIR%%/courO12o.pcf.gz
+%%FONTSDIR%%/courO14o.pcf.gz
+%%FONTSDIR%%/courO18o.pcf.gz
+%%FONTSDIR%%/courO24o.pcf.gz
+%%FONTSDIR%%/courR08o.pcf.gz
+%%FONTSDIR%%/courR10o.pcf.gz
+%%FONTSDIR%%/courR12o.pcf.gz
+%%FONTSDIR%%/courR14o.pcf.gz
+%%FONTSDIR%%/courR18o.pcf.gz
+%%FONTSDIR%%/courR24o.pcf.gz
+%%FONTSDIR%%/helvB08o.pcf.gz
+%%FONTSDIR%%/helvB10o.pcf.gz
+%%FONTSDIR%%/helvB12o.pcf.gz
+%%FONTSDIR%%/helvB14o.pcf.gz
+%%FONTSDIR%%/helvB18o.pcf.gz
+%%FONTSDIR%%/helvB24o.pcf.gz
+%%FONTSDIR%%/helvBO08o.pcf.gz
+%%FONTSDIR%%/helvBO10o.pcf.gz
+%%FONTSDIR%%/helvBO12o.pcf.gz
+%%FONTSDIR%%/helvBO14o.pcf.gz
+%%FONTSDIR%%/helvBO18o.pcf.gz
+%%FONTSDIR%%/helvBO24o.pcf.gz
+%%FONTSDIR%%/helvO08o.pcf.gz
+%%FONTSDIR%%/helvO10o.pcf.gz
+%%FONTSDIR%%/helvO12o.pcf.gz
+%%FONTSDIR%%/helvO14o.pcf.gz
+%%FONTSDIR%%/helvO18o.pcf.gz
+%%FONTSDIR%%/helvO24o.pcf.gz
+%%FONTSDIR%%/helvR08o.pcf.gz
+%%FONTSDIR%%/helvR10o.pcf.gz
+%%FONTSDIR%%/helvR12o.pcf.gz
+%%FONTSDIR%%/helvR14o.pcf.gz
+%%FONTSDIR%%/helvR18o.pcf.gz
+%%FONTSDIR%%/helvR24o.pcf.gz
+%%FONTSDIR%%/luBIS08o.pcf.gz
+%%FONTSDIR%%/luBIS10o.pcf.gz
+%%FONTSDIR%%/luBIS12o.pcf.gz
+%%FONTSDIR%%/luBIS14o.pcf.gz
+%%FONTSDIR%%/luBIS18o.pcf.gz
+%%FONTSDIR%%/luBIS19o.pcf.gz
+%%FONTSDIR%%/luBIS24o.pcf.gz
+%%FONTSDIR%%/luBS08o.pcf.gz
+%%FONTSDIR%%/luBS10o.pcf.gz
+%%FONTSDIR%%/luBS12o.pcf.gz
+%%FONTSDIR%%/luBS14o.pcf.gz
+%%FONTSDIR%%/luBS18o.pcf.gz
+%%FONTSDIR%%/luBS19o.pcf.gz
+%%FONTSDIR%%/luBS24o.pcf.gz
+%%FONTSDIR%%/luIS08o.pcf.gz
+%%FONTSDIR%%/luIS10o.pcf.gz
+%%FONTSDIR%%/luIS12o.pcf.gz
+%%FONTSDIR%%/luIS14o.pcf.gz
+%%FONTSDIR%%/luIS18o.pcf.gz
+%%FONTSDIR%%/luIS19o.pcf.gz
+%%FONTSDIR%%/luIS24o.pcf.gz
+%%FONTSDIR%%/luRS08o.pcf.gz
+%%FONTSDIR%%/luRS10o.pcf.gz
+%%FONTSDIR%%/luRS12o.pcf.gz
+%%FONTSDIR%%/luRS14o.pcf.gz
+%%FONTSDIR%%/luRS18o.pcf.gz
+%%FONTSDIR%%/luRS19o.pcf.gz
+%%FONTSDIR%%/luRS24o.pcf.gz
+%%FONTSDIR%%/lutBS08o.pcf.gz
+%%FONTSDIR%%/lutBS10o.pcf.gz
+%%FONTSDIR%%/lutBS12o.pcf.gz
+%%FONTSDIR%%/lutBS14o.pcf.gz
+%%FONTSDIR%%/lutBS18o.pcf.gz
+%%FONTSDIR%%/lutBS19o.pcf.gz
+%%FONTSDIR%%/lutBS24o.pcf.gz
+%%FONTSDIR%%/lutRS08o.pcf.gz
+%%FONTSDIR%%/lutRS10o.pcf.gz
+%%FONTSDIR%%/lutRS12o.pcf.gz
+%%FONTSDIR%%/lutRS14o.pcf.gz
+%%FONTSDIR%%/lutRS18o.pcf.gz
+%%FONTSDIR%%/lutRS19o.pcf.gz
+%%FONTSDIR%%/lutRS24o.pcf.gz
+%%FONTSDIR%%/timB08o.pcf.gz
+%%FONTSDIR%%/timB10o.pcf.gz
+%%FONTSDIR%%/timB12o.pcf.gz
+%%FONTSDIR%%/timB14o.pcf.gz
+%%FONTSDIR%%/timB18o.pcf.gz
+%%FONTSDIR%%/timB24o.pcf.gz
+%%FONTSDIR%%/timBI08o.pcf.gz
+%%FONTSDIR%%/timBI10o.pcf.gz
+%%FONTSDIR%%/timBI12o.pcf.gz
+%%FONTSDIR%%/timBI14o.pcf.gz
+%%FONTSDIR%%/timBI18o.pcf.gz
+%%FONTSDIR%%/timBI24o.pcf.gz
+%%FONTSDIR%%/timI08o.pcf.gz
+%%FONTSDIR%%/timI10o.pcf.gz
+%%FONTSDIR%%/timI12o.pcf.gz
+%%FONTSDIR%%/timI14o.pcf.gz
+%%FONTSDIR%%/timI18o.pcf.gz
+%%FONTSDIR%%/timI24o.pcf.gz
+%%FONTSDIR%%/timR08o.pcf.gz
+%%FONTSDIR%%/timR10o.pcf.gz
+%%FONTSDIR%%/timR12o.pcf.gz
+%%FONTSDIR%%/timR14o.pcf.gz
+%%FONTSDIR%%/timR18o.pcf.gz
+%%FONTSDIR%%/timR24o.pcf.gz
+%%FONTSDIR%%/10x20o.pcf.gz
+%%FONTSDIR%%/12x24o.pcf.gz
+%%FONTSDIR%%/5x7o.pcf.gz
+%%FONTSDIR%%/6x10o.pcf.gz
+%%FONTSDIR%%/6x13Bo.pcf.gz
+%%FONTSDIR%%/6x13o.pcf.gz
+%%FONTSDIR%%/7x13Bo.pcf.gz
+%%FONTSDIR%%/7x13o.pcf.gz
+%%FONTSDIR%%/7x14Bo.pcf.gz
+%%FONTSDIR%%/7x14o.pcf.gz
+%%FONTSDIR%%/8x13Bo.pcf.gz
+%%FONTSDIR%%/8x13o.pcf.gz
+%%FONTSDIR%%/8x16o.pcf.gz
+%%FONTSDIR%%/9x15Bo.pcf.gz
+%%FONTSDIR%%/9x15o.pcf.gz
+%%FONTSDIR%%/fonts.alias
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/nil2o.pcf.gz
diff --git a/x11-fonts/dejavu/files/pkg-message.in b/x11-fonts/dejavu/files/pkg-message.in
index 51d37a3d15af..f2c54fcf0dc6 100644
--- a/x11-fonts/dejavu/files/pkg-message.in
+++ b/x11-fonts/dejavu/files/pkg-message.in
@@ -5,7 +5,7 @@ line to the "Modules" section of your X Windows configuration file:
Add the following line to the "Files" section of X Windows configuration file:
- FontPath "%%PREFIX%%/%%FONTSDIR%%/"
+ FontPath "%%FONTSDIR%%/"
Note: your X Windows configuration file is typically /etc/X11/XF86Config
if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org.
diff --git a/x11-fonts/dina/Makefile b/x11-fonts/dina/Makefile
index 9c4e24997b06..17fa9763af84 100644
--- a/x11-fonts/dina/Makefile
+++ b/x11-fonts/dina/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dina
PORTVERSION= 2.92
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= LOCAL/rakuco
@@ -10,11 +11,9 @@ COMMENT= Monospace bitmap font, primarily aimed at programmers
LICENSE= MIT
+USES= fonts
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-FONTDIR= lib/X11/fonts/${PORTNAME}
-PLIST_SUB= FONTDIR=${FONTDIR}
-
BDFLIST= Dina_i400-10.bdf Dina_i400-8.bdf Dina_i400-9.bdf \
Dina_i700-10.bdf Dina_i700-8.bdf Dina_i700-9.bdf \
Dina_r400-10.bdf Dina_r400-6.bdf Dina_r400-8.bdf \
@@ -28,7 +27,7 @@ do-build:
${GZIP_CMD} ${WRKSRC}/BDF/*.pcf
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/BDF/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/BDF/*.pcf.gz ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/dina/pkg-plist b/x11-fonts/dina/pkg-plist
index e1115492212c..72348ab777d9 100644
--- a/x11-fonts/dina/pkg-plist
+++ b/x11-fonts/dina/pkg-plist
@@ -1,13 +1,13 @@
-%%FONTDIR%%/Dina_i400-10.pcf.gz
-%%FONTDIR%%/Dina_i400-8.pcf.gz
-%%FONTDIR%%/Dina_i400-9.pcf.gz
-%%FONTDIR%%/Dina_i700-10.pcf.gz
-%%FONTDIR%%/Dina_i700-8.pcf.gz
-%%FONTDIR%%/Dina_i700-9.pcf.gz
-%%FONTDIR%%/Dina_r400-10.pcf.gz
-%%FONTDIR%%/Dina_r400-6.pcf.gz
-%%FONTDIR%%/Dina_r400-8.pcf.gz
-%%FONTDIR%%/Dina_r400-9.pcf.gz
-%%FONTDIR%%/Dina_r700-10.pcf.gz
-%%FONTDIR%%/Dina_r700-8.pcf.gz
-%%FONTDIR%%/Dina_r700-9.pcf.gz
+%%FONTSDIR%%/Dina_i400-10.pcf.gz
+%%FONTSDIR%%/Dina_i400-8.pcf.gz
+%%FONTSDIR%%/Dina_i400-9.pcf.gz
+%%FONTSDIR%%/Dina_i700-10.pcf.gz
+%%FONTSDIR%%/Dina_i700-8.pcf.gz
+%%FONTSDIR%%/Dina_i700-9.pcf.gz
+%%FONTSDIR%%/Dina_r400-10.pcf.gz
+%%FONTSDIR%%/Dina_r400-6.pcf.gz
+%%FONTSDIR%%/Dina_r400-8.pcf.gz
+%%FONTSDIR%%/Dina_r400-9.pcf.gz
+%%FONTSDIR%%/Dina_r700-10.pcf.gz
+%%FONTSDIR%%/Dina_r700-8.pcf.gz
+%%FONTSDIR%%/Dina_r700-9.pcf.gz
diff --git a/x11-fonts/ecofont/Makefile b/x11-fonts/ecofont/Makefile
index c5b9aba80312..c6e3a665bae6 100644
--- a/x11-fonts/ecofont/Makefile
+++ b/x11-fonts/ecofont/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ecofont
PORTVERSION= 2.05
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.ecofont.com/assets/files/
DISTNAME= ecofont_vera_sans_regular
@@ -10,22 +11,17 @@ DISTNAME= ecofont_vera_sans_regular
MAINTAINER= ports@FreeBSD.org
COMMENT= Environmentally friendly, ink saving typeface
-BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-
-USES= zip
+USES= fonts zip
NO_BUILD= yes
-PLIST_FILES= ${ECOFONTDIR}/${ECOFONT}
+PLIST_FILES= ${FONTSDIR}/${ECOFONT}
-SUB_LIST= ECOFONTDIR="${PREFIX}/${ECOFONTDIR}"
SUB_FILES= pkg-message
ECOFONT= ${DISTNAME}.ttf
-ECOFONTDIR= lib/X11/fonts/${PORTNAME}
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${ECOFONTDIR}
- ${INSTALL_DATA} ${WRKDIR}/${ECOFONT} ${STAGEDIR}${PREFIX}/${ECOFONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${ECOFONT} ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/ecofont/files/pkg-message.in b/x11-fonts/ecofont/files/pkg-message.in
index 5cdd135c8507..71c7dead6d37 100644
--- a/x11-fonts/ecofont/files/pkg-message.in
+++ b/x11-fonts/ecofont/files/pkg-message.in
@@ -5,4 +5,4 @@ the following line is in the "Modules" section of xorg.conf:
Then append the following to xorg.conf's "Files" section:
- FontPath "%%ECOFONTDIR%%/"
+ FontPath "%%FONTSDIR%%"
diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile
index 08d61facd99c..1d28a03b89c0 100644
--- a/x11-fonts/encodings/Makefile
+++ b/x11-fonts/encodings/Makefile
@@ -2,7 +2,7 @@
PORTNAME= encodings
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
MASTER_SITES= XORG/individual/font
CATEGORIES= x11-fonts
@@ -14,6 +14,6 @@ USES= tar:bzip2
USE_XORG= fontutil
BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/lib/X11/fonts
+CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/share/fonts
.include <bsd.port.mk>
diff --git a/x11-fonts/encodings/pkg-plist b/x11-fonts/encodings/pkg-plist
index fe13e907d9b0..d27ec12aaf09 100644
--- a/x11-fonts/encodings/pkg-plist
+++ b/x11-fonts/encodings/pkg-plist
@@ -1,51 +1,51 @@
-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
+share/fonts/encodings/adobe-dingbats.enc.gz
+share/fonts/encodings/adobe-standard.enc.gz
+share/fonts/encodings/adobe-symbol.enc.gz
+share/fonts/encodings/armscii-8.enc.gz
+share/fonts/encodings/ascii-0.enc.gz
+share/fonts/encodings/dec-special.enc.gz
+share/fonts/encodings/encodings.dir
+share/fonts/encodings/ibm-cp437.enc.gz
+share/fonts/encodings/ibm-cp850.enc.gz
+share/fonts/encodings/ibm-cp852.enc.gz
+share/fonts/encodings/ibm-cp866.enc.gz
+share/fonts/encodings/iso8859-11.enc.gz
+share/fonts/encodings/iso8859-13.enc.gz
+share/fonts/encodings/iso8859-16.enc.gz
+share/fonts/encodings/iso8859-6.16.enc.gz
+share/fonts/encodings/iso8859-6.8x.enc.gz
+share/fonts/encodings/large/big5.eten-0.enc.gz
+share/fonts/encodings/large/big5hkscs-0.enc.gz
+share/fonts/encodings/large/cns11643-1.enc.gz
+share/fonts/encodings/large/cns11643-2.enc.gz
+share/fonts/encodings/large/cns11643-3.enc.gz
+share/fonts/encodings/large/encodings.dir
+share/fonts/encodings/large/gb18030-0.enc.gz
+share/fonts/encodings/large/gb18030.2000-0.enc.gz
+share/fonts/encodings/large/gb18030.2000-1.enc.gz
+share/fonts/encodings/large/gb2312.1980-0.enc.gz
+share/fonts/encodings/large/gbk-0.enc.gz
+share/fonts/encodings/large/jisx0201.1976-0.enc.gz
+share/fonts/encodings/large/jisx0208.1990-0.enc.gz
+share/fonts/encodings/large/jisx0212.1990-0.enc.gz
+share/fonts/encodings/large/ksc5601.1987-0.enc.gz
+share/fonts/encodings/large/ksc5601.1992-3.enc.gz
+share/fonts/encodings/large/sun.unicode.india-0.enc.gz
+share/fonts/encodings/microsoft-cp1250.enc.gz
+share/fonts/encodings/microsoft-cp1251.enc.gz
+share/fonts/encodings/microsoft-cp1252.enc.gz
+share/fonts/encodings/microsoft-cp1253.enc.gz
+share/fonts/encodings/microsoft-cp1254.enc.gz
+share/fonts/encodings/microsoft-cp1255.enc.gz
+share/fonts/encodings/microsoft-cp1256.enc.gz
+share/fonts/encodings/microsoft-cp1257.enc.gz
+share/fonts/encodings/microsoft-cp1258.enc.gz
+share/fonts/encodings/microsoft-win3.1.enc.gz
+share/fonts/encodings/mulearabic-0.enc.gz
+share/fonts/encodings/mulearabic-1.enc.gz
+share/fonts/encodings/mulearabic-2.enc.gz
+share/fonts/encodings/mulelao-1.enc.gz
+share/fonts/encodings/suneu-greek.enc.gz
+share/fonts/encodings/tcvn-0.enc.gz
+share/fonts/encodings/tis620-2.enc.gz
+share/fonts/encodings/viscii1.1-1.enc.gz
diff --git a/x11-fonts/fantasque-sans-mono/Makefile b/x11-fonts/fantasque-sans-mono/Makefile
index 9127a580e943..fdd97f4cee45 100644
--- a/x11-fonts/fantasque-sans-mono/Makefile
+++ b/x11-fonts/fantasque-sans-mono/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fantasque-sans-mono
PORTVERSION= 1.6.5
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://openfontlibrary.org/assets/downloads/${PORTNAME}/db52617ba875d08cbd8e080ca3d9f756/
DISTNAME= fantasque-sans-mono
@@ -13,17 +14,14 @@ LICENSE= OFL11
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USES= zip
-
-FONTDIR= ${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
+USES= fonts zip
OPTIONS_DEFINE= DOCS
do-install:
- ${MKDIR} ${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
cd ${WRKSRC}/OTF && \
- ${INSTALL_DATA} *.otf ${FONTDIR}
-
+ ${INSTALL_DATA} *.otf ${STAGEDIR}${FONTSDIR}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && \
${INSTALL_DATA} README.md ${STAGEDIR}${DOCSDIR}
diff --git a/x11-fonts/fantasque-sans-mono/pkg-plist b/x11-fonts/fantasque-sans-mono/pkg-plist
index acf2b5d48c5e..5bae630ad43a 100644
--- a/x11-fonts/fantasque-sans-mono/pkg-plist
+++ b/x11-fonts/fantasque-sans-mono/pkg-plist
@@ -1,5 +1,5 @@
-lib/X11/fonts/fantasque-sans-mono/FantasqueSansMono-Bold.otf
-lib/X11/fonts/fantasque-sans-mono/FantasqueSansMono-BoldItalic.otf
-lib/X11/fonts/fantasque-sans-mono/FantasqueSansMono-RegItalic.otf
-lib/X11/fonts/fantasque-sans-mono/FantasqueSansMono-Regular.otf
+%%FONTSDIR%%/FantasqueSansMono-Bold.otf
+%%FONTSDIR%%/FantasqueSansMono-BoldItalic.otf
+%%FONTSDIR%%/FantasqueSansMono-RegItalic.otf
+%%FONTSDIR%%/FantasqueSansMono-Regular.otf
%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/x11-fonts/farsifonts/Makefile b/x11-fonts/farsifonts/Makefile
index 4b56459c9a2d..9ba050c60b77 100644
--- a/x11-fonts/farsifonts/Makefile
+++ b/x11-fonts/farsifonts/Makefile
@@ -3,25 +3,19 @@
PORTNAME= farsifonts
PORTVERSION= 0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= SF/farsi-fonts/
MAINTAINER= javad.kouhi@gmail.com
COMMENT= Standard set of Unicode Persian fonts
-BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
+USES= fonts zip
-USES= zip
-PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-
-do-build:
- @ttmkfdir -c -d ${WRKSRC} -o ${WRKSRC}/fonts.dir
+NO_BUILD= yes
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/farsifonts
- @${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${PREFIX}/lib/X11/fonts/farsifonts
- @${INSTALL_DATA} ${WRKSRC}/fonts.dir ${STAGEDIR}${PREFIX}/lib/X11/fonts/farsifonts
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/farsifonts/pkg-plist b/x11-fonts/farsifonts/pkg-plist
index fe6665221d25..51d4ffb719f2 100644
--- a/x11-fonts/farsifonts/pkg-plist
+++ b/x11-fonts/farsifonts/pkg-plist
@@ -1,5 +1,4 @@
%%FONTSDIR%%/elham.ttf
-%%FONTSDIR%%/fonts.dir
%%FONTSDIR%%/homa.ttf
%%FONTSDIR%%/koodak.ttf
%%FONTSDIR%%/nazli.ttf
diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile
index acac64d40c77..00b086cda91b 100644
--- a/x11-fonts/font-adobe-100dpi/Makefile
+++ b/x11-fonts/font-adobe-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-100dpi/pkg-plist b/x11-fonts/font-adobe-100dpi/pkg-plist
index 66313fd27e5e..42f78a53c888 100644
--- a/x11-fonts/font-adobe-100dpi/pkg-plist
+++ b/x11-fonts/font-adobe-100dpi/pkg-plist
@@ -1,966 +1,966 @@
-lib/X11/fonts/100dpi/courB08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courB08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courB08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courB08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courB08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courB08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courB08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courB08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courB08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courB08.pcf.gz
-lib/X11/fonts/100dpi/courB10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courB10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courB10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courB10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courB10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courB10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courB10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courB10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courB10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courB10.pcf.gz
-lib/X11/fonts/100dpi/courB12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courB12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courB12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courB12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courB12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courB12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courB12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courB12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courB12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courB12.pcf.gz
-lib/X11/fonts/100dpi/courB14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courB14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courB14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courB14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courB14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courB14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courB14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courB14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courB14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courB14.pcf.gz
-lib/X11/fonts/100dpi/courB18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courB18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courB18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courB18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courB18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courB18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courB18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courB18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courB18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courB18.pcf.gz
-lib/X11/fonts/100dpi/courB24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courB24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courB24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courB24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courB24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courB24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courB24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courB24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courB24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courB24.pcf.gz
-lib/X11/fonts/100dpi/courBO08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courBO08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courBO08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courBO08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courBO08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courBO08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courBO08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courBO08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courBO08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courBO08.pcf.gz
-lib/X11/fonts/100dpi/courBO10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courBO10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courBO10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courBO10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courBO10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courBO10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courBO10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courBO10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courBO10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courBO10.pcf.gz
-lib/X11/fonts/100dpi/courBO12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courBO12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courBO12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courBO12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courBO12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courBO12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courBO12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courBO12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courBO12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courBO12.pcf.gz
-lib/X11/fonts/100dpi/courBO14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courBO14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courBO14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courBO14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courBO14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courBO14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courBO14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courBO14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courBO14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courBO14.pcf.gz
-lib/X11/fonts/100dpi/courBO18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courBO18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courBO18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courBO18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courBO18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courBO18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courBO18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courBO18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courBO18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courBO18.pcf.gz
-lib/X11/fonts/100dpi/courBO24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courBO24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courBO24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courBO24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courBO24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courBO24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courBO24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courBO24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courBO24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courBO24.pcf.gz
-lib/X11/fonts/100dpi/courO08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courO08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courO08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courO08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courO08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courO08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courO08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courO08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courO08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courO08.pcf.gz
-lib/X11/fonts/100dpi/courO10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courO10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courO10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courO10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courO10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courO10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courO10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courO10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courO10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courO10.pcf.gz
-lib/X11/fonts/100dpi/courO12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courO12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courO12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courO12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courO12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courO12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courO12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courO12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courO12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courO12.pcf.gz
-lib/X11/fonts/100dpi/courO14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courO14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courO14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courO14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courO14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courO14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courO14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courO14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courO14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courO14.pcf.gz
-lib/X11/fonts/100dpi/courO18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courO18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courO18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courO18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courO18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courO18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courO18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courO18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courO18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courO18.pcf.gz
-lib/X11/fonts/100dpi/courO24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courO24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courO24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courO24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courO24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courO24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courO24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courO24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courO24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courO24.pcf.gz
-lib/X11/fonts/100dpi/courR08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courR08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courR08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courR08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courR08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courR08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courR08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courR08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courR08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courR08.pcf.gz
-lib/X11/fonts/100dpi/courR10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courR10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courR10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courR10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courR10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courR10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courR10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courR10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courR10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courR10.pcf.gz
-lib/X11/fonts/100dpi/courR12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courR12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courR12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courR12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courR12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courR12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courR12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courR12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courR12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courR12.pcf.gz
-lib/X11/fonts/100dpi/courR14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courR14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courR14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courR14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courR14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courR14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courR14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courR14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courR14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courR14.pcf.gz
-lib/X11/fonts/100dpi/courR18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courR18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courR18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courR18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courR18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courR18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courR18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courR18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courR18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courR18.pcf.gz
-lib/X11/fonts/100dpi/courR24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/courR24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/courR24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/courR24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/courR24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/courR24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/courR24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/courR24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/courR24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/courR24.pcf.gz
-lib/X11/fonts/100dpi/helvB08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvB08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvB08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvB08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvB08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvB08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvB08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvB08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvB08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvB08.pcf.gz
-lib/X11/fonts/100dpi/helvB10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvB10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvB10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvB10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvB10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvB10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvB10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvB10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvB10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvB10.pcf.gz
-lib/X11/fonts/100dpi/helvB12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvB12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvB12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvB12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvB12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvB12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvB12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvB12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvB12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvB12.pcf.gz
-lib/X11/fonts/100dpi/helvB14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvB14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvB14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvB14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvB14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvB14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvB14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvB14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvB14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvB14.pcf.gz
-lib/X11/fonts/100dpi/helvB18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvB18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvB18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvB18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvB18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvB18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvB18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvB18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvB18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvB18.pcf.gz
-lib/X11/fonts/100dpi/helvB24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvB24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvB24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvB24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvB24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvB24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvB24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvB24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvB24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvB24.pcf.gz
-lib/X11/fonts/100dpi/helvBO08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvBO08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvBO08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvBO08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvBO08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvBO08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvBO08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvBO08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvBO08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvBO08.pcf.gz
-lib/X11/fonts/100dpi/helvBO10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvBO10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvBO10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvBO10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvBO10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvBO10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvBO10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvBO10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvBO10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvBO10.pcf.gz
-lib/X11/fonts/100dpi/helvBO12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvBO12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvBO12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvBO12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvBO12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvBO12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvBO12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvBO12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvBO12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvBO12.pcf.gz
-lib/X11/fonts/100dpi/helvBO14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvBO14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvBO14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvBO14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvBO14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvBO14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvBO14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvBO14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvBO14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvBO14.pcf.gz
-lib/X11/fonts/100dpi/helvBO18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvBO18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvBO18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvBO18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvBO18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvBO18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvBO18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvBO18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvBO18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvBO18.pcf.gz
-lib/X11/fonts/100dpi/helvBO24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvBO24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvBO24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvBO24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvBO24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvBO24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvBO24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvBO24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvBO24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvBO24.pcf.gz
-lib/X11/fonts/100dpi/helvO08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvO08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvO08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvO08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvO08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvO08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvO08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvO08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvO08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvO08.pcf.gz
-lib/X11/fonts/100dpi/helvO10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvO10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvO10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvO10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvO10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvO10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvO10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvO10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvO10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvO10.pcf.gz
-lib/X11/fonts/100dpi/helvO12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvO12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvO12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvO12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvO12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvO12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvO12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvO12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvO12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvO12.pcf.gz
-lib/X11/fonts/100dpi/helvO14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvO14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvO14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvO14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvO14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvO14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvO14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvO14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvO14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvO14.pcf.gz
-lib/X11/fonts/100dpi/helvO18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvO18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvO18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvO18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvO18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvO18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvO18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvO18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvO18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvO18.pcf.gz
-lib/X11/fonts/100dpi/helvO24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvO24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvO24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvO24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvO24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvO24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvO24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvO24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvO24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvO24.pcf.gz
-lib/X11/fonts/100dpi/helvR08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvR08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvR08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvR08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvR08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvR08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvR08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvR08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvR08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvR08.pcf.gz
-lib/X11/fonts/100dpi/helvR10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvR10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvR10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvR10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvR10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvR10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvR10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvR10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvR10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvR10.pcf.gz
-lib/X11/fonts/100dpi/helvR12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvR12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvR12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvR12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvR12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvR12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvR12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvR12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvR12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvR12.pcf.gz
-lib/X11/fonts/100dpi/helvR14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvR14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvR14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvR14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvR14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvR14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvR14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvR14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvR14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvR14.pcf.gz
-lib/X11/fonts/100dpi/helvR18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvR18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvR18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvR18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvR18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvR18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvR18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvR18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvR18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvR18.pcf.gz
-lib/X11/fonts/100dpi/helvR24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/helvR24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/helvR24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/helvR24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/helvR24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/helvR24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/helvR24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/helvR24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/helvR24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/helvR24.pcf.gz
-lib/X11/fonts/100dpi/ncenB08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenB08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenB08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenB08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenB08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenB08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenB08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenB08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenB08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenB08.pcf.gz
-lib/X11/fonts/100dpi/ncenB10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenB10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenB10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenB10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenB10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenB10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenB10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenB10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenB10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenB10.pcf.gz
-lib/X11/fonts/100dpi/ncenB12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenB12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenB12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenB12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenB12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenB12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenB12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenB12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenB12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenB12.pcf.gz
-lib/X11/fonts/100dpi/ncenB14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenB14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenB14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenB14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenB14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenB14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenB14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenB14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenB14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenB14.pcf.gz
-lib/X11/fonts/100dpi/ncenB18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenB18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenB18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenB18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenB18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenB18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenB18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenB18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenB18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenB18.pcf.gz
-lib/X11/fonts/100dpi/ncenB24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenB24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenB24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenB24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenB24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenB24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenB24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenB24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenB24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenB24.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenBI08.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenBI10.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenBI12.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenBI14.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenBI18.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenBI24.pcf.gz
-lib/X11/fonts/100dpi/ncenI08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenI08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenI08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenI08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenI08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenI08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenI08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenI08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenI08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenI08.pcf.gz
-lib/X11/fonts/100dpi/ncenI10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenI10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenI10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenI10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenI10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenI10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenI10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenI10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenI10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenI10.pcf.gz
-lib/X11/fonts/100dpi/ncenI12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenI12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenI12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenI12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenI12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenI12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenI12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenI12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenI12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenI12.pcf.gz
-lib/X11/fonts/100dpi/ncenI14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenI14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenI14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenI14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenI14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenI14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenI14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenI14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenI14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenI14.pcf.gz
-lib/X11/fonts/100dpi/ncenI18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenI18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenI18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenI18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenI18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenI18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenI18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenI18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenI18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenI18.pcf.gz
-lib/X11/fonts/100dpi/ncenI24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenI24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenI24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenI24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenI24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenI24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenI24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenI24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenI24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenI24.pcf.gz
-lib/X11/fonts/100dpi/ncenR08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenR08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenR08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenR08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenR08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenR08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenR08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenR08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenR08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenR08.pcf.gz
-lib/X11/fonts/100dpi/ncenR10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenR10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenR10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenR10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenR10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenR10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenR10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenR10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenR10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenR10.pcf.gz
-lib/X11/fonts/100dpi/ncenR12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenR12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenR12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenR12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenR12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenR12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenR12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenR12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenR12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenR12.pcf.gz
-lib/X11/fonts/100dpi/ncenR14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenR14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenR14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenR14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenR14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenR14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenR14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenR14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenR14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenR14.pcf.gz
-lib/X11/fonts/100dpi/ncenR18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenR18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenR18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenR18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenR18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenR18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenR18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenR18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenR18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenR18.pcf.gz
-lib/X11/fonts/100dpi/ncenR24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/ncenR24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/ncenR24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/ncenR24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/ncenR24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/ncenR24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/ncenR24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/ncenR24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/ncenR24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/ncenR24.pcf.gz
-lib/X11/fonts/100dpi/symb08.pcf.gz
-lib/X11/fonts/100dpi/symb10.pcf.gz
-lib/X11/fonts/100dpi/symb12.pcf.gz
-lib/X11/fonts/100dpi/symb14.pcf.gz
-lib/X11/fonts/100dpi/symb18.pcf.gz
-lib/X11/fonts/100dpi/symb24.pcf.gz
-lib/X11/fonts/100dpi/timB08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timB08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timB08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timB08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timB08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timB08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timB08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timB08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timB08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timB08.pcf.gz
-lib/X11/fonts/100dpi/timB10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timB10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timB10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timB10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timB10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timB10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timB10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timB10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timB10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timB10.pcf.gz
-lib/X11/fonts/100dpi/timB12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timB12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timB12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timB12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timB12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timB12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timB12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timB12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timB12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timB12.pcf.gz
-lib/X11/fonts/100dpi/timB14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timB14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timB14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timB14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timB14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timB14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timB14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timB14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timB14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timB14.pcf.gz
-lib/X11/fonts/100dpi/timB18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timB18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timB18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timB18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timB18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timB18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timB18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timB18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timB18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timB18.pcf.gz
-lib/X11/fonts/100dpi/timB24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timB24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timB24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timB24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timB24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timB24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timB24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timB24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timB24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timB24.pcf.gz
-lib/X11/fonts/100dpi/timBI08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timBI08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timBI08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timBI08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timBI08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timBI08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timBI08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timBI08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timBI08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timBI08.pcf.gz
-lib/X11/fonts/100dpi/timBI10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timBI10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timBI10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timBI10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timBI10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timBI10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timBI10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timBI10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timBI10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timBI10.pcf.gz
-lib/X11/fonts/100dpi/timBI12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timBI12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timBI12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timBI12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timBI12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timBI12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timBI12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timBI12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timBI12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timBI12.pcf.gz
-lib/X11/fonts/100dpi/timBI14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timBI14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timBI14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timBI14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timBI14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timBI14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timBI14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timBI14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timBI14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timBI14.pcf.gz
-lib/X11/fonts/100dpi/timBI18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timBI18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timBI18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timBI18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timBI18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timBI18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timBI18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timBI18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timBI18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timBI18.pcf.gz
-lib/X11/fonts/100dpi/timBI24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timBI24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timBI24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timBI24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timBI24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timBI24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timBI24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timBI24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timBI24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timBI24.pcf.gz
-lib/X11/fonts/100dpi/timI08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timI08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timI08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timI08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timI08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timI08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timI08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timI08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timI08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timI08.pcf.gz
-lib/X11/fonts/100dpi/timI10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timI10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timI10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timI10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timI10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timI10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timI10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timI10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timI10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timI10.pcf.gz
-lib/X11/fonts/100dpi/timI12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timI12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timI12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timI12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timI12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timI12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timI12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timI12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timI12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timI12.pcf.gz
-lib/X11/fonts/100dpi/timI14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timI14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timI14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timI14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timI14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timI14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timI14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timI14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timI14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timI14.pcf.gz
-lib/X11/fonts/100dpi/timI18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timI18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timI18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timI18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timI18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timI18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timI18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timI18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timI18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timI18.pcf.gz
-lib/X11/fonts/100dpi/timI24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timI24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timI24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timI24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timI24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timI24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timI24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timI24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timI24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timI24.pcf.gz
-lib/X11/fonts/100dpi/timR08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timR08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timR08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timR08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timR08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timR08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timR08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timR08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timR08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timR08.pcf.gz
-lib/X11/fonts/100dpi/timR10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timR10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timR10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timR10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timR10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timR10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timR10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timR10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timR10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timR10.pcf.gz
-lib/X11/fonts/100dpi/timR12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timR12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timR12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timR12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timR12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timR12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timR12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timR12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timR12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timR12.pcf.gz
-lib/X11/fonts/100dpi/timR14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timR14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timR14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timR14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timR14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timR14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timR14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timR14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timR14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timR14.pcf.gz
-lib/X11/fonts/100dpi/timR18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timR18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timR18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timR18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timR18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timR18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timR18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timR18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timR18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timR18.pcf.gz
-lib/X11/fonts/100dpi/timR24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/timR24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/timR24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/timR24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/timR24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/timR24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/timR24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/timR24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/timR24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/timR24.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB08.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB10.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB12.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB14.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB18.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB24.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO08.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO10.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO12.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO14.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO18.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO24.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO08.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO10.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO12.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO14.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO18.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO24.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR08.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR10.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR12.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR14.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR18.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR24.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB08.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB10.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB12.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB14.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB18.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB24.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO08.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO10.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO12.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO14.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO18.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO24.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO08.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO10.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO12.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO14.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO18.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO24.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR08.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR10.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR12.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR14.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR18.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR24.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB08.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB10.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB12.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB14.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB18.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB24.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI08.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI10.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI12.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI14.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI18.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI24.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI08.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI10.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI12.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI14.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI18.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI24.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR08.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR10.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR12.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR14.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR18.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR24.pcf.gz
+%%FONTSDIR%%/symb08.pcf.gz
+%%FONTSDIR%%/symb10.pcf.gz
+%%FONTSDIR%%/symb12.pcf.gz
+%%FONTSDIR%%/symb14.pcf.gz
+%%FONTSDIR%%/symb18.pcf.gz
+%%FONTSDIR%%/symb24.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB08.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB10.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB12.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB14.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB18.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB24.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI08.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI10.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI12.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI14.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI18.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI24.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI08.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI10.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI12.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI14.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI18.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI24.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR08.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR10.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR12.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR14.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR18.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR24.pcf.gz
diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile
index b8a266de97a5..5b1d8e9b08fb 100644
--- a/x11-fonts/font-adobe-75dpi/Makefile
+++ b/x11-fonts/font-adobe-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-75dpi/pkg-plist b/x11-fonts/font-adobe-75dpi/pkg-plist
index 9f0932d8b03e..42f78a53c888 100644
--- a/x11-fonts/font-adobe-75dpi/pkg-plist
+++ b/x11-fonts/font-adobe-75dpi/pkg-plist
@@ -1,966 +1,966 @@
-lib/X11/fonts/75dpi/courB08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courB08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courB08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courB08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courB08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courB08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courB08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courB08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courB08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courB08.pcf.gz
-lib/X11/fonts/75dpi/courB10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courB10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courB10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courB10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courB10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courB10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courB10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courB10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courB10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courB10.pcf.gz
-lib/X11/fonts/75dpi/courB12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courB12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courB12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courB12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courB12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courB12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courB12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courB12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courB12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courB12.pcf.gz
-lib/X11/fonts/75dpi/courB14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courB14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courB14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courB14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courB14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courB14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courB14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courB14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courB14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courB14.pcf.gz
-lib/X11/fonts/75dpi/courB18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courB18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courB18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courB18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courB18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courB18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courB18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courB18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courB18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courB18.pcf.gz
-lib/X11/fonts/75dpi/courB24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courB24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courB24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courB24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courB24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courB24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courB24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courB24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courB24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courB24.pcf.gz
-lib/X11/fonts/75dpi/courBO08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courBO08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courBO08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courBO08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courBO08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courBO08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courBO08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courBO08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courBO08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courBO08.pcf.gz
-lib/X11/fonts/75dpi/courBO10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courBO10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courBO10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courBO10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courBO10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courBO10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courBO10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courBO10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courBO10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courBO10.pcf.gz
-lib/X11/fonts/75dpi/courBO12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courBO12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courBO12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courBO12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courBO12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courBO12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courBO12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courBO12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courBO12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courBO12.pcf.gz
-lib/X11/fonts/75dpi/courBO14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courBO14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courBO14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courBO14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courBO14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courBO14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courBO14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courBO14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courBO14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courBO14.pcf.gz
-lib/X11/fonts/75dpi/courBO18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courBO18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courBO18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courBO18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courBO18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courBO18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courBO18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courBO18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courBO18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courBO18.pcf.gz
-lib/X11/fonts/75dpi/courBO24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courBO24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courBO24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courBO24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courBO24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courBO24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courBO24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courBO24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courBO24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courBO24.pcf.gz
-lib/X11/fonts/75dpi/courO08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courO08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courO08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courO08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courO08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courO08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courO08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courO08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courO08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courO08.pcf.gz
-lib/X11/fonts/75dpi/courO10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courO10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courO10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courO10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courO10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courO10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courO10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courO10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courO10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courO10.pcf.gz
-lib/X11/fonts/75dpi/courO12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courO12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courO12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courO12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courO12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courO12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courO12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courO12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courO12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courO12.pcf.gz
-lib/X11/fonts/75dpi/courO14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courO14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courO14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courO14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courO14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courO14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courO14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courO14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courO14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courO14.pcf.gz
-lib/X11/fonts/75dpi/courO18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courO18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courO18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courO18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courO18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courO18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courO18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courO18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courO18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courO18.pcf.gz
-lib/X11/fonts/75dpi/courO24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courO24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courO24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courO24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courO24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courO24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courO24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courO24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courO24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courO24.pcf.gz
-lib/X11/fonts/75dpi/courR08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courR08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courR08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courR08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courR08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courR08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courR08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courR08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courR08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courR08.pcf.gz
-lib/X11/fonts/75dpi/courR10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courR10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courR10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courR10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courR10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courR10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courR10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courR10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courR10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courR10.pcf.gz
-lib/X11/fonts/75dpi/courR12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courR12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courR12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courR12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courR12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courR12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courR12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courR12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courR12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courR12.pcf.gz
-lib/X11/fonts/75dpi/courR14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courR14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courR14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courR14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courR14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courR14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courR14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courR14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courR14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courR14.pcf.gz
-lib/X11/fonts/75dpi/courR18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courR18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courR18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courR18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courR18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courR18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courR18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courR18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courR18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courR18.pcf.gz
-lib/X11/fonts/75dpi/courR24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/courR24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/courR24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/courR24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/courR24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/courR24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/courR24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/courR24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/courR24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/courR24.pcf.gz
-lib/X11/fonts/75dpi/helvB08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvB08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvB08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvB08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvB08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvB08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvB08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvB08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvB08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvB08.pcf.gz
-lib/X11/fonts/75dpi/helvB10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvB10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvB10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvB10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvB10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvB10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvB10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvB10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvB10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvB10.pcf.gz
-lib/X11/fonts/75dpi/helvB12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvB12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvB12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvB12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvB12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvB12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvB12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvB12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvB12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvB12.pcf.gz
-lib/X11/fonts/75dpi/helvB14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvB14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvB14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvB14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvB14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvB14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvB14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvB14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvB14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvB14.pcf.gz
-lib/X11/fonts/75dpi/helvB18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvB18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvB18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvB18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvB18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvB18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvB18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvB18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvB18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvB18.pcf.gz
-lib/X11/fonts/75dpi/helvB24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvB24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvB24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvB24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvB24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvB24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvB24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvB24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvB24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvB24.pcf.gz
-lib/X11/fonts/75dpi/helvBO08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvBO08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvBO08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvBO08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvBO08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvBO08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvBO08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvBO08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvBO08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvBO08.pcf.gz
-lib/X11/fonts/75dpi/helvBO10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvBO10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvBO10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvBO10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvBO10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvBO10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvBO10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvBO10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvBO10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvBO10.pcf.gz
-lib/X11/fonts/75dpi/helvBO12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvBO12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvBO12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvBO12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvBO12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvBO12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvBO12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvBO12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvBO12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvBO12.pcf.gz
-lib/X11/fonts/75dpi/helvBO14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvBO14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvBO14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvBO14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvBO14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvBO14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvBO14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvBO14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvBO14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvBO14.pcf.gz
-lib/X11/fonts/75dpi/helvBO18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvBO18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvBO18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvBO18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvBO18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvBO18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvBO18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvBO18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvBO18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvBO18.pcf.gz
-lib/X11/fonts/75dpi/helvBO24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvBO24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvBO24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvBO24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvBO24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvBO24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvBO24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvBO24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvBO24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvBO24.pcf.gz
-lib/X11/fonts/75dpi/helvO08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvO08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvO08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvO08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvO08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvO08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvO08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvO08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvO08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvO08.pcf.gz
-lib/X11/fonts/75dpi/helvO10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvO10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvO10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvO10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvO10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvO10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvO10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvO10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvO10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvO10.pcf.gz
-lib/X11/fonts/75dpi/helvO12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvO12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvO12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvO12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvO12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvO12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvO12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvO12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvO12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvO12.pcf.gz
-lib/X11/fonts/75dpi/helvO14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvO14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvO14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvO14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvO14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvO14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvO14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvO14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvO14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvO14.pcf.gz
-lib/X11/fonts/75dpi/helvO18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvO18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvO18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvO18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvO18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvO18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvO18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvO18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvO18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvO18.pcf.gz
-lib/X11/fonts/75dpi/helvO24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvO24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvO24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvO24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvO24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvO24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvO24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvO24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvO24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvO24.pcf.gz
-lib/X11/fonts/75dpi/helvR08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvR08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvR08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvR08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvR08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvR08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvR08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvR08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvR08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvR08.pcf.gz
-lib/X11/fonts/75dpi/helvR10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvR10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvR10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvR10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvR10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvR10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvR10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvR10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvR10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvR10.pcf.gz
-lib/X11/fonts/75dpi/helvR12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvR12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvR12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvR12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvR12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvR12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvR12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvR12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvR12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvR12.pcf.gz
-lib/X11/fonts/75dpi/helvR14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvR14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvR14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvR14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvR14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvR14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvR14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvR14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvR14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvR14.pcf.gz
-lib/X11/fonts/75dpi/helvR18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvR18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvR18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvR18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvR18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvR18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvR18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvR18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvR18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvR18.pcf.gz
-lib/X11/fonts/75dpi/helvR24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/helvR24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/helvR24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/helvR24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/helvR24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/helvR24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/helvR24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/helvR24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/helvR24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/helvR24.pcf.gz
-lib/X11/fonts/75dpi/ncenB08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenB08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenB08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenB08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenB08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenB08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenB08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenB08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenB08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenB08.pcf.gz
-lib/X11/fonts/75dpi/ncenB10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenB10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenB10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenB10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenB10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenB10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenB10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenB10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenB10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenB10.pcf.gz
-lib/X11/fonts/75dpi/ncenB12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenB12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenB12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenB12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenB12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenB12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenB12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenB12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenB12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenB12.pcf.gz
-lib/X11/fonts/75dpi/ncenB14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenB14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenB14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenB14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenB14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenB14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenB14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenB14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenB14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenB14.pcf.gz
-lib/X11/fonts/75dpi/ncenB18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenB18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenB18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenB18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenB18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenB18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenB18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenB18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenB18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenB18.pcf.gz
-lib/X11/fonts/75dpi/ncenB24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenB24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenB24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenB24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenB24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenB24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenB24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenB24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenB24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenB24.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenBI08.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenBI10.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenBI12.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenBI14.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenBI18.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenBI24.pcf.gz
-lib/X11/fonts/75dpi/ncenI08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenI08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenI08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenI08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenI08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenI08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenI08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenI08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenI08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenI08.pcf.gz
-lib/X11/fonts/75dpi/ncenI10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenI10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenI10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenI10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenI10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenI10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenI10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenI10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenI10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenI10.pcf.gz
-lib/X11/fonts/75dpi/ncenI12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenI12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenI12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenI12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenI12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenI12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenI12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenI12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenI12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenI12.pcf.gz
-lib/X11/fonts/75dpi/ncenI14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenI14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenI14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenI14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenI14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenI14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenI14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenI14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenI14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenI14.pcf.gz
-lib/X11/fonts/75dpi/ncenI18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenI18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenI18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenI18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenI18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenI18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenI18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenI18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenI18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenI18.pcf.gz
-lib/X11/fonts/75dpi/ncenI24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenI24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenI24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenI24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenI24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenI24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenI24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenI24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenI24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenI24.pcf.gz
-lib/X11/fonts/75dpi/ncenR08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenR08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenR08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenR08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenR08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenR08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenR08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenR08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenR08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenR08.pcf.gz
-lib/X11/fonts/75dpi/ncenR10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenR10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenR10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenR10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenR10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenR10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenR10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenR10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenR10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenR10.pcf.gz
-lib/X11/fonts/75dpi/ncenR12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenR12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenR12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenR12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenR12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenR12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenR12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenR12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenR12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenR12.pcf.gz
-lib/X11/fonts/75dpi/ncenR14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenR14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenR14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenR14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenR14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenR14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenR14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenR14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenR14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenR14.pcf.gz
-lib/X11/fonts/75dpi/ncenR18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenR18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenR18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenR18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenR18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenR18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenR18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenR18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenR18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenR18.pcf.gz
-lib/X11/fonts/75dpi/ncenR24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/ncenR24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/ncenR24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/ncenR24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/ncenR24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/ncenR24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/ncenR24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/ncenR24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/ncenR24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/ncenR24.pcf.gz
-lib/X11/fonts/75dpi/symb08.pcf.gz
-lib/X11/fonts/75dpi/symb10.pcf.gz
-lib/X11/fonts/75dpi/symb12.pcf.gz
-lib/X11/fonts/75dpi/symb14.pcf.gz
-lib/X11/fonts/75dpi/symb18.pcf.gz
-lib/X11/fonts/75dpi/symb24.pcf.gz
-lib/X11/fonts/75dpi/timB08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timB08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timB08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timB08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timB08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timB08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timB08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timB08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timB08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timB08.pcf.gz
-lib/X11/fonts/75dpi/timB10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timB10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timB10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timB10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timB10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timB10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timB10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timB10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timB10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timB10.pcf.gz
-lib/X11/fonts/75dpi/timB12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timB12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timB12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timB12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timB12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timB12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timB12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timB12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timB12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timB12.pcf.gz
-lib/X11/fonts/75dpi/timB14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timB14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timB14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timB14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timB14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timB14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timB14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timB14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timB14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timB14.pcf.gz
-lib/X11/fonts/75dpi/timB18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timB18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timB18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timB18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timB18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timB18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timB18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timB18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timB18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timB18.pcf.gz
-lib/X11/fonts/75dpi/timB24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timB24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timB24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timB24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timB24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timB24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timB24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timB24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timB24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timB24.pcf.gz
-lib/X11/fonts/75dpi/timBI08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timBI08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timBI08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timBI08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timBI08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timBI08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timBI08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timBI08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timBI08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timBI08.pcf.gz
-lib/X11/fonts/75dpi/timBI10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timBI10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timBI10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timBI10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timBI10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timBI10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timBI10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timBI10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timBI10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timBI10.pcf.gz
-lib/X11/fonts/75dpi/timBI12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timBI12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timBI12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timBI12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timBI12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timBI12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timBI12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timBI12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timBI12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timBI12.pcf.gz
-lib/X11/fonts/75dpi/timBI14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timBI14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timBI14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timBI14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timBI14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timBI14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timBI14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timBI14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timBI14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timBI14.pcf.gz
-lib/X11/fonts/75dpi/timBI18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timBI18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timBI18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timBI18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timBI18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timBI18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timBI18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timBI18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timBI18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timBI18.pcf.gz
-lib/X11/fonts/75dpi/timBI24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timBI24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timBI24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timBI24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timBI24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timBI24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timBI24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timBI24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timBI24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timBI24.pcf.gz
-lib/X11/fonts/75dpi/timI08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timI08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timI08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timI08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timI08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timI08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timI08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timI08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timI08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timI08.pcf.gz
-lib/X11/fonts/75dpi/timI10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timI10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timI10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timI10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timI10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timI10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timI10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timI10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timI10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timI10.pcf.gz
-lib/X11/fonts/75dpi/timI12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timI12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timI12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timI12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timI12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timI12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timI12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timI12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timI12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timI12.pcf.gz
-lib/X11/fonts/75dpi/timI14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timI14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timI14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timI14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timI14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timI14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timI14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timI14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timI14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timI14.pcf.gz
-lib/X11/fonts/75dpi/timI18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timI18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timI18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timI18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timI18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timI18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timI18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timI18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timI18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timI18.pcf.gz
-lib/X11/fonts/75dpi/timI24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timI24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timI24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timI24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timI24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timI24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timI24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timI24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timI24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timI24.pcf.gz
-lib/X11/fonts/75dpi/timR08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timR08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timR08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timR08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timR08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timR08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timR08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timR08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timR08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timR08.pcf.gz
-lib/X11/fonts/75dpi/timR10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timR10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timR10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timR10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timR10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timR10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timR10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timR10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timR10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timR10.pcf.gz
-lib/X11/fonts/75dpi/timR12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timR12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timR12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timR12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timR12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timR12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timR12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timR12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timR12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timR12.pcf.gz
-lib/X11/fonts/75dpi/timR14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timR14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timR14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timR14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timR14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timR14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timR14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timR14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timR14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timR14.pcf.gz
-lib/X11/fonts/75dpi/timR18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timR18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timR18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timR18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timR18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timR18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timR18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timR18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timR18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timR18.pcf.gz
-lib/X11/fonts/75dpi/timR24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/timR24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/timR24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/timR24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/timR24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/timR24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/timR24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/timR24.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB08.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB10.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB12.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB14.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB18.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courB24.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO08.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO10.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO12.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO14.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO18.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courBO24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courBO24.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO08.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO10.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO12.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO14.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO18.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courO24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courO24.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR08.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR10.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR12.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR14.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR18.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/courR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/courR24.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB08.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB10.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB12.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB14.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB18.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvB24.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO08.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO10.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO12.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO14.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO18.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvBO24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvBO24.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO08.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO10.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO12.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO14.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO18.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvO24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvO24.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR08.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR10.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR12.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR14.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR18.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/helvR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/helvR24.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB08.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB10.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB12.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB14.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB18.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenB24.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI08.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI10.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI12.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI14.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI18.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenBI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenBI24.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI08.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI10.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI12.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI14.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI18.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenI24.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR08.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR10.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR12.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR14.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR18.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/ncenR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/ncenR24.pcf.gz
+%%FONTSDIR%%/symb08.pcf.gz
+%%FONTSDIR%%/symb10.pcf.gz
+%%FONTSDIR%%/symb12.pcf.gz
+%%FONTSDIR%%/symb14.pcf.gz
+%%FONTSDIR%%/symb18.pcf.gz
+%%FONTSDIR%%/symb24.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB08.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB10.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB12.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB14.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB18.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timB24.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI08.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI10.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI12.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI14.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI18.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timBI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timBI24.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI08.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI10.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI12.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI14.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI18.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timI24.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR08.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR10.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR12.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR14.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR18.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/timR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/timR24.pcf.gz
diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile
index 7393e3c0eead..cd3e992d8394 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-utopia-100dpi
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-100dpi/pkg-plist b/x11-fonts/font-adobe-utopia-100dpi/pkg-plist
index a41766529735..920e425eef68 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/pkg-plist
+++ b/x11-fonts/font-adobe-utopia-100dpi/pkg-plist
@@ -1,200 +1,200 @@
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___10.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___12.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___14.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___18.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___24.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___10.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___12.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___14.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___18.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___24.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__10.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__12.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__14.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__18.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__24.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___10.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___12.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___14.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___18.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___24.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___10.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___12.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___14.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___18.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___24.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__10.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__12.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__14.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__18.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__24.pcf.gz
diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile
index b7d9ea18ba64..bfd0639926d7 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-utopia-75dpi
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-75dpi/pkg-plist b/x11-fonts/font-adobe-utopia-75dpi/pkg-plist
index 787a8ba9084b..920e425eef68 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/pkg-plist
+++ b/x11-fonts/font-adobe-utopia-75dpi/pkg-plist
@@ -1,200 +1,200 @@
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___10.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___12.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___14.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___18.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___24.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___10.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___12.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___14.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___18.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___24.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__10.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__12.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__14.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__18.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTBI__24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTBI__24.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___10.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___12.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___14.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___18.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTB___24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTB___24.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___10.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___12.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___14.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___18.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTI___24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTI___24.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__10.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__12.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__14.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__18.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/UTRG__24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/UTRG__24.pcf.gz
diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile
index ec80dd6c5d90..f25efe2af6a6 100644
--- a/x11-fonts/font-adobe-utopia-type1/Makefile
+++ b/x11-fonts/font-adobe-utopia-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-utopia-type1
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-type1/pkg-plist b/x11-fonts/font-adobe-utopia-type1/pkg-plist
index 1f049370cd7f..cf50287f85bd 100644
--- a/x11-fonts/font-adobe-utopia-type1/pkg-plist
+++ b/x11-fonts/font-adobe-utopia-type1/pkg-plist
@@ -1,8 +1,8 @@
-lib/X11/fonts/Type1/UTBI____.afm
-lib/X11/fonts/Type1/UTBI____.pfa
-lib/X11/fonts/Type1/UTB_____.afm
-lib/X11/fonts/Type1/UTB_____.pfa
-lib/X11/fonts/Type1/UTI_____.afm
-lib/X11/fonts/Type1/UTI_____.pfa
-lib/X11/fonts/Type1/UTRG____.afm
-lib/X11/fonts/Type1/UTRG____.pfa
+%%FONTSDIR%%/UTBI____.afm
+%%FONTSDIR%%/UTBI____.pfa
+%%FONTSDIR%%/UTB_____.afm
+%%FONTSDIR%%/UTB_____.pfa
+%%FONTSDIR%%/UTI_____.afm
+%%FONTSDIR%%/UTI_____.pfa
+%%FONTSDIR%%/UTRG____.afm
+%%FONTSDIR%%/UTRG____.pfa
diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile
index 86ae2c15e102..5bd7488cb5df 100644
--- a/x11-fonts/font-alias/Makefile
+++ b/x11-fonts/font-alias/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-alias
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-alias/pkg-plist b/x11-fonts/font-alias/pkg-plist
index 77c2e5ec4897..f36995584135 100644
--- a/x11-fonts/font-alias/pkg-plist
+++ b/x11-fonts/font-alias/pkg-plist
@@ -1,4 +1,4 @@
-lib/X11/fonts/100dpi/fonts.alias
-lib/X11/fonts/75dpi/fonts.alias
-lib/X11/fonts/cyrillic/fonts.alias
-lib/X11/fonts/misc/fonts.alias
+share/fonts/100dpi/fonts.alias
+share/fonts/75dpi/fonts.alias
+share/fonts/cyrillic/fonts.alias
+share/fonts/misc/fonts.alias
diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile
index c59d32fee18b..7edfd7c032c9 100644
--- a/x11-fonts/font-arabic-misc/Makefile
+++ b/x11-fonts/font-arabic-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-arabic-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-arabic-misc/pkg-plist b/x11-fonts/font-arabic-misc/pkg-plist
index 707f58b3afba..d0b5dbc55690 100644
--- a/x11-fonts/font-arabic-misc/pkg-plist
+++ b/x11-fonts/font-arabic-misc/pkg-plist
@@ -1 +1 @@
-lib/X11/fonts/misc/arabic24.pcf.gz
+%%FONTSDIR%%/arabic24.pcf.gz
diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile
index a3541652862d..5f4405812812 100644
--- a/x11-fonts/font-bh-100dpi/Makefile
+++ b/x11-fonts/font-bh-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-100dpi/pkg-plist b/x11-fonts/font-bh-100dpi/pkg-plist
index e7eb8388e0a3..4f36be6745c4 100644
--- a/x11-fonts/font-bh-100dpi/pkg-plist
+++ b/x11-fonts/font-bh-100dpi/pkg-plist
@@ -1,560 +1,560 @@
-lib/X11/fonts/100dpi/luBIS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS08.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS10.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS12.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS14.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS18.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS19.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS24.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS08.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS10.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS12.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS14.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS18.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS19.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS24.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS08.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS10.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS12.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS14.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS18.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS19.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS24.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS08.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS10.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS12.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS14.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS18.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS19.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS24.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB08.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB10.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB12.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB14.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB18.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB19.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB24.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI08.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI10.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI12.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI14.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI18.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI19.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI24.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI08.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI10.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI12.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI14.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI18.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI19.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI24.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR08.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR10.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR12.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR14.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR18.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR19.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR24.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS08.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS10.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS12.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS14.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS18.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS19.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS24.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS08.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS10.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS12.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS14.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS18.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS19.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS24.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS08.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS10.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS12.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS14.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS18.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS19.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS24.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS08.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS10.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS12.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS14.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS18.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS19.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS24.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB08.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB10.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB12.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB14.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB18.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB19.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB24.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI08.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI10.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI12.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI14.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI18.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI19.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI24.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI08.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI10.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI12.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI14.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI18.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI19.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI24.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR08.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR10.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR12.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR14.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR18.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR19.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR24.pcf.gz
diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile
index 0254f0c8e5df..9e897c564616 100644
--- a/x11-fonts/font-bh-75dpi/Makefile
+++ b/x11-fonts/font-bh-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-75dpi/pkg-plist b/x11-fonts/font-bh-75dpi/pkg-plist
index e9996206a8aa..4f36be6745c4 100644
--- a/x11-fonts/font-bh-75dpi/pkg-plist
+++ b/x11-fonts/font-bh-75dpi/pkg-plist
@@ -1,560 +1,560 @@
-lib/X11/fonts/75dpi/luBIS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS08.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS10.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS12.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS14.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS18.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS19.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS24.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS08.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS10.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS12.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS14.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS18.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS19.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS24.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS08.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS10.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS12.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS14.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS18.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS19.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS24.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS08.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS10.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS12.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS14.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS18.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS19.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS24.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB08.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB10.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB12.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB14.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB18.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB19.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB24.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI08.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI10.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI12.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI14.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI18.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI19.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI24.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI08.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI10.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI12.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI14.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI18.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI19.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI24.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR08.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR10.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR12.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR14.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR18.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR19.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR24.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS08.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS10.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS12.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS14.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS18.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS19.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBIS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBIS24.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS08.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS10.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS12.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS14.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS18.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS19.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luBS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luBS24.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS08.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS10.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS12.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS14.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS18.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS19.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luIS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luIS24.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS08.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS10.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS12.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS14.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS18.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS19.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/luRS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/luRS24.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB08.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB10.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB12.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB14.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB18.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB19.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubB24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubB24.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI08.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI10.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI12.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI14.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI18.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI19.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubBI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubBI24.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI08.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI10.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI12.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI14.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI18.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI19.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubI24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubI24.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR08.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR10.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR12.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR14.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR18.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR19.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lubR24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lubR24.pcf.gz
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
index 95f3f03915cf..466cb67ebba0 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-lucidatypewriter-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-plist b/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-plist
index 7f1b534517e5..0fd50f02f88c 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-plist
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-plist
@@ -1,140 +1,140 @@
-lib/X11/fonts/100dpi/lutBS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS08.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS10.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS12.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS14.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS18.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS19.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS24.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS08.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS10.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS12.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS14.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS18.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS19.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS24.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS08.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS10.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS12.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS14.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS18.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS19.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS24.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS08.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS10.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS12.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS14.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS18.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS19.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS24.pcf.gz
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
index 1095b82508fb..0d43660842ba 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-lucidatypewriter-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-plist b/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-plist
index bbff888f1b13..0fd50f02f88c 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-plist
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-plist
@@ -1,140 +1,140 @@
-lib/X11/fonts/75dpi/lutBS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS08.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS10.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS12.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS14.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS18.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS19.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS24.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS08.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS10.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS12.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS14.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS18.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS19.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS24.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS08.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS10.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS12.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS14.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS18.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS19.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutBS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutBS24.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS08-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS08.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS10.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS12.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS14.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS18.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS19-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS19.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-1.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-10.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-13.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-14.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-15.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-2.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-3.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-4.pcf.gz
+%%FONTSDIR%%/lutRS24-ISO8859-9.pcf.gz
+%%FONTSDIR%%/lutRS24.pcf.gz
diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile
index 447c6afe3907..e894736409b5 100644
--- a/x11-fonts/font-bh-ttf/Makefile
+++ b/x11-fonts/font-bh-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-ttf
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-ttf/pkg-plist b/x11-fonts/font-bh-ttf/pkg-plist
index d5d7196743bf..c7ae9f2b5658 100644
--- a/x11-fonts/font-bh-ttf/pkg-plist
+++ b/x11-fonts/font-bh-ttf/pkg-plist
@@ -12,5 +12,3 @@ etc/fonts/conf.d/42-luxi-mono.conf
%%FONTSDIR%%/luxisbi.ttf
%%FONTSDIR%%/luxisr.ttf
%%FONTSDIR%%/luxisri.ttf
-@comment %%FONTSDIR%%/fonts.dir
-@comment %%FONTSDIR%%/fonts.scale
diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile
index 37433a589482..960707600ad5 100644
--- a/x11-fonts/font-bh-type1/Makefile
+++ b/x11-fonts/font-bh-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-type1
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-type1/pkg-plist b/x11-fonts/font-bh-type1/pkg-plist
index b090e187805f..6eff3ca837e3 100644
--- a/x11-fonts/font-bh-type1/pkg-plist
+++ b/x11-fonts/font-bh-type1/pkg-plist
@@ -1,24 +1,24 @@
-lib/X11/fonts/Type1/l047013t.afm
-lib/X11/fonts/Type1/l047013t.pfa
-lib/X11/fonts/Type1/l047016t.afm
-lib/X11/fonts/Type1/l047016t.pfa
-lib/X11/fonts/Type1/l047033t.afm
-lib/X11/fonts/Type1/l047033t.pfa
-lib/X11/fonts/Type1/l047036t.afm
-lib/X11/fonts/Type1/l047036t.pfa
-lib/X11/fonts/Type1/l048013t.afm
-lib/X11/fonts/Type1/l048013t.pfa
-lib/X11/fonts/Type1/l048016t.afm
-lib/X11/fonts/Type1/l048016t.pfa
-lib/X11/fonts/Type1/l048033t.afm
-lib/X11/fonts/Type1/l048033t.pfa
-lib/X11/fonts/Type1/l048036t.afm
-lib/X11/fonts/Type1/l048036t.pfa
-lib/X11/fonts/Type1/l049013t.afm
-lib/X11/fonts/Type1/l049013t.pfa
-lib/X11/fonts/Type1/l049016t.afm
-lib/X11/fonts/Type1/l049016t.pfa
-lib/X11/fonts/Type1/l049033t.afm
-lib/X11/fonts/Type1/l049033t.pfa
-lib/X11/fonts/Type1/l049036t.afm
-lib/X11/fonts/Type1/l049036t.pfa
+%%FONTSDIR%%/l047013t.afm
+%%FONTSDIR%%/l047013t.pfa
+%%FONTSDIR%%/l047016t.afm
+%%FONTSDIR%%/l047016t.pfa
+%%FONTSDIR%%/l047033t.afm
+%%FONTSDIR%%/l047033t.pfa
+%%FONTSDIR%%/l047036t.afm
+%%FONTSDIR%%/l047036t.pfa
+%%FONTSDIR%%/l048013t.afm
+%%FONTSDIR%%/l048013t.pfa
+%%FONTSDIR%%/l048016t.afm
+%%FONTSDIR%%/l048016t.pfa
+%%FONTSDIR%%/l048033t.afm
+%%FONTSDIR%%/l048033t.pfa
+%%FONTSDIR%%/l048036t.afm
+%%FONTSDIR%%/l048036t.pfa
+%%FONTSDIR%%/l049013t.afm
+%%FONTSDIR%%/l049013t.pfa
+%%FONTSDIR%%/l049016t.afm
+%%FONTSDIR%%/l049016t.pfa
+%%FONTSDIR%%/l049033t.afm
+%%FONTSDIR%%/l049033t.pfa
+%%FONTSDIR%%/l049036t.afm
+%%FONTSDIR%%/l049036t.pfa
diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile
index 9a924547ef1c..fe78f608912d 100644
--- a/x11-fonts/font-bitstream-100dpi/Makefile
+++ b/x11-fonts/font-bitstream-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bitstream-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-100dpi/pkg-plist b/x11-fonts/font-bitstream-100dpi/pkg-plist
index 6d905816031a..5b2eb8a0807b 100644
--- a/x11-fonts/font-bitstream-100dpi/pkg-plist
+++ b/x11-fonts/font-bitstream-100dpi/pkg-plist
@@ -1,28 +1,28 @@
-lib/X11/fonts/100dpi/charB08.pcf.gz
-lib/X11/fonts/100dpi/charB10.pcf.gz
-lib/X11/fonts/100dpi/charB12.pcf.gz
-lib/X11/fonts/100dpi/charB14.pcf.gz
-lib/X11/fonts/100dpi/charB18.pcf.gz
-lib/X11/fonts/100dpi/charB24.pcf.gz
-lib/X11/fonts/100dpi/charBI08.pcf.gz
-lib/X11/fonts/100dpi/charBI10.pcf.gz
-lib/X11/fonts/100dpi/charBI12.pcf.gz
-lib/X11/fonts/100dpi/charBI14.pcf.gz
-lib/X11/fonts/100dpi/charBI18.pcf.gz
-lib/X11/fonts/100dpi/charBI24.pcf.gz
-lib/X11/fonts/100dpi/charI08.pcf.gz
-lib/X11/fonts/100dpi/charI10.pcf.gz
-lib/X11/fonts/100dpi/charI12.pcf.gz
-lib/X11/fonts/100dpi/charI14.pcf.gz
-lib/X11/fonts/100dpi/charI18.pcf.gz
-lib/X11/fonts/100dpi/charI24.pcf.gz
-lib/X11/fonts/100dpi/charR08.pcf.gz
-lib/X11/fonts/100dpi/charR10.pcf.gz
-lib/X11/fonts/100dpi/charR12.pcf.gz
-lib/X11/fonts/100dpi/charR14.pcf.gz
-lib/X11/fonts/100dpi/charR18.pcf.gz
-lib/X11/fonts/100dpi/charR24.pcf.gz
-lib/X11/fonts/100dpi/tech14.pcf.gz
-lib/X11/fonts/100dpi/techB14.pcf.gz
-lib/X11/fonts/100dpi/term14.pcf.gz
-lib/X11/fonts/100dpi/termB14.pcf.gz
+%%FONTSDIR%%/charB08.pcf.gz
+%%FONTSDIR%%/charB10.pcf.gz
+%%FONTSDIR%%/charB12.pcf.gz
+%%FONTSDIR%%/charB14.pcf.gz
+%%FONTSDIR%%/charB18.pcf.gz
+%%FONTSDIR%%/charB24.pcf.gz
+%%FONTSDIR%%/charBI08.pcf.gz
+%%FONTSDIR%%/charBI10.pcf.gz
+%%FONTSDIR%%/charBI12.pcf.gz
+%%FONTSDIR%%/charBI14.pcf.gz
+%%FONTSDIR%%/charBI18.pcf.gz
+%%FONTSDIR%%/charBI24.pcf.gz
+%%FONTSDIR%%/charI08.pcf.gz
+%%FONTSDIR%%/charI10.pcf.gz
+%%FONTSDIR%%/charI12.pcf.gz
+%%FONTSDIR%%/charI14.pcf.gz
+%%FONTSDIR%%/charI18.pcf.gz
+%%FONTSDIR%%/charI24.pcf.gz
+%%FONTSDIR%%/charR08.pcf.gz
+%%FONTSDIR%%/charR10.pcf.gz
+%%FONTSDIR%%/charR12.pcf.gz
+%%FONTSDIR%%/charR14.pcf.gz
+%%FONTSDIR%%/charR18.pcf.gz
+%%FONTSDIR%%/charR24.pcf.gz
+%%FONTSDIR%%/tech14.pcf.gz
+%%FONTSDIR%%/techB14.pcf.gz
+%%FONTSDIR%%/term14.pcf.gz
+%%FONTSDIR%%/termB14.pcf.gz
diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile
index 81481b36748b..6dfe3b0675ac 100644
--- a/x11-fonts/font-bitstream-75dpi/Makefile
+++ b/x11-fonts/font-bitstream-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bitstream-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-75dpi/pkg-plist b/x11-fonts/font-bitstream-75dpi/pkg-plist
index 83931add168e..5b2eb8a0807b 100644
--- a/x11-fonts/font-bitstream-75dpi/pkg-plist
+++ b/x11-fonts/font-bitstream-75dpi/pkg-plist
@@ -1,28 +1,28 @@
-lib/X11/fonts/75dpi/charB08.pcf.gz
-lib/X11/fonts/75dpi/charB10.pcf.gz
-lib/X11/fonts/75dpi/charB12.pcf.gz
-lib/X11/fonts/75dpi/charB14.pcf.gz
-lib/X11/fonts/75dpi/charB18.pcf.gz
-lib/X11/fonts/75dpi/charB24.pcf.gz
-lib/X11/fonts/75dpi/charBI08.pcf.gz
-lib/X11/fonts/75dpi/charBI10.pcf.gz
-lib/X11/fonts/75dpi/charBI12.pcf.gz
-lib/X11/fonts/75dpi/charBI14.pcf.gz
-lib/X11/fonts/75dpi/charBI18.pcf.gz
-lib/X11/fonts/75dpi/charBI24.pcf.gz
-lib/X11/fonts/75dpi/charI08.pcf.gz
-lib/X11/fonts/75dpi/charI10.pcf.gz
-lib/X11/fonts/75dpi/charI12.pcf.gz
-lib/X11/fonts/75dpi/charI14.pcf.gz
-lib/X11/fonts/75dpi/charI18.pcf.gz
-lib/X11/fonts/75dpi/charI24.pcf.gz
-lib/X11/fonts/75dpi/charR08.pcf.gz
-lib/X11/fonts/75dpi/charR10.pcf.gz
-lib/X11/fonts/75dpi/charR12.pcf.gz
-lib/X11/fonts/75dpi/charR14.pcf.gz
-lib/X11/fonts/75dpi/charR18.pcf.gz
-lib/X11/fonts/75dpi/charR24.pcf.gz
-lib/X11/fonts/75dpi/tech14.pcf.gz
-lib/X11/fonts/75dpi/techB14.pcf.gz
-lib/X11/fonts/75dpi/term14.pcf.gz
-lib/X11/fonts/75dpi/termB14.pcf.gz
+%%FONTSDIR%%/charB08.pcf.gz
+%%FONTSDIR%%/charB10.pcf.gz
+%%FONTSDIR%%/charB12.pcf.gz
+%%FONTSDIR%%/charB14.pcf.gz
+%%FONTSDIR%%/charB18.pcf.gz
+%%FONTSDIR%%/charB24.pcf.gz
+%%FONTSDIR%%/charBI08.pcf.gz
+%%FONTSDIR%%/charBI10.pcf.gz
+%%FONTSDIR%%/charBI12.pcf.gz
+%%FONTSDIR%%/charBI14.pcf.gz
+%%FONTSDIR%%/charBI18.pcf.gz
+%%FONTSDIR%%/charBI24.pcf.gz
+%%FONTSDIR%%/charI08.pcf.gz
+%%FONTSDIR%%/charI10.pcf.gz
+%%FONTSDIR%%/charI12.pcf.gz
+%%FONTSDIR%%/charI14.pcf.gz
+%%FONTSDIR%%/charI18.pcf.gz
+%%FONTSDIR%%/charI24.pcf.gz
+%%FONTSDIR%%/charR08.pcf.gz
+%%FONTSDIR%%/charR10.pcf.gz
+%%FONTSDIR%%/charR12.pcf.gz
+%%FONTSDIR%%/charR14.pcf.gz
+%%FONTSDIR%%/charR18.pcf.gz
+%%FONTSDIR%%/charR24.pcf.gz
+%%FONTSDIR%%/tech14.pcf.gz
+%%FONTSDIR%%/techB14.pcf.gz
+%%FONTSDIR%%/term14.pcf.gz
+%%FONTSDIR%%/termB14.pcf.gz
diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile
index 8fdfbd68941a..2897bd1a9c41 100644
--- a/x11-fonts/font-bitstream-speedo/Makefile
+++ b/x11-fonts/font-bitstream-speedo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= font-bitstream-speedo
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-speedo/pkg-plist b/x11-fonts/font-bitstream-speedo/pkg-plist
index 7ae910470103..f36cc423c14b 100644
--- a/x11-fonts/font-bitstream-speedo/pkg-plist
+++ b/x11-fonts/font-bitstream-speedo/pkg-plist
@@ -1,8 +1,8 @@
-lib/X11/fonts/Speedo/font0419.spd
-lib/X11/fonts/Speedo/font0582.spd
-lib/X11/fonts/Speedo/font0583.spd
-lib/X11/fonts/Speedo/font0611.spd
-lib/X11/fonts/Speedo/font0648.spd
-lib/X11/fonts/Speedo/font0649.spd
-lib/X11/fonts/Speedo/font0709.spd
-lib/X11/fonts/Speedo/font0710.spd
+%%FONTSDIR%%/font0419.spd
+%%FONTSDIR%%/font0582.spd
+%%FONTSDIR%%/font0583.spd
+%%FONTSDIR%%/font0611.spd
+%%FONTSDIR%%/font0648.spd
+%%FONTSDIR%%/font0649.spd
+%%FONTSDIR%%/font0709.spd
+%%FONTSDIR%%/font0710.spd
diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile
index 142b110ed14f..deb212d45d91 100644
--- a/x11-fonts/font-bitstream-type1/Makefile
+++ b/x11-fonts/font-bitstream-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bitstream-type1
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-type1/pkg-plist b/x11-fonts/font-bitstream-type1/pkg-plist
index 2dc4d5ba5e14..e534855398f3 100644
--- a/x11-fonts/font-bitstream-type1/pkg-plist
+++ b/x11-fonts/font-bitstream-type1/pkg-plist
@@ -1,16 +1,16 @@
-lib/X11/fonts/Type1/c0419bt_.afm
-lib/X11/fonts/Type1/c0419bt_.pfb
-lib/X11/fonts/Type1/c0582bt_.afm
-lib/X11/fonts/Type1/c0582bt_.pfb
-lib/X11/fonts/Type1/c0583bt_.afm
-lib/X11/fonts/Type1/c0583bt_.pfb
-lib/X11/fonts/Type1/c0611bt_.afm
-lib/X11/fonts/Type1/c0611bt_.pfb
-lib/X11/fonts/Type1/c0632bt_.afm
-lib/X11/fonts/Type1/c0632bt_.pfb
-lib/X11/fonts/Type1/c0633bt_.afm
-lib/X11/fonts/Type1/c0633bt_.pfb
-lib/X11/fonts/Type1/c0648bt_.afm
-lib/X11/fonts/Type1/c0648bt_.pfb
-lib/X11/fonts/Type1/c0649bt_.afm
-lib/X11/fonts/Type1/c0649bt_.pfb
+%%FONTSDIR%%/c0419bt_.afm
+%%FONTSDIR%%/c0419bt_.pfb
+%%FONTSDIR%%/c0582bt_.afm
+%%FONTSDIR%%/c0582bt_.pfb
+%%FONTSDIR%%/c0583bt_.afm
+%%FONTSDIR%%/c0583bt_.pfb
+%%FONTSDIR%%/c0611bt_.afm
+%%FONTSDIR%%/c0611bt_.pfb
+%%FONTSDIR%%/c0632bt_.afm
+%%FONTSDIR%%/c0632bt_.pfb
+%%FONTSDIR%%/c0633bt_.afm
+%%FONTSDIR%%/c0633bt_.pfb
+%%FONTSDIR%%/c0648bt_.afm
+%%FONTSDIR%%/c0648bt_.pfb
+%%FONTSDIR%%/c0649bt_.afm
+%%FONTSDIR%%/c0649bt_.pfb
diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile
index cccf42dd548e..b3e1eaad9356 100644
--- a/x11-fonts/font-cronyx-cyrillic/Makefile
+++ b/x11-fonts/font-cronyx-cyrillic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-cronyx-cyrillic
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-cronyx-cyrillic/pkg-plist b/x11-fonts/font-cronyx-cyrillic/pkg-plist
index f7015be6cb87..492583aacecf 100644
--- a/x11-fonts/font-cronyx-cyrillic/pkg-plist
+++ b/x11-fonts/font-cronyx-cyrillic/pkg-plist
@@ -1,64 +1,64 @@
-lib/X11/fonts/cyrillic/crox1c.pcf.gz
-lib/X11/fonts/cyrillic/crox1cb.pcf.gz
-lib/X11/fonts/cyrillic/crox1cbo.pcf.gz
-lib/X11/fonts/cyrillic/crox1co.pcf.gz
-lib/X11/fonts/cyrillic/crox1h.pcf.gz
-lib/X11/fonts/cyrillic/crox1hb.pcf.gz
-lib/X11/fonts/cyrillic/crox1hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox1ho.pcf.gz
-lib/X11/fonts/cyrillic/crox1t.pcf.gz
-lib/X11/fonts/cyrillic/crox1tb.pcf.gz
-lib/X11/fonts/cyrillic/crox1tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox1to.pcf.gz
-lib/X11/fonts/cyrillic/crox2c.pcf.gz
-lib/X11/fonts/cyrillic/crox2cb.pcf.gz
-lib/X11/fonts/cyrillic/crox2cbo.pcf.gz
-lib/X11/fonts/cyrillic/crox2co.pcf.gz
-lib/X11/fonts/cyrillic/crox2h.pcf.gz
-lib/X11/fonts/cyrillic/crox2hb.pcf.gz
-lib/X11/fonts/cyrillic/crox2hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox2ho.pcf.gz
-lib/X11/fonts/cyrillic/crox2t.pcf.gz
-lib/X11/fonts/cyrillic/crox2tb.pcf.gz
-lib/X11/fonts/cyrillic/crox2tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox2to.pcf.gz
-lib/X11/fonts/cyrillic/crox3c.pcf.gz
-lib/X11/fonts/cyrillic/crox3cb.pcf.gz
-lib/X11/fonts/cyrillic/crox3cbo.pcf.gz
-lib/X11/fonts/cyrillic/crox3co.pcf.gz
-lib/X11/fonts/cyrillic/crox3h.pcf.gz
-lib/X11/fonts/cyrillic/crox3hb.pcf.gz
-lib/X11/fonts/cyrillic/crox3hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox3ho.pcf.gz
-lib/X11/fonts/cyrillic/crox3t.pcf.gz
-lib/X11/fonts/cyrillic/crox3tb.pcf.gz
-lib/X11/fonts/cyrillic/crox3tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox3to.pcf.gz
-lib/X11/fonts/cyrillic/crox4h.pcf.gz
-lib/X11/fonts/cyrillic/crox4hb.pcf.gz
-lib/X11/fonts/cyrillic/crox4hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox4ho.pcf.gz
-lib/X11/fonts/cyrillic/crox4t.pcf.gz
-lib/X11/fonts/cyrillic/crox4tb.pcf.gz
-lib/X11/fonts/cyrillic/crox4tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox4to.pcf.gz
-lib/X11/fonts/cyrillic/crox5h.pcf.gz
-lib/X11/fonts/cyrillic/crox5hb.pcf.gz
-lib/X11/fonts/cyrillic/crox5hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox5ho.pcf.gz
-lib/X11/fonts/cyrillic/crox5t.pcf.gz
-lib/X11/fonts/cyrillic/crox5tb.pcf.gz
-lib/X11/fonts/cyrillic/crox5tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox5to.pcf.gz
-lib/X11/fonts/cyrillic/crox6h.pcf.gz
-lib/X11/fonts/cyrillic/crox6hb.pcf.gz
-lib/X11/fonts/cyrillic/crox6hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox6ho.pcf.gz
-lib/X11/fonts/cyrillic/crox6t.pcf.gz
-lib/X11/fonts/cyrillic/crox6tb.pcf.gz
-lib/X11/fonts/cyrillic/crox6tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox6to.pcf.gz
-lib/X11/fonts/cyrillic/koi10x16b.pcf.gz
-lib/X11/fonts/cyrillic/koi10x20.pcf.gz
-lib/X11/fonts/cyrillic/koi6x10.pcf.gz
-lib/X11/fonts/cyrillic/koinil2.pcf.gz
+%%FONTSDIR%%/crox1c.pcf.gz
+%%FONTSDIR%%/crox1cb.pcf.gz
+%%FONTSDIR%%/crox1cbo.pcf.gz
+%%FONTSDIR%%/crox1co.pcf.gz
+%%FONTSDIR%%/crox1h.pcf.gz
+%%FONTSDIR%%/crox1hb.pcf.gz
+%%FONTSDIR%%/crox1hbo.pcf.gz
+%%FONTSDIR%%/crox1ho.pcf.gz
+%%FONTSDIR%%/crox1t.pcf.gz
+%%FONTSDIR%%/crox1tb.pcf.gz
+%%FONTSDIR%%/crox1tbo.pcf.gz
+%%FONTSDIR%%/crox1to.pcf.gz
+%%FONTSDIR%%/crox2c.pcf.gz
+%%FONTSDIR%%/crox2cb.pcf.gz
+%%FONTSDIR%%/crox2cbo.pcf.gz
+%%FONTSDIR%%/crox2co.pcf.gz
+%%FONTSDIR%%/crox2h.pcf.gz
+%%FONTSDIR%%/crox2hb.pcf.gz
+%%FONTSDIR%%/crox2hbo.pcf.gz
+%%FONTSDIR%%/crox2ho.pcf.gz
+%%FONTSDIR%%/crox2t.pcf.gz
+%%FONTSDIR%%/crox2tb.pcf.gz
+%%FONTSDIR%%/crox2tbo.pcf.gz
+%%FONTSDIR%%/crox2to.pcf.gz
+%%FONTSDIR%%/crox3c.pcf.gz
+%%FONTSDIR%%/crox3cb.pcf.gz
+%%FONTSDIR%%/crox3cbo.pcf.gz
+%%FONTSDIR%%/crox3co.pcf.gz
+%%FONTSDIR%%/crox3h.pcf.gz
+%%FONTSDIR%%/crox3hb.pcf.gz
+%%FONTSDIR%%/crox3hbo.pcf.gz
+%%FONTSDIR%%/crox3ho.pcf.gz
+%%FONTSDIR%%/crox3t.pcf.gz
+%%FONTSDIR%%/crox3tb.pcf.gz
+%%FONTSDIR%%/crox3tbo.pcf.gz
+%%FONTSDIR%%/crox3to.pcf.gz
+%%FONTSDIR%%/crox4h.pcf.gz
+%%FONTSDIR%%/crox4hb.pcf.gz
+%%FONTSDIR%%/crox4hbo.pcf.gz
+%%FONTSDIR%%/crox4ho.pcf.gz
+%%FONTSDIR%%/crox4t.pcf.gz
+%%FONTSDIR%%/crox4tb.pcf.gz
+%%FONTSDIR%%/crox4tbo.pcf.gz
+%%FONTSDIR%%/crox4to.pcf.gz
+%%FONTSDIR%%/crox5h.pcf.gz
+%%FONTSDIR%%/crox5hb.pcf.gz
+%%FONTSDIR%%/crox5hbo.pcf.gz
+%%FONTSDIR%%/crox5ho.pcf.gz
+%%FONTSDIR%%/crox5t.pcf.gz
+%%FONTSDIR%%/crox5tb.pcf.gz
+%%FONTSDIR%%/crox5tbo.pcf.gz
+%%FONTSDIR%%/crox5to.pcf.gz
+%%FONTSDIR%%/crox6h.pcf.gz
+%%FONTSDIR%%/crox6hb.pcf.gz
+%%FONTSDIR%%/crox6hbo.pcf.gz
+%%FONTSDIR%%/crox6ho.pcf.gz
+%%FONTSDIR%%/crox6t.pcf.gz
+%%FONTSDIR%%/crox6tb.pcf.gz
+%%FONTSDIR%%/crox6tbo.pcf.gz
+%%FONTSDIR%%/crox6to.pcf.gz
+%%FONTSDIR%%/koi10x16b.pcf.gz
+%%FONTSDIR%%/koi10x20.pcf.gz
+%%FONTSDIR%%/koi6x10.pcf.gz
+%%FONTSDIR%%/koinil2.pcf.gz
diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile
index b347db7340cc..6338c2ca795f 100644
--- a/x11-fonts/font-cursor-misc/Makefile
+++ b/x11-fonts/font-cursor-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-cursor-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-cursor-misc/pkg-plist b/x11-fonts/font-cursor-misc/pkg-plist
index f3e551fc268a..bb0564c08710 100644
--- a/x11-fonts/font-cursor-misc/pkg-plist
+++ b/x11-fonts/font-cursor-misc/pkg-plist
@@ -1 +1 @@
-lib/X11/fonts/misc/cursor.pcf.gz
+%%FONTSDIR%%/cursor.pcf.gz
diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile
index 429c28b6414b..de7d9137d8fc 100644
--- a/x11-fonts/font-daewoo-misc/Makefile
+++ b/x11-fonts/font-daewoo-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-daewoo-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-daewoo-misc/pkg-plist b/x11-fonts/font-daewoo-misc/pkg-plist
index b7c4a9b0d0b8..3903a8519c71 100644
--- a/x11-fonts/font-daewoo-misc/pkg-plist
+++ b/x11-fonts/font-daewoo-misc/pkg-plist
@@ -1,3 +1,3 @@
-lib/X11/fonts/misc/hanglg16.pcf.gz
-lib/X11/fonts/misc/hanglm16.pcf.gz
-lib/X11/fonts/misc/hanglm24.pcf.gz
+%%FONTSDIR%%/hanglg16.pcf.gz
+%%FONTSDIR%%/hanglm16.pcf.gz
+%%FONTSDIR%%/hanglm24.pcf.gz
diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile
index d7e4bd1d599b..3862e4666270 100644
--- a/x11-fonts/font-dec-misc/Makefile
+++ b/x11-fonts/font-dec-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-dec-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-dec-misc/pkg-plist b/x11-fonts/font-dec-misc/pkg-plist
index c3b865c41afa..53df08411f6b 100644
--- a/x11-fonts/font-dec-misc/pkg-plist
+++ b/x11-fonts/font-dec-misc/pkg-plist
@@ -1,2 +1,2 @@
-lib/X11/fonts/misc/deccurs.pcf.gz
-lib/X11/fonts/misc/decsess.pcf.gz
+%%FONTSDIR%%/deccurs.pcf.gz
+%%FONTSDIR%%/decsess.pcf.gz
diff --git a/x11-fonts/font-gost/Makefile b/x11-fonts/font-gost/Makefile
index 3194de42c7e8..38c355016a5b 100644
--- a/x11-fonts/font-gost/Makefile
+++ b/x11-fonts/font-gost/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gost
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://sd.ascon.ru/ftp/Public/Utils/DWG-DXF/ \
LOCAL/vg
@@ -15,7 +15,6 @@ COMMENT= GOST TrueType fonts
USES= fonts zip
NO_BUILD= yes
-FONTSDIR= ${PREFIX}/lib/X11/fonts/gost
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/Fonts
diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile
index 3d77d4d7ac0e..c4ff24a3a353 100644
--- a/x11-fonts/font-ibm-type1/Makefile
+++ b/x11-fonts/font-ibm-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-ibm-type1
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-ibm-type1/pkg-plist b/x11-fonts/font-ibm-type1/pkg-plist
index 0c4236bccf1a..86beae0c2975 100644
--- a/x11-fonts/font-ibm-type1/pkg-plist
+++ b/x11-fonts/font-ibm-type1/pkg-plist
@@ -1,8 +1,8 @@
-lib/X11/fonts/Type1/cour.afm
-lib/X11/fonts/Type1/cour.pfa
-lib/X11/fonts/Type1/courb.afm
-lib/X11/fonts/Type1/courb.pfa
-lib/X11/fonts/Type1/courbi.afm
-lib/X11/fonts/Type1/courbi.pfa
-lib/X11/fonts/Type1/couri.afm
-lib/X11/fonts/Type1/couri.pfa
+%%FONTSDIR%%/cour.afm
+%%FONTSDIR%%/cour.pfa
+%%FONTSDIR%%/courb.afm
+%%FONTSDIR%%/courb.pfa
+%%FONTSDIR%%/courbi.afm
+%%FONTSDIR%%/courbi.pfa
+%%FONTSDIR%%/couri.afm
+%%FONTSDIR%%/couri.pfa
diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile
index b88dc7855055..18ad8c0159c2 100644
--- a/x11-fonts/font-isas-misc/Makefile
+++ b/x11-fonts/font-isas-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-isas-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-isas-misc/pkg-plist b/x11-fonts/font-isas-misc/pkg-plist
index 97e2c9372c78..63d1de8371c4 100644
--- a/x11-fonts/font-isas-misc/pkg-plist
+++ b/x11-fonts/font-isas-misc/pkg-plist
@@ -1,3 +1,3 @@
-lib/X11/fonts/misc/gb16fs.pcf.gz
-lib/X11/fonts/misc/gb16st.pcf.gz
-lib/X11/fonts/misc/gb24st.pcf.gz
+%%FONTSDIR%%/gb16fs.pcf.gz
+%%FONTSDIR%%/gb16st.pcf.gz
+%%FONTSDIR%%/gb24st.pcf.gz
diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile
index 83904dc9a1ff..457eb4bd2a8b 100644
--- a/x11-fonts/font-jis-misc/Makefile
+++ b/x11-fonts/font-jis-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-jis-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-jis-misc/pkg-plist b/x11-fonts/font-jis-misc/pkg-plist
index be07e50c3695..d85c39dc3543 100644
--- a/x11-fonts/font-jis-misc/pkg-plist
+++ b/x11-fonts/font-jis-misc/pkg-plist
@@ -1,2 +1,2 @@
-lib/X11/fonts/misc/jiskan16.pcf.gz
-lib/X11/fonts/misc/jiskan24.pcf.gz
+%%FONTSDIR%%/jiskan16.pcf.gz
+%%FONTSDIR%%/jiskan24.pcf.gz
diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile
index b1b35958ebe9..cca984d6813a 100644
--- a/x11-fonts/font-micro-misc/Makefile
+++ b/x11-fonts/font-micro-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-micro-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-micro-misc/pkg-plist b/x11-fonts/font-micro-misc/pkg-plist
index ab2014fcd2aa..3f52db1a3301 100644
--- a/x11-fonts/font-micro-misc/pkg-plist
+++ b/x11-fonts/font-micro-misc/pkg-plist
@@ -1 +1 @@
-lib/X11/fonts/misc/micro.pcf.gz
+%%FONTSDIR%%/micro.pcf.gz
diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile
index ec60868ecd40..135f1c2f3888 100644
--- a/x11-fonts/font-misc-cyrillic/Makefile
+++ b/x11-fonts/font-misc-cyrillic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-misc-cyrillic
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-cyrillic/pkg-plist b/x11-fonts/font-misc-cyrillic/pkg-plist
index fcaeb11d80d5..3590bbc0dd2e 100644
--- a/x11-fonts/font-misc-cyrillic/pkg-plist
+++ b/x11-fonts/font-misc-cyrillic/pkg-plist
@@ -1,15 +1,15 @@
-lib/X11/fonts/cyrillic/koi12x24.pcf.gz
-lib/X11/fonts/cyrillic/koi12x24b.pcf.gz
-lib/X11/fonts/cyrillic/koi5x8.pcf.gz
-lib/X11/fonts/cyrillic/koi6x13.pcf.gz
-lib/X11/fonts/cyrillic/koi6x13b.pcf.gz
-lib/X11/fonts/cyrillic/koi6x9.pcf.gz
-lib/X11/fonts/cyrillic/koi7x14.pcf.gz
-lib/X11/fonts/cyrillic/koi7x14b.pcf.gz
-lib/X11/fonts/cyrillic/koi8x13.pcf.gz
-lib/X11/fonts/cyrillic/koi8x16.pcf.gz
-lib/X11/fonts/cyrillic/koi8x16b.pcf.gz
-lib/X11/fonts/cyrillic/koi9x15.pcf.gz
-lib/X11/fonts/cyrillic/koi9x15b.pcf.gz
-lib/X11/fonts/cyrillic/koi9x18.pcf.gz
-lib/X11/fonts/cyrillic/koi9x18b.pcf.gz
+%%FONTSDIR%%/koi12x24.pcf.gz
+%%FONTSDIR%%/koi12x24b.pcf.gz
+%%FONTSDIR%%/koi5x8.pcf.gz
+%%FONTSDIR%%/koi6x13.pcf.gz
+%%FONTSDIR%%/koi6x13b.pcf.gz
+%%FONTSDIR%%/koi6x9.pcf.gz
+%%FONTSDIR%%/koi7x14.pcf.gz
+%%FONTSDIR%%/koi7x14b.pcf.gz
+%%FONTSDIR%%/koi8x13.pcf.gz
+%%FONTSDIR%%/koi8x16.pcf.gz
+%%FONTSDIR%%/koi8x16b.pcf.gz
+%%FONTSDIR%%/koi9x15.pcf.gz
+%%FONTSDIR%%/koi9x15b.pcf.gz
+%%FONTSDIR%%/koi9x18.pcf.gz
+%%FONTSDIR%%/koi9x18b.pcf.gz
diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile
index 72b2a33092d2..ba4b5ad8ebe2 100644
--- a/x11-fonts/font-misc-ethiopic/Makefile
+++ b/x11-fonts/font-misc-ethiopic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= font-misc-ethiopic
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -10,6 +10,8 @@ COMMENT= X.Org miscellaneous Ethiopic font
XORG_CAT= font
FONTNAME= TTF
-PLIST_FILES= "@fcfontsdir ${PREFIX}/lib/X11/fonts/OTF"
+PLIST_FILES= "@fcfontsdir ${PREFIX}/share/fonts/OTF" \
+ "@comment ${PREFIX}/share/fonts/OTF/fonts.dir" \
+ "@comment ${PREFIX}/share/fonts/OTF/fonts.scale"
.include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-ethiopic/pkg-plist b/x11-fonts/font-misc-ethiopic/pkg-plist
index 307895907127..aa8240f94181 100644
--- a/x11-fonts/font-misc-ethiopic/pkg-plist
+++ b/x11-fonts/font-misc-ethiopic/pkg-plist
@@ -1,2 +1,2 @@
-lib/X11/fonts/OTF/GohaTibebZemen.otf
-lib/X11/fonts/TTF/GohaTibebZemen.ttf
+share/fonts/OTF/GohaTibebZemen.otf
+share/fonts/TTF/GohaTibebZemen.ttf
diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile
index 4769205630e7..cf1c1fee3af5 100644
--- a/x11-fonts/font-misc-meltho/Makefile
+++ b/x11-fonts/font-misc-meltho/Makefile
@@ -2,7 +2,7 @@
PORTNAME= font-misc-meltho
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-meltho/pkg-plist b/x11-fonts/font-misc-meltho/pkg-plist
index 80064816d46f..8d5d02bb5800 100644
--- a/x11-fonts/font-misc-meltho/pkg-plist
+++ b/x11-fonts/font-misc-meltho/pkg-plist
@@ -1,22 +1,22 @@
-lib/X11/fonts/OTF/SyrCOMAdiabene.otf
-lib/X11/fonts/OTF/SyrCOMAntioch.otf
-lib/X11/fonts/OTF/SyrCOMBatnan.otf
-lib/X11/fonts/OTF/SyrCOMBatnanBold.otf
-lib/X11/fonts/OTF/SyrCOMCtesiphon.otf
-lib/X11/fonts/OTF/SyrCOMEdessa.otf
-lib/X11/fonts/OTF/SyrCOMJerusalem.otf
-lib/X11/fonts/OTF/SyrCOMJerusalemBold.otf
-lib/X11/fonts/OTF/SyrCOMJerusalemItalic.otf
-lib/X11/fonts/OTF/SyrCOMJerusalemOutline.otf
-lib/X11/fonts/OTF/SyrCOMKharput.otf
-lib/X11/fonts/OTF/SyrCOMMalankara.otf
-lib/X11/fonts/OTF/SyrCOMMardin.otf
-lib/X11/fonts/OTF/SyrCOMMardinBold.otf
-lib/X11/fonts/OTF/SyrCOMMidyat.otf
-lib/X11/fonts/OTF/SyrCOMNisibin.otf
-lib/X11/fonts/OTF/SyrCOMNisibinOutline.otf
-lib/X11/fonts/OTF/SyrCOMQenNeshrin.otf
-lib/X11/fonts/OTF/SyrCOMTalada.otf
-lib/X11/fonts/OTF/SyrCOMTurAbdin.otf
-lib/X11/fonts/OTF/SyrCOMUrhoy.otf
-lib/X11/fonts/OTF/SyrCOMUrhoyBold.otf
+%%FONTSDIR%%/SyrCOMAdiabene.otf
+%%FONTSDIR%%/SyrCOMAntioch.otf
+%%FONTSDIR%%/SyrCOMBatnan.otf
+%%FONTSDIR%%/SyrCOMBatnanBold.otf
+%%FONTSDIR%%/SyrCOMCtesiphon.otf
+%%FONTSDIR%%/SyrCOMEdessa.otf
+%%FONTSDIR%%/SyrCOMJerusalem.otf
+%%FONTSDIR%%/SyrCOMJerusalemBold.otf
+%%FONTSDIR%%/SyrCOMJerusalemItalic.otf
+%%FONTSDIR%%/SyrCOMJerusalemOutline.otf
+%%FONTSDIR%%/SyrCOMKharput.otf
+%%FONTSDIR%%/SyrCOMMalankara.otf
+%%FONTSDIR%%/SyrCOMMardin.otf
+%%FONTSDIR%%/SyrCOMMardinBold.otf
+%%FONTSDIR%%/SyrCOMMidyat.otf
+%%FONTSDIR%%/SyrCOMNisibin.otf
+%%FONTSDIR%%/SyrCOMNisibinOutline.otf
+%%FONTSDIR%%/SyrCOMQenNeshrin.otf
+%%FONTSDIR%%/SyrCOMTalada.otf
+%%FONTSDIR%%/SyrCOMTurAbdin.otf
+%%FONTSDIR%%/SyrCOMUrhoy.otf
+%%FONTSDIR%%/SyrCOMUrhoyBold.otf
diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile
index fb2d5090f123..a95b7569989d 100644
--- a/x11-fonts/font-misc-misc/Makefile
+++ b/x11-fonts/font-misc-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-misc-misc
PORTVERSION= 1.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-misc/pkg-plist b/x11-fonts/font-misc-misc/pkg-plist
index 9d2a6143b370..0da41a5b61ed 100644
--- a/x11-fonts/font-misc-misc/pkg-plist
+++ b/x11-fonts/font-misc-misc/pkg-plist
@@ -1,334 +1,334 @@
-lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/10x20-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/10x20-KOI8-R.pcf.gz
-lib/X11/fonts/misc/10x20.pcf.gz
-lib/X11/fonts/misc/12x13ja.pcf.gz
-lib/X11/fonts/misc/18x18ja.pcf.gz
-lib/X11/fonts/misc/18x18ko.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/4x6-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/4x6-KOI8-R.pcf.gz
-lib/X11/fonts/misc/4x6.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/5x7-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/5x7-KOI8-R.pcf.gz
-lib/X11/fonts/misc/5x7.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/5x8-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/5x8-KOI8-R.pcf.gz
-lib/X11/fonts/misc/5x8.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/6x10-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/6x10-KOI8-R.pcf.gz
-lib/X11/fonts/misc/6x10.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/6x12-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/6x12-KOI8-R.pcf.gz
-lib/X11/fonts/misc/6x12.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/6x13-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/6x13-KOI8-R.pcf.gz
-lib/X11/fonts/misc/6x13.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/6x13B-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/6x13B.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/6x13O-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/6x13O.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/6x9-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/6x9-KOI8-R.pcf.gz
-lib/X11/fonts/misc/6x9.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/7x13-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/7x13-KOI8-R.pcf.gz
-lib/X11/fonts/misc/7x13.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/7x13B-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/7x13B.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/7x13O-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/7x13O.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/7x14-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/7x14-JISX0201.1976-0.pcf.gz
-lib/X11/fonts/misc/7x14-KOI8-R.pcf.gz
-lib/X11/fonts/misc/7x14.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/7x14B-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/7x14B.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/8x13-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/8x13-KOI8-R.pcf.gz
-lib/X11/fonts/misc/8x13.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/8x13B-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/8x13B.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/8x13O-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/8x13O.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/9x15-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/9x15-KOI8-R.pcf.gz
-lib/X11/fonts/misc/9x15.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/9x15B-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/9x15B.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-11.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/9x18-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/9x18-KOI8-R.pcf.gz
-lib/X11/fonts/misc/9x18.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/9x18B-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/9x18B.pcf.gz
-lib/X11/fonts/misc/k14.pcf.gz
-lib/X11/fonts/misc/nil2.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-1.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-10.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-11.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-13.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-14.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-15.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-16.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-2.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-3.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-4.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-5.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-7.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-8.pcf.gz
+%%FONTSDIR%%/10x20-ISO8859-9.pcf.gz
+%%FONTSDIR%%/10x20-KOI8-R.pcf.gz
+%%FONTSDIR%%/10x20.pcf.gz
+%%FONTSDIR%%/12x13ja.pcf.gz
+%%FONTSDIR%%/18x18ja.pcf.gz
+%%FONTSDIR%%/18x18ko.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-1.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-10.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-13.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-14.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-15.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-16.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-2.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-3.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-4.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-5.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-7.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-8.pcf.gz
+%%FONTSDIR%%/4x6-ISO8859-9.pcf.gz
+%%FONTSDIR%%/4x6-KOI8-R.pcf.gz
+%%FONTSDIR%%/4x6.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-1.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-10.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-13.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-14.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-15.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-16.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-2.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-3.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-4.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-5.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-7.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-8.pcf.gz
+%%FONTSDIR%%/5x7-ISO8859-9.pcf.gz
+%%FONTSDIR%%/5x7-KOI8-R.pcf.gz
+%%FONTSDIR%%/5x7.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-1.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-10.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-13.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-14.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-15.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-16.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-2.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-3.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-4.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-5.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-7.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-8.pcf.gz
+%%FONTSDIR%%/5x8-ISO8859-9.pcf.gz
+%%FONTSDIR%%/5x8-KOI8-R.pcf.gz
+%%FONTSDIR%%/5x8.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-1.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-10.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-13.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-14.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-15.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-16.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-2.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-3.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-4.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-5.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-7.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-8.pcf.gz
+%%FONTSDIR%%/6x10-ISO8859-9.pcf.gz
+%%FONTSDIR%%/6x10-KOI8-R.pcf.gz
+%%FONTSDIR%%/6x10.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-16.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-5.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-7.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-8.pcf.gz
+%%FONTSDIR%%/6x12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/6x12-KOI8-R.pcf.gz
+%%FONTSDIR%%/6x12.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-1.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-10.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-11.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-13.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-14.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-15.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-16.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-2.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-3.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-4.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-5.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-7.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-8.pcf.gz
+%%FONTSDIR%%/6x13-ISO8859-9.pcf.gz
+%%FONTSDIR%%/6x13-KOI8-R.pcf.gz
+%%FONTSDIR%%/6x13.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-1.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-10.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-13.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-14.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-15.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-16.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-2.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-3.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-4.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-5.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-7.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-8.pcf.gz
+%%FONTSDIR%%/6x13B-ISO8859-9.pcf.gz
+%%FONTSDIR%%/6x13B.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-1.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-10.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-13.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-14.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-15.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-16.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-2.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-3.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-4.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-5.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-7.pcf.gz
+%%FONTSDIR%%/6x13O-ISO8859-9.pcf.gz
+%%FONTSDIR%%/6x13O.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-1.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-10.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-13.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-14.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-15.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-16.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-2.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-3.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-4.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-5.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-7.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-8.pcf.gz
+%%FONTSDIR%%/6x9-ISO8859-9.pcf.gz
+%%FONTSDIR%%/6x9-KOI8-R.pcf.gz
+%%FONTSDIR%%/6x9.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-1.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-10.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-11.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-13.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-14.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-15.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-16.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-2.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-3.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-4.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-5.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-7.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-8.pcf.gz
+%%FONTSDIR%%/7x13-ISO8859-9.pcf.gz
+%%FONTSDIR%%/7x13-KOI8-R.pcf.gz
+%%FONTSDIR%%/7x13.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-1.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-10.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-11.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-13.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-14.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-15.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-16.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-2.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-3.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-4.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-5.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-7.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-8.pcf.gz
+%%FONTSDIR%%/7x13B-ISO8859-9.pcf.gz
+%%FONTSDIR%%/7x13B.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-1.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-10.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-11.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-13.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-14.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-15.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-16.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-2.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-3.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-4.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-5.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-7.pcf.gz
+%%FONTSDIR%%/7x13O-ISO8859-9.pcf.gz
+%%FONTSDIR%%/7x13O.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-1.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-10.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-11.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-13.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-14.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-15.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-16.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-2.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-3.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-4.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-5.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-7.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-8.pcf.gz
+%%FONTSDIR%%/7x14-ISO8859-9.pcf.gz
+%%FONTSDIR%%/7x14-JISX0201.1976-0.pcf.gz
+%%FONTSDIR%%/7x14-KOI8-R.pcf.gz
+%%FONTSDIR%%/7x14.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-1.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-10.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-11.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-13.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-14.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-15.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-16.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-2.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-3.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-4.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-5.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-7.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-8.pcf.gz
+%%FONTSDIR%%/7x14B-ISO8859-9.pcf.gz
+%%FONTSDIR%%/7x14B.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-1.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-10.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-13.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-14.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-15.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-16.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-2.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-3.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-4.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-5.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-7.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-8.pcf.gz
+%%FONTSDIR%%/8x13-ISO8859-9.pcf.gz
+%%FONTSDIR%%/8x13-KOI8-R.pcf.gz
+%%FONTSDIR%%/8x13.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-1.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-10.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-13.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-14.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-15.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-16.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-2.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-3.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-4.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-5.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-7.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-8.pcf.gz
+%%FONTSDIR%%/8x13B-ISO8859-9.pcf.gz
+%%FONTSDIR%%/8x13B.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-1.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-10.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-13.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-14.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-15.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-16.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-2.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-3.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-4.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-5.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-7.pcf.gz
+%%FONTSDIR%%/8x13O-ISO8859-9.pcf.gz
+%%FONTSDIR%%/8x13O.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-1.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-10.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-11.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-13.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-14.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-15.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-16.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-2.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-3.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-4.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-5.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-7.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-8.pcf.gz
+%%FONTSDIR%%/9x15-ISO8859-9.pcf.gz
+%%FONTSDIR%%/9x15-KOI8-R.pcf.gz
+%%FONTSDIR%%/9x15.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-1.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-10.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-11.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-13.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-14.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-15.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-16.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-2.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-3.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-4.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-5.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-7.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-8.pcf.gz
+%%FONTSDIR%%/9x15B-ISO8859-9.pcf.gz
+%%FONTSDIR%%/9x15B.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-1.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-10.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-11.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-13.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-14.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-15.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-16.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-2.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-3.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-4.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-5.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-7.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-8.pcf.gz
+%%FONTSDIR%%/9x18-ISO8859-9.pcf.gz
+%%FONTSDIR%%/9x18-KOI8-R.pcf.gz
+%%FONTSDIR%%/9x18.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-1.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-10.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-13.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-14.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-15.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-16.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-2.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-3.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-4.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-5.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-7.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-8.pcf.gz
+%%FONTSDIR%%/9x18B-ISO8859-9.pcf.gz
+%%FONTSDIR%%/9x18B.pcf.gz
+%%FONTSDIR%%/k14.pcf.gz
+%%FONTSDIR%%/nil2.pcf.gz
diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile
index 4efa69d60878..82b88f08ea19 100644
--- a/x11-fonts/font-mutt-misc/Makefile
+++ b/x11-fonts/font-mutt-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-mutt-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-mutt-misc/pkg-plist b/x11-fonts/font-mutt-misc/pkg-plist
index b5c86ec9bc12..efe91d30858c 100644
--- a/x11-fonts/font-mutt-misc/pkg-plist
+++ b/x11-fonts/font-mutt-misc/pkg-plist
@@ -1,8 +1,8 @@
-lib/X11/fonts/misc/cu-alt12.pcf.gz
-lib/X11/fonts/misc/cu-arabic12.pcf.gz
-lib/X11/fonts/misc/cu-devnag12.pcf.gz
-lib/X11/fonts/misc/cu-lig12.pcf.gz
-lib/X11/fonts/misc/cu-pua12.pcf.gz
-lib/X11/fonts/misc/cu12.pcf.gz
-lib/X11/fonts/misc/cuarabic12.pcf.gz
-lib/X11/fonts/misc/cudevnag12.pcf.gz
+%%FONTSDIR%%/cu-alt12.pcf.gz
+%%FONTSDIR%%/cu-arabic12.pcf.gz
+%%FONTSDIR%%/cu-devnag12.pcf.gz
+%%FONTSDIR%%/cu-lig12.pcf.gz
+%%FONTSDIR%%/cu-pua12.pcf.gz
+%%FONTSDIR%%/cu12.pcf.gz
+%%FONTSDIR%%/cuarabic12.pcf.gz
+%%FONTSDIR%%/cudevnag12.pcf.gz
diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile
index 2d16a4b55a98..dcf9ae65d081 100644
--- a/x11-fonts/font-schumacher-misc/Makefile
+++ b/x11-fonts/font-schumacher-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-schumacher-misc
PORTVERSION= 1.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-schumacher-misc/pkg-plist b/x11-fonts/font-schumacher-misc/pkg-plist
index f33899512a58..9304e6223f63 100644
--- a/x11-fonts/font-schumacher-misc/pkg-plist
+++ b/x11-fonts/font-schumacher-misc/pkg-plist
@@ -1,45 +1,45 @@
-lib/X11/fonts/misc/clB6x10.pcf.gz
-lib/X11/fonts/misc/clB6x12.pcf.gz
-lib/X11/fonts/misc/clB8x10.pcf.gz
-lib/X11/fonts/misc/clB8x12.pcf.gz
-lib/X11/fonts/misc/clB8x13.pcf.gz
-lib/X11/fonts/misc/clB8x14.pcf.gz
-lib/X11/fonts/misc/clB8x16.pcf.gz
-lib/X11/fonts/misc/clB8x8.pcf.gz
-lib/X11/fonts/misc/clB9x15.pcf.gz
-lib/X11/fonts/misc/clI6x12.pcf.gz
-lib/X11/fonts/misc/clI8x8.pcf.gz
-lib/X11/fonts/misc/clR4x6.pcf.gz
-lib/X11/fonts/misc/clR5x10.pcf.gz
-lib/X11/fonts/misc/clR5x6.pcf.gz
-lib/X11/fonts/misc/clR5x8.pcf.gz
-lib/X11/fonts/misc/clR6x10.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/clR6x12-KOI8-R.pcf.gz
-lib/X11/fonts/misc/clR6x12.pcf.gz
-lib/X11/fonts/misc/clR6x13.pcf.gz
-lib/X11/fonts/misc/clR6x6.pcf.gz
-lib/X11/fonts/misc/clR6x8.pcf.gz
-lib/X11/fonts/misc/clR7x10.pcf.gz
-lib/X11/fonts/misc/clR7x12.pcf.gz
-lib/X11/fonts/misc/clR7x14.pcf.gz
-lib/X11/fonts/misc/clR7x8.pcf.gz
-lib/X11/fonts/misc/clR8x10.pcf.gz
-lib/X11/fonts/misc/clR8x12.pcf.gz
-lib/X11/fonts/misc/clR8x13.pcf.gz
-lib/X11/fonts/misc/clR8x14.pcf.gz
-lib/X11/fonts/misc/clR8x16.pcf.gz
-lib/X11/fonts/misc/clR8x8.pcf.gz
-lib/X11/fonts/misc/clR9x15.pcf.gz
+%%FONTSDIR%%/clB6x10.pcf.gz
+%%FONTSDIR%%/clB6x12.pcf.gz
+%%FONTSDIR%%/clB8x10.pcf.gz
+%%FONTSDIR%%/clB8x12.pcf.gz
+%%FONTSDIR%%/clB8x13.pcf.gz
+%%FONTSDIR%%/clB8x14.pcf.gz
+%%FONTSDIR%%/clB8x16.pcf.gz
+%%FONTSDIR%%/clB8x8.pcf.gz
+%%FONTSDIR%%/clB9x15.pcf.gz
+%%FONTSDIR%%/clI6x12.pcf.gz
+%%FONTSDIR%%/clI8x8.pcf.gz
+%%FONTSDIR%%/clR4x6.pcf.gz
+%%FONTSDIR%%/clR5x10.pcf.gz
+%%FONTSDIR%%/clR5x6.pcf.gz
+%%FONTSDIR%%/clR5x8.pcf.gz
+%%FONTSDIR%%/clR6x10.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-1.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-10.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-13.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-14.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-15.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-16.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-2.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-3.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-4.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-5.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-7.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-8.pcf.gz
+%%FONTSDIR%%/clR6x12-ISO8859-9.pcf.gz
+%%FONTSDIR%%/clR6x12-KOI8-R.pcf.gz
+%%FONTSDIR%%/clR6x12.pcf.gz
+%%FONTSDIR%%/clR6x13.pcf.gz
+%%FONTSDIR%%/clR6x6.pcf.gz
+%%FONTSDIR%%/clR6x8.pcf.gz
+%%FONTSDIR%%/clR7x10.pcf.gz
+%%FONTSDIR%%/clR7x12.pcf.gz
+%%FONTSDIR%%/clR7x14.pcf.gz
+%%FONTSDIR%%/clR7x8.pcf.gz
+%%FONTSDIR%%/clR8x10.pcf.gz
+%%FONTSDIR%%/clR8x12.pcf.gz
+%%FONTSDIR%%/clR8x13.pcf.gz
+%%FONTSDIR%%/clR8x14.pcf.gz
+%%FONTSDIR%%/clR8x16.pcf.gz
+%%FONTSDIR%%/clR8x8.pcf.gz
+%%FONTSDIR%%/clR9x15.pcf.gz
diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile
index 7f7b50cc4087..a30017520ca2 100644
--- a/x11-fonts/font-screen-cyrillic/Makefile
+++ b/x11-fonts/font-screen-cyrillic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-screen-cyrillic
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-screen-cyrillic/pkg-plist b/x11-fonts/font-screen-cyrillic/pkg-plist
index e2c5755f5fb5..e304139447d7 100644
--- a/x11-fonts/font-screen-cyrillic/pkg-plist
+++ b/x11-fonts/font-screen-cyrillic/pkg-plist
@@ -1,2 +1,2 @@
-lib/X11/fonts/cyrillic/screen8x16.pcf.gz
-lib/X11/fonts/cyrillic/screen8x16b.pcf.gz
+%%FONTSDIR%%/screen8x16.pcf.gz
+%%FONTSDIR%%/screen8x16b.pcf.gz
diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile
index 3fc4a48cc447..eae4d3077487 100644
--- a/x11-fonts/font-sony-misc/Makefile
+++ b/x11-fonts/font-sony-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-sony-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-sony-misc/pkg-plist b/x11-fonts/font-sony-misc/pkg-plist
index 2e24fda8fe89..546e3e9a517e 100644
--- a/x11-fonts/font-sony-misc/pkg-plist
+++ b/x11-fonts/font-sony-misc/pkg-plist
@@ -1,4 +1,4 @@
-lib/X11/fonts/misc/12x24.pcf.gz
-lib/X11/fonts/misc/12x24rk.pcf.gz
-lib/X11/fonts/misc/8x16.pcf.gz
-lib/X11/fonts/misc/8x16rk.pcf.gz
+%%FONTSDIR%%/12x24.pcf.gz
+%%FONTSDIR%%/12x24rk.pcf.gz
+%%FONTSDIR%%/8x16.pcf.gz
+%%FONTSDIR%%/8x16rk.pcf.gz
diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile
index 0dd7dc4c4d33..74456f397bd3 100644
--- a/x11-fonts/font-sun-misc/Makefile
+++ b/x11-fonts/font-sun-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-sun-misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-sun-misc/pkg-plist b/x11-fonts/font-sun-misc/pkg-plist
index 545fdca117cb..2381c9b24cb4 100644
--- a/x11-fonts/font-sun-misc/pkg-plist
+++ b/x11-fonts/font-sun-misc/pkg-plist
@@ -1,5 +1,5 @@
-lib/X11/fonts/misc/olcursor.pcf.gz
-lib/X11/fonts/misc/olgl10.pcf.gz
-lib/X11/fonts/misc/olgl12.pcf.gz
-lib/X11/fonts/misc/olgl14.pcf.gz
-lib/X11/fonts/misc/olgl19.pcf.gz
+%%FONTSDIR%%/olcursor.pcf.gz
+%%FONTSDIR%%/olgl10.pcf.gz
+%%FONTSDIR%%/olgl12.pcf.gz
+%%FONTSDIR%%/olgl14.pcf.gz
+%%FONTSDIR%%/olgl19.pcf.gz
diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile
index 3856a8376da4..3437268f390c 100644
--- a/x11-fonts/font-util/Makefile
+++ b/x11-fonts/font-util/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-util
PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
MASTER_SITES= XORG/individual/font
CATEGORIES= x11-fonts
@@ -12,6 +12,6 @@ COMMENT= Create an index of X font files in a directory
USES= pathfix tar:bzip2
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/lib/X11/fonts
+CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/share/fonts
.include <bsd.port.mk>
diff --git a/x11-fonts/font-util/pkg-plist b/x11-fonts/font-util/pkg-plist
index 4d8ebc4ab861..227f5b50012f 100644
--- a/x11-fonts/font-util/pkg-plist
+++ b/x11-fonts/font-util/pkg-plist
@@ -1,22 +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
+share/fonts/util/map-ISO8859-1
+share/fonts/util/map-ISO8859-10
+share/fonts/util/map-ISO8859-11
+share/fonts/util/map-ISO8859-13
+share/fonts/util/map-ISO8859-14
+share/fonts/util/map-ISO8859-15
+share/fonts/util/map-ISO8859-16
+share/fonts/util/map-ISO8859-2
+share/fonts/util/map-ISO8859-3
+share/fonts/util/map-ISO8859-4
+share/fonts/util/map-ISO8859-5
+share/fonts/util/map-ISO8859-6
+share/fonts/util/map-ISO8859-7
+share/fonts/util/map-ISO8859-8
+share/fonts/util/map-ISO8859-9
+share/fonts/util/map-JISX0201.1976-0
+share/fonts/util/map-KOI8-R
libdata/pkgconfig/fontutil.pc
man/man1/bdftruncate.1.gz
man/man1/ucs2any.1.gz
diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile
index 83530dcd2195..5e7505920818 100644
--- a/x11-fonts/font-winitzki-cyrillic/Makefile
+++ b/x11-fonts/font-winitzki-cyrillic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-winitzki-cyrillic
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-winitzki-cyrillic/pkg-plist b/x11-fonts/font-winitzki-cyrillic/pkg-plist
index 34cd024a0471..a9cbcf194110 100644
--- a/x11-fonts/font-winitzki-cyrillic/pkg-plist
+++ b/x11-fonts/font-winitzki-cyrillic/pkg-plist
@@ -1 +1 @@
-lib/X11/fonts/cyrillic/proof9x16.pcf.gz
+%%FONTSDIR%%/proof9x16.pcf.gz
diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile
index f6343afdf145..c8eadba1ea02 100644
--- a/x11-fonts/font-xfree86-type1/Makefile
+++ b/x11-fonts/font-xfree86-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-xfree86-type1
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-xfree86-type1/pkg-plist b/x11-fonts/font-xfree86-type1/pkg-plist
index a312274597a2..ad1a3d771136 100644
--- a/x11-fonts/font-xfree86-type1/pkg-plist
+++ b/x11-fonts/font-xfree86-type1/pkg-plist
@@ -1 +1 @@
-lib/X11/fonts/Type1/cursor.pfa
+%%FONTSDIR%%/cursor.pfa
diff --git a/x11-fonts/fonts-indic/Makefile b/x11-fonts/fonts-indic/Makefile
index 27f134ebf962..d60bff34b1de 100644
--- a/x11-fonts/fonts-indic/Makefile
+++ b/x11-fonts/fonts-indic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fonts-indic
PORTVERSION= 2.1.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://gentoo.osuosl.org/distfiles/
@@ -15,10 +15,8 @@ USES= fonts
NO_BUILD= yes
NO_WRKSUBDIR= yes
-FONTSDIR= lib/X11/fonts/${PORTNAME}
-
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/*/*/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*/*/*.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/freefont-ttf/Makefile b/x11-fonts/freefont-ttf/Makefile
index df0f61aaa29a..dab0ae91bff3 100644
--- a/x11-fonts/freefont-ttf/Makefile
+++ b/x11-fonts/freefont-ttf/Makefile
@@ -3,35 +3,28 @@
PORTNAME= freefont-ttf
PORTVERSION= 20120503
+PORTREVISION= 1
CATEGORIES= x11-fonts
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=freefont
+MASTER_SITES= GNU/freefont
MAINTAINER= pawel@FreeBSD.org
COMMENT= Free UCS Outline Fonts
-BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-
LICENSE= GPLv3
-USES= zip
+USES= fonts zip
WRKSRC= ${WRKDIR}/freefont-${PORTVERSION}
-INSTALLDIR= ${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
PORTDOCS= AUTHORS ChangeLog CREDITS README
+NO_BUILD= yes
OPTIONS_DEFINE= DOCS
-do-build:
- cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontscale
- cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontdir
-
do-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
- @${MKDIR} ${INSTALLDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
cd ${WRKSRC} && \
- ${INSTALL_DATA} fonts.dir fonts.scale *.ttf ${INSTALLDIR}
+ ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/freefont-ttf/pkg-plist b/x11-fonts/freefont-ttf/pkg-plist
index 3dbc372419ad..6218367303e1 100644
--- a/x11-fonts/freefont-ttf/pkg-plist
+++ b/x11-fonts/freefont-ttf/pkg-plist
@@ -1,14 +1,12 @@
-lib/X11/fonts/freefont-ttf/FreeMono.ttf
-lib/X11/fonts/freefont-ttf/FreeMonoBold.ttf
-lib/X11/fonts/freefont-ttf/FreeMonoBoldOblique.ttf
-lib/X11/fonts/freefont-ttf/FreeMonoOblique.ttf
-lib/X11/fonts/freefont-ttf/FreeSans.ttf
-lib/X11/fonts/freefont-ttf/FreeSansBold.ttf
-lib/X11/fonts/freefont-ttf/FreeSansBoldOblique.ttf
-lib/X11/fonts/freefont-ttf/FreeSansOblique.ttf
-lib/X11/fonts/freefont-ttf/FreeSerif.ttf
-lib/X11/fonts/freefont-ttf/FreeSerifBold.ttf
-lib/X11/fonts/freefont-ttf/FreeSerifBoldItalic.ttf
-lib/X11/fonts/freefont-ttf/FreeSerifItalic.ttf
-lib/X11/fonts/freefont-ttf/fonts.dir
-lib/X11/fonts/freefont-ttf/fonts.scale
+%%FONTSDIR%%/FreeMono.ttf
+%%FONTSDIR%%/FreeMonoBold.ttf
+%%FONTSDIR%%/FreeMonoBoldOblique.ttf
+%%FONTSDIR%%/FreeMonoOblique.ttf
+%%FONTSDIR%%/FreeSans.ttf
+%%FONTSDIR%%/FreeSansBold.ttf
+%%FONTSDIR%%/FreeSansBoldOblique.ttf
+%%FONTSDIR%%/FreeSansOblique.ttf
+%%FONTSDIR%%/FreeSerif.ttf
+%%FONTSDIR%%/FreeSerifBold.ttf
+%%FONTSDIR%%/FreeSerifBoldItalic.ttf
+%%FONTSDIR%%/FreeSerifItalic.ttf
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index 30846f2cee72..02062448624b 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freefonts
PORTVERSION= 0.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-fonts
MASTER_SITES= http://download.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/gnu/%SUBDIR%/ \
@@ -28,8 +28,6 @@ RESTRICTED= License prohibits redistribution; see individual .license files
NO_WRKSUBDIR= yes
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/freefont
-
do-build:
@cd ${WRKSRC}/freefont && ${LOCALBASE}/bin/type1inst -silent -quiet -nolog >/dev/null 2>&1
@${RM} ${WRKSRC}/freefont/Fontmap.bak
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 435ae80da9a6..89bb07ecc6e0 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gemini
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://www.brama.com/compute/unix/
PKGNAMEPREFIX= koi8-u-
@@ -14,19 +14,17 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Ukrainian KOI8 fonts for X11R6 (koi8-u)
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-USES= perl5 tar:tgz
+USES= fonts perl5 tar:tgz
USE_PERL5= build
USE_XORG= x11
NO_WRKSUBDIR= yes
-
-MAKE_ARGS+= -j 2
+FONTNAME= koi8-u-gemini
post-patch:
${REINPLACE_CMD} -e 's/\.Z/.gz/g' \
- -e 's|DESTDIR =.*|MDESTDIR=${STAGEDIR}${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \
+ -e 's|DESTDIR =.*|MDESTDIR=${STAGEDIR}${FONTSDIR}|' \
${WRKSRC}/Makefile
# This will allow one to use just this fonts for both, the Ukrainian
@@ -46,4 +44,7 @@ post-build:
print $$2 " " name; \
}' < ${WRKSRC}/fonts.dir >> ${WRKSRC}/fonts.alias
+pre-install:
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+
.include <bsd.port.mk>
diff --git a/x11-fonts/geminifonts/pkg-message b/x11-fonts/geminifonts/pkg-message
index 0e0b305c06a5..a113f3a5fd14 100644
--- a/x11-fonts/geminifonts/pkg-message
+++ b/x11-fonts/geminifonts/pkg-message
@@ -1,6 +1,6 @@
For your X-server to use the fonts, you have to add
- the ${LOCALBASE}/lib/X11/fonts/koi8-u-gemini (LOCALBASE is,
+ the ${LOCALBASE}/share/fonts/koi8-u-gemini (LOCALBASE is,
usually, /usr/local) to the server's font-path. Use
``xset fp+'' to do this for the current X-session and
consult your X-server's documentation to make this
diff --git a/x11-fonts/geminifonts/pkg-plist b/x11-fonts/geminifonts/pkg-plist
index 3e9f14654cc0..c2e2b372ba1f 100644
--- a/x11-fonts/geminifonts/pkg-plist
+++ b/x11-fonts/geminifonts/pkg-plist
@@ -1,72 +1,70 @@
-lib/X11/fonts/koi8-u-gemini/gem1c.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1cb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1cbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1co.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1h.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1hb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1hbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1ho.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1t.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1tb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1tbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem1to.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2c.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2cb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2cbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2co.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2h.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2hb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2hbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2ho.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2t.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2tb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2tbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem2to.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3c.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3cb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3cbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3co.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3h.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3hb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3hbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3ho.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3t.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3tb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3tbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem3to.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem4h.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem4hb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem4hbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem4ho.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem4t.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem4tb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem4tbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem4to.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem5h.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem5hb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem5hbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem5ho.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem5t.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem5tb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem5tbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem5to.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem6h.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem6hb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem6hbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem6ho.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem6t.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem6tb.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem6tbo.pcf.gz
-lib/X11/fonts/koi8-u-gemini/gem6to.pcf.gz
-lib/X11/fonts/koi8-u-gemini/fonts.alias
-lib/X11/fonts/koi8-u-gemini/fonts.dir
-lib/X11/fonts/koi8-u-gemini/koi10x16b.pcf.gz
-lib/X11/fonts/koi8-u-gemini/koi10x20.pcf.gz
-lib/X11/fonts/koi8-u-gemini/koi12x24.pcf.gz
-lib/X11/fonts/koi8-u-gemini/koi6x10.pcf.gz
-lib/X11/fonts/koi8-u-gemini/koi6x13.pcf.gz
-lib/X11/fonts/koi8-u-gemini/koi8x13.pcf.gz
-lib/X11/fonts/koi8-u-gemini/koi9x15.pcf.gz
-lib/X11/fonts/koi8-u-gemini/koinil2.pcf.gz
-@unexec rm -f %D/lib/X11/fonts/koi8-u-gemini/fonts.cache-*
-@dirrm lib/X11/fonts/koi8-u-gemini
+%%FONTSDIR%%/gem1c.pcf.gz
+%%FONTSDIR%%/gem1cb.pcf.gz
+%%FONTSDIR%%/gem1cbo.pcf.gz
+%%FONTSDIR%%/gem1co.pcf.gz
+%%FONTSDIR%%/gem1h.pcf.gz
+%%FONTSDIR%%/gem1hb.pcf.gz
+%%FONTSDIR%%/gem1hbo.pcf.gz
+%%FONTSDIR%%/gem1ho.pcf.gz
+%%FONTSDIR%%/gem1t.pcf.gz
+%%FONTSDIR%%/gem1tb.pcf.gz
+%%FONTSDIR%%/gem1tbo.pcf.gz
+%%FONTSDIR%%/gem1to.pcf.gz
+%%FONTSDIR%%/gem2c.pcf.gz
+%%FONTSDIR%%/gem2cb.pcf.gz
+%%FONTSDIR%%/gem2cbo.pcf.gz
+%%FONTSDIR%%/gem2co.pcf.gz
+%%FONTSDIR%%/gem2h.pcf.gz
+%%FONTSDIR%%/gem2hb.pcf.gz
+%%FONTSDIR%%/gem2hbo.pcf.gz
+%%FONTSDIR%%/gem2ho.pcf.gz
+%%FONTSDIR%%/gem2t.pcf.gz
+%%FONTSDIR%%/gem2tb.pcf.gz
+%%FONTSDIR%%/gem2tbo.pcf.gz
+%%FONTSDIR%%/gem2to.pcf.gz
+%%FONTSDIR%%/gem3c.pcf.gz
+%%FONTSDIR%%/gem3cb.pcf.gz
+%%FONTSDIR%%/gem3cbo.pcf.gz
+%%FONTSDIR%%/gem3co.pcf.gz
+%%FONTSDIR%%/gem3h.pcf.gz
+%%FONTSDIR%%/gem3hb.pcf.gz
+%%FONTSDIR%%/gem3hbo.pcf.gz
+%%FONTSDIR%%/gem3ho.pcf.gz
+%%FONTSDIR%%/gem3t.pcf.gz
+%%FONTSDIR%%/gem3tb.pcf.gz
+%%FONTSDIR%%/gem3tbo.pcf.gz
+%%FONTSDIR%%/gem3to.pcf.gz
+%%FONTSDIR%%/gem4h.pcf.gz
+%%FONTSDIR%%/gem4hb.pcf.gz
+%%FONTSDIR%%/gem4hbo.pcf.gz
+%%FONTSDIR%%/gem4ho.pcf.gz
+%%FONTSDIR%%/gem4t.pcf.gz
+%%FONTSDIR%%/gem4tb.pcf.gz
+%%FONTSDIR%%/gem4tbo.pcf.gz
+%%FONTSDIR%%/gem4to.pcf.gz
+%%FONTSDIR%%/gem5h.pcf.gz
+%%FONTSDIR%%/gem5hb.pcf.gz
+%%FONTSDIR%%/gem5hbo.pcf.gz
+%%FONTSDIR%%/gem5ho.pcf.gz
+%%FONTSDIR%%/gem5t.pcf.gz
+%%FONTSDIR%%/gem5tb.pcf.gz
+%%FONTSDIR%%/gem5tbo.pcf.gz
+%%FONTSDIR%%/gem5to.pcf.gz
+%%FONTSDIR%%/gem6h.pcf.gz
+%%FONTSDIR%%/gem6hb.pcf.gz
+%%FONTSDIR%%/gem6hbo.pcf.gz
+%%FONTSDIR%%/gem6ho.pcf.gz
+%%FONTSDIR%%/gem6t.pcf.gz
+%%FONTSDIR%%/gem6tb.pcf.gz
+%%FONTSDIR%%/gem6tbo.pcf.gz
+%%FONTSDIR%%/gem6to.pcf.gz
+%%FONTSDIR%%/fonts.alias
+@comment %%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/koi10x16b.pcf.gz
+%%FONTSDIR%%/koi10x20.pcf.gz
+%%FONTSDIR%%/koi12x24.pcf.gz
+%%FONTSDIR%%/koi6x10.pcf.gz
+%%FONTSDIR%%/koi6x13.pcf.gz
+%%FONTSDIR%%/koi8x13.pcf.gz
+%%FONTSDIR%%/koi9x15.pcf.gz
+%%FONTSDIR%%/koinil2.pcf.gz
diff --git a/x11-fonts/gnu-unifont-ttf/Makefile b/x11-fonts/gnu-unifont-ttf/Makefile
index 58906af935e6..f67da54e3778 100644
--- a/x11-fonts/gnu-unifont-ttf/Makefile
+++ b/x11-fonts/gnu-unifont-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gnu-unifont-ttf
PORTVERSION= 7.0.03
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -11,26 +12,20 @@ DISTNAME= unifont-${PORTVERSION}
MAINTAINER= bsdports@gmail.com
COMMENT= Unicode TrueType Font
-BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+USES= fonts
NO_BUILD= yes
-FONTSDIR= lib/X11/fonts/unifont
-INSTALLDIR= ${STAGEDIR}${PREFIX}/${FONTSDIR}
-PLIST_SUB= FONTSDIR="${FONTSDIR}"
WRKSRC_SUBDIR= font/precompiled
do-install:
- @${MKDIR} ${INSTALLDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
${INSTALL_DATA} ${WRKSRC}/unifont-${PORTVERSION}.ttf \
- ${INSTALLDIR}/unifont.ttf
+ ${STAGEDIR}${FONTSDIR}/unifont.ttf
${INSTALL_DATA} ${WRKSRC}/unifont_csur-${PORTVERSION}.ttf \
- ${INSTALLDIR}/unifont_csur.ttf
+ ${STAGEDIR}${FONTSDIR}/unifont_csur.ttf
${INSTALL_DATA} ${WRKSRC}/unifont_upper-${PORTVERSION}.ttf \
- ${INSTALLDIR}/unifont_upper.ttf
+ ${STAGEDIR}${FONTSDIR}/unifont_upper.ttf
${INSTALL_DATA} ${WRKSRC}/unifont_upper_csur-${PORTVERSION}.ttf \
- ${INSTALLDIR}/unifont_upper_csur.ttf
- ${LOCALBASE}/bin/mkfontscale ${INSTALLDIR}
- ${LOCALBASE}/bin/mkfontdir ${INSTALLDIR}
+ ${STAGEDIR}${FONTSDIR}/unifont_upper_csur.ttf
.include <bsd.port.mk>
diff --git a/x11-fonts/gnu-unifont-ttf/pkg-plist b/x11-fonts/gnu-unifont-ttf/pkg-plist
index f7f38114b4ba..f4701aefec45 100644
--- a/x11-fonts/gnu-unifont-ttf/pkg-plist
+++ b/x11-fonts/gnu-unifont-ttf/pkg-plist
@@ -1,5 +1,3 @@
-%%FONTSDIR%%/fonts.dir
-%%FONTSDIR%%/fonts.scale
%%FONTSDIR%%/unifont.ttf
%%FONTSDIR%%/unifont_csur.ttf
%%FONTSDIR%%/unifont_upper.ttf
diff --git a/x11-fonts/gnu-unifont/Makefile b/x11-fonts/gnu-unifont/Makefile
index 394aac3cedc9..54e035e03c72 100644
--- a/x11-fonts/gnu-unifont/Makefile
+++ b/x11-fonts/gnu-unifont/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gnu-unifont
PORTVERSION= 7.0.03
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -13,16 +14,14 @@ EXTRACT_ONLY=
MAINTAINER= bsdports@gmail.com
COMMENT= Unicode Font
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+USES= fonts
NO_BUILD= yes
-PLIST_FILES= "@unexec mkfontdir %D/lib/X11/fonts/local 2>/dev/null || true" \
- lib/X11/fonts/local/unifont.pcf.gz \
- "@exec mkfontdir %D/lib/X11/fonts/local 2>/dev/null || true"
+PLIST_FILES= ${FONTSDIR}/unifont.pcf.gz
do-install:
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
${INSTALL_DATA} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/local/unifont.pcf.gz
+ ${STAGEDIR}${FONTSDIR}/unifont.pcf.gz
.include <bsd.port.mk>
diff --git a/x11-fonts/gohufont/Makefile b/x11-fonts/gohufont/Makefile
index aa16921dfbb7..96eb9888c09e 100644
--- a/x11-fonts/gohufont/Makefile
+++ b/x11-fonts/gohufont/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gohufont
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://font.gohu.org/
@@ -14,12 +14,11 @@ LICENSE_NAME= Do What The Fuck You Want To Public License, Version 2
LICENSE_FILE= ${WRKSRC}/COPYING-LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-FONTDIR= lib/X11/fonts/${PORTNAME}
+USES= fonts
NO_BUILD= yes
-PLIST_SUB= FONTDIR=${FONTDIR}
do-install:
- ${MKDIR} ${STAGEDIR}${LOCALBASE}/${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${LOCALBASE}/${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/gohufont/pkg-plist b/x11-fonts/gohufont/pkg-plist
index c90d8d05cfb9..c37c16850377 100644
--- a/x11-fonts/gohufont/pkg-plist
+++ b/x11-fonts/gohufont/pkg-plist
@@ -1,8 +1,8 @@
-%%FONTDIR%%/gohufont-11.pcf.gz
-%%FONTDIR%%/gohufont-11b.pcf.gz
-%%FONTDIR%%/gohufont-14.pcf.gz
-%%FONTDIR%%/gohufont-14b.pcf.gz
-%%FONTDIR%%/gohufont-uni-11.pcf.gz
-%%FONTDIR%%/gohufont-uni-11b.pcf.gz
-%%FONTDIR%%/gohufont-uni-14.pcf.gz
-%%FONTDIR%%/gohufont-uni-14b.pcf.gz
+%%FONTSDIR%%/gohufont-11.pcf.gz
+%%FONTSDIR%%/gohufont-11b.pcf.gz
+%%FONTSDIR%%/gohufont-14.pcf.gz
+%%FONTSDIR%%/gohufont-14b.pcf.gz
+%%FONTSDIR%%/gohufont-uni-11.pcf.gz
+%%FONTSDIR%%/gohufont-uni-11b.pcf.gz
+%%FONTSDIR%%/gohufont-uni-14.pcf.gz
+%%FONTSDIR%%/gohufont-uni-14b.pcf.gz
diff --git a/x11-fonts/hanazono-fonts-ttf/Makefile b/x11-fonts/hanazono-fonts-ttf/Makefile
index 3e3b6e1d252f..ae1c5be2a167 100644
--- a/x11-fonts/hanazono-fonts-ttf/Makefile
+++ b/x11-fonts/hanazono-fonts-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= hanazono-fonts-ttf
PORTVERSION= 20131208
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= SFJP
MASTER_SITE_SUBDIR= hanazono-font/60001
@@ -13,26 +14,16 @@ COMMENT= CJK Mincho-typeface developed by Hanazono University
LICENSE= OFL11
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
-USES= zip
+USES= fonts zip
+NO_BUILD= yes
NO_WRKSUBDIR= yes
-FONTDIR= lib/X11/fonts/Hana
-PKGMESSAGE= ${WRKDIR}/pkg-message
-PLIST_SUB= FONTDIR=${FONTDIR}
+FONTNAME= Hana
SUB_FILES= pkg-message
-SUB_LIST= FONTDIR=${FONTDIR}
-
-do-build:
- @cd ${WRKSRC}/ && \
- ${LOCALBASE}/bin/mkfontscale && \
- ${LOCALBASE}/bin/mkfontdir
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}/
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
cd ${WRKSRC}/ && \
- ${INSTALL_DATA} *.ttf fonts.* ${STAGEDIR}${PREFIX}/${FONTDIR}/
+ ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/hanazono-fonts-ttf/pkg-plist b/x11-fonts/hanazono-fonts-ttf/pkg-plist
index fb7b7749c3eb..6bcb4948dd55 100644
--- a/x11-fonts/hanazono-fonts-ttf/pkg-plist
+++ b/x11-fonts/hanazono-fonts-ttf/pkg-plist
@@ -1,4 +1,2 @@
-%%FONTDIR%%/HanaMinA.ttf
-%%FONTDIR%%/HanaMinB.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
+%%FONTSDIR%%/HanaMinA.ttf
+%%FONTSDIR%%/HanaMinB.ttf
diff --git a/x11-fonts/inconsolata-lgc-ttf/Makefile b/x11-fonts/inconsolata-lgc-ttf/Makefile
index c9d7c0558d24..2251abf28b87 100644
--- a/x11-fonts/inconsolata-lgc-ttf/Makefile
+++ b/x11-fonts/inconsolata-lgc-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Inconsolata-LGC
PORTVERSION= 20131024
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= rum1cro@yandex.ru
@@ -15,25 +16,19 @@ GH_ACCOUNT= DeLaGuardo
GH_COMMIT= 16e2c94
GH_TAGNAME= ${GH_COMMIT}
+USES= fonts
USE_XORG= x11
-INSTALLS_TTF= yes
NO_BUILD= yes
-FONTDIR= TTF
+FONTNAME= TTF
-PLIST_FILES= lib/X11/fonts/${FONTDIR}/inconsolatalgc.ttf \
- lib/X11/fonts/${FONTDIR}/inconsolatalgcbold.ttf \
- lib/X11/fonts/${FONTDIR}/inconsolatalgcbolditalic.ttf \
- lib/X11/fonts/${FONTDIR}/inconsolatalgcitalic.ttf
+PLIST_FILES= ${FONTSDIR}/inconsolatalgc.ttf \
+ ${FONTSDIR}/inconsolatalgcbold.ttf \
+ ${FONTSDIR}/inconsolatalgcbolditalic.ttf \
+ ${FONTSDIR}/inconsolatalgcitalic.ttf
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/inconsolatalgc.ttf \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/inconsolatalgcbold.ttf \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/inconsolatalgcbolditalic.ttf \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/inconsolatalgcitalic.ttf \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf \
+ ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/indic-ttf/Makefile b/x11-fonts/indic-ttf/Makefile
index ea88fea29c4e..cb9da1e60c04 100644
--- a/x11-fonts/indic-ttf/Makefile
+++ b/x11-fonts/indic-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= indic-ttf
PORTVERSION= 0.5.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= DEBIAN/pool/main/t/ttf-indic-fonts
PKGNAMESUFFIX= -fonts
@@ -12,102 +12,27 @@ DISTNAME= ${PORTNAME:C|(.*)-(.*)|\2-\1|}${PKGNAMESUFFIX}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of truetype Indic fonts
-BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
- fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
WRKSRC= ${WRKDIR}/${DISTNAME:S|_|-|}
+USES= fonts
NO_BUILD= yes
-OPTIONS_SUB= yes
-OPTIONS_MULTI= FONTS
-OPTIONS_MULTI_FONTS= BENGALI DEVANAGARI GUJARATI KANNADA MALAYALAM \
- ORIYA PUNJABI TAMIL TELUGU
-OPTIONS_DEFAULT= BENGALI DEVANAGARI GUJARATI KANNADA MALAYALAM \
- ORIYA PUNJABI TAMIL TELUGU
-
-BENGALI_DESC= BENGALI font set
-DEVANAGARI_DESC= DEVANAGARI font set
-GUJARATI_DESC= GUJARATI font set
-KANNADA_DESC= KANNADA font set
-MALAYALAM_DESC= MALAYALAM font set
-ORIYA_DESC= ORIYA font set
-PUNJABI_DESC= PUNJABI font set
-TAMIL_DESC= TAMIL font set
-TELUGU_DESC= TELUGU font set
-
FONTSNAME= indic-ttf
-FONTLOC?= lib/X11/fonts/indic-ttf
-FONTSDIR= ${PREFIX}/${FONTLOC}
-
CONFAVLOC?= etc/fonts/conf.avail
CONFAVAILDIR= ${PREFIX}/${CONFAVLOC}
-PLIST_SUB= FONTSDIR=${FONTLOC} \
- CONFAVAILDIR=${CONFAVLOC} \
- FCCACHE='${FCCACHE}'
+PLIST_SUB= CONFAVAILDIR=${CONFAVLOC}
SUB_FILES= pkg-message
-SUB_LIST= FONTSDIR=${FONTSDIR} \
- CONFAVAILDIR=${CONFAVAILDIR}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBENGALI}
-FONTS+= bengali
-.endif
-
-.if ${PORT_OPTIONS:MDEVANAGARI}
-FONTS+= devanagari
-.endif
-
-.if ${PORT_OPTIONS:MGUJARATI}
-FONTS+= gujarati
-.endif
-
-.if ${PORT_OPTIONS:MKANNADA}
-FONTS+= kannada
-.endif
-
-.if ${PORT_OPTIONS:MMALAYALAM}
-FONTS+= malayalam
-.endif
-
-.if ${PORT_OPTIONS:MORIYA}
-FONTS+= oriya
-.endif
-
-.if ${PORT_OPTIONS:MPUNJABI}
-FONTS+= punjabi
-.endif
-
-.if ${PORT_OPTIONS:MTAMIL}
-FONTS+= tamil
-.endif
-
-.if ${PORT_OPTIONS:MTELUGU}
-FONTS+= telugu
-.endif
-
-SUB_LIST+= FONTS="${FONTS}"
-
-do-install: install-fonts install-conf
-
-install-fonts:
-.for f in ${FONTS}
- ${MKDIR} ${STAGEDIR}${FONTSDIR}/${f}
- ${INSTALL_DATA} ${WRKSRC}/ttf-${f}/*.ttf ${STAGEDIR}${FONTSDIR}/${f}
- ${INSTALL_DATA} ${WRKSRC}/debian/ttf-${f}${PKGNAMESUFFIX}.copyright \
- ${STAGEDIR}${FONTSDIR}/${f}
-.endfor
+SUB_LIST= CONFAVAILDIR=${CONFAVAILDIR}
-install-conf:
+do-install:
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/ttf-*/*.ttf ${STAGEDIR}${FONTSDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/debian/ttf-*${PKGNAMESUFFIX}.copyright \
+ ${STAGEDIR}${FONTSDIR}/
${MKDIR} ${STAGEDIR}${CONFAVAILDIR}
-.for f in ${FONTS}
- ${INSTALL_DATA} ${WRKSRC}/ttf-${f}/90-ttf-${f}${PKGNAMESUFFIX}.conf \
+ ${INSTALL_DATA} ${WRKSRC}/ttf-*/90-ttf-*.conf \
${STAGEDIR}${CONFAVAILDIR}/
-.endfor
.include <bsd.port.mk>
diff --git a/x11-fonts/indic-ttf/pkg-plist b/x11-fonts/indic-ttf/pkg-plist
index 8912da8d8449..256e0860a49d 100644
--- a/x11-fonts/indic-ttf/pkg-plist
+++ b/x11-fonts/indic-ttf/pkg-plist
@@ -1,85 +1,77 @@
-%%BENGALI%%%%CONFAVAILDIR%%/90-ttf-bengali-fonts.conf
-%%DEVANAGARI%%%%CONFAVAILDIR%%/90-ttf-devanagari-fonts.conf
-%%GUJARATI%%%%CONFAVAILDIR%%/90-ttf-gujarati-fonts.conf
-%%KANNADA%%%%CONFAVAILDIR%%/90-ttf-kannada-fonts.conf
-%%MALAYALAM%%%%CONFAVAILDIR%%/90-ttf-malayalam-fonts.conf
-%%ORIYA%%%%CONFAVAILDIR%%/90-ttf-oriya-fonts.conf
-%%PUNJABI%%%%CONFAVAILDIR%%/90-ttf-punjabi-fonts.conf
-%%TAMIL%%%%CONFAVAILDIR%%/90-ttf-tamil-fonts.conf
-%%TELUGU%%%%CONFAVAILDIR%%/90-ttf-telugu-fonts.conf
-%%BENGALI%%%%FONTSDIR%%/bengali/JamrulNormal.ttf
-%%BENGALI%%%%FONTSDIR%%/bengali/LikhanNormal.ttf
-%%BENGALI%%%%FONTSDIR%%/bengali/MuktiNarrow.ttf
-%%BENGALI%%%%FONTSDIR%%/bengali/MuktiNarrowBold.ttf
-%%BENGALI%%%%FONTSDIR%%/bengali/ani.ttf
-%%BENGALI%%%%FONTSDIR%%/bengali/lohit_as.ttf
-%%BENGALI%%%%FONTSDIR%%/bengali/lohit_bn.ttf
-%%BENGALI%%%%FONTSDIR%%/bengali/mitra.ttf
-%%BENGALI%%%%FONTSDIR%%/bengali/ttf-bengali-fonts.copyright
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/Samyak-Devanagari.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/Sarai_07.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/chandas1-2.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/gargi.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/kalimati.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_hi.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_kok.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_ks.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_mai.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_mr.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_ne.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_sd.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/nakula.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/sahadeva.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/samanata.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/ttf-devanagari-fonts.copyright
-%%GUJARATI%%%%FONTSDIR%%/gujarati/Rekha.ttf
-%%GUJARATI%%%%FONTSDIR%%/gujarati/Samyak-Gujarati.ttf
-%%GUJARATI%%%%FONTSDIR%%/gujarati/aakar-medium.ttf
-%%GUJARATI%%%%FONTSDIR%%/gujarati/lohit_gu.ttf
-%%GUJARATI%%%%FONTSDIR%%/gujarati/padmaa-Bold.1.1.ttf
-%%GUJARATI%%%%FONTSDIR%%/gujarati/padmaa-Medium-0.5.ttf
-%%GUJARATI%%%%FONTSDIR%%/gujarati/padmaa.ttf
-%%GUJARATI%%%%FONTSDIR%%/gujarati/ttf-gujarati-fonts.copyright
-%%KANNADA%%%%FONTSDIR%%/kannada/Kedage-b.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/Kedage-i.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/Kedage-n.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/Kedage-t.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/Malige-b.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/Malige-i.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/Malige-n.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/Malige-t.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/lohit_kn.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/ttf-kannada-fonts.copyright
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/AnjaliOldLipi.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/Dyuthi3.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/Kalyani121.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/Meera_04.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/Rachana_04.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/RaghuMalayalamSans2.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/Samyak-Malayalam.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/lohit_ml.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/suruma2.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/ttf-malayalam-fonts.copyright
-%%ORIYA%%%%FONTSDIR%%/oriya/Samyak-Oriya.ttf
-%%ORIYA%%%%FONTSDIR%%/oriya/lohit_or.ttf
-%%ORIYA%%%%FONTSDIR%%/oriya/ttf-oriya-fonts.copyright
-%%ORIYA%%%%FONTSDIR%%/oriya/utkal.ttf
-%%PUNJABI%%%%FONTSDIR%%/punjabi/Saab.ttf
-%%PUNJABI%%%%FONTSDIR%%/punjabi/lohit_pa.ttf
-%%PUNJABI%%%%FONTSDIR%%/punjabi/ttf-punjabi-fonts.copyright
-%%TAMIL%%%%FONTSDIR%%/tamil/Samyak-Tamil.ttf
-%%TAMIL%%%%FONTSDIR%%/tamil/lohit_ta.ttf
-%%TAMIL%%%%FONTSDIR%%/tamil/ttf-tamil-fonts.copyright
-%%TELUGU%%%%FONTSDIR%%/telugu/Pothana2000.ttf
-%%TELUGU%%%%FONTSDIR%%/telugu/Vemana.ttf
-%%TELUGU%%%%FONTSDIR%%/telugu/lohit_te.ttf
-%%TELUGU%%%%FONTSDIR%%/telugu/ttf-telugu-fonts.copyright
-%%TELUGU%%@fcfontsdir %%FONTSDIR%%/telugu
-%%TAMIL%%@fcfontsdir %%FONTSDIR%%/tamil
-%%PUNJABI%%@fcfontsdir %%FONTSDIR%%/punjabi
-%%ORIYA%%@fcfontsdir %%FONTSDIR%%/oriya
-%%MALAYALAM%%@fcfontsdir %%FONTSDIR%%/malayalam
-%%KANNADA%%@fcfontsdir %%FONTSDIR%%/kannada
-%%GUJARATI%%@fcfontsdir %%FONTSDIR%%/gujarati
-%%DEVANAGARI%%@fcfontsdir %%FONTSDIR%%/devanagari
-%%BENGALI%%@fcfontsdir %%FONTSDIR%%/bengali
+%%CONFAVAILDIR%%/90-ttf-bengali-fonts.conf
+%%CONFAVAILDIR%%/90-ttf-devanagari-fonts.conf
+%%CONFAVAILDIR%%/90-ttf-gujarati-fonts.conf
+%%CONFAVAILDIR%%/90-ttf-kannada-fonts.conf
+%%CONFAVAILDIR%%/90-ttf-malayalam-fonts.conf
+%%CONFAVAILDIR%%/90-ttf-oriya-fonts.conf
+%%CONFAVAILDIR%%/90-ttf-punjabi-fonts.conf
+%%CONFAVAILDIR%%/90-ttf-tamil-fonts.conf
+%%CONFAVAILDIR%%/90-ttf-telugu-fonts.conf
+%%FONTSDIR%%/JamrulNormal.ttf
+%%FONTSDIR%%/LikhanNormal.ttf
+%%FONTSDIR%%/MuktiNarrow.ttf
+%%FONTSDIR%%/MuktiNarrowBold.ttf
+%%FONTSDIR%%/ani.ttf
+%%FONTSDIR%%/lohit_as.ttf
+%%FONTSDIR%%/lohit_bn.ttf
+%%FONTSDIR%%/mitra.ttf
+%%FONTSDIR%%/ttf-bengali-fonts.copyright
+%%FONTSDIR%%/Samyak-Devanagari.ttf
+%%FONTSDIR%%/Sarai_07.ttf
+%%FONTSDIR%%/chandas1-2.ttf
+%%FONTSDIR%%/gargi.ttf
+%%FONTSDIR%%/kalimati.ttf
+%%FONTSDIR%%/lohit_hi.ttf
+%%FONTSDIR%%/lohit_kok.ttf
+%%FONTSDIR%%/lohit_ks.ttf
+%%FONTSDIR%%/lohit_mai.ttf
+%%FONTSDIR%%/lohit_mr.ttf
+%%FONTSDIR%%/lohit_ne.ttf
+%%FONTSDIR%%/lohit_sd.ttf
+%%FONTSDIR%%/nakula.ttf
+%%FONTSDIR%%/sahadeva.ttf
+%%FONTSDIR%%/samanata.ttf
+%%FONTSDIR%%/ttf-devanagari-fonts.copyright
+%%FONTSDIR%%/Rekha.ttf
+%%FONTSDIR%%/Samyak-Gujarati.ttf
+%%FONTSDIR%%/aakar-medium.ttf
+%%FONTSDIR%%/lohit_gu.ttf
+%%FONTSDIR%%/padmaa-Bold.1.1.ttf
+%%FONTSDIR%%/padmaa-Medium-0.5.ttf
+%%FONTSDIR%%/padmaa.ttf
+%%FONTSDIR%%/ttf-gujarati-fonts.copyright
+%%FONTSDIR%%/Kedage-b.ttf
+%%FONTSDIR%%/Kedage-i.ttf
+%%FONTSDIR%%/Kedage-n.ttf
+%%FONTSDIR%%/Kedage-t.ttf
+%%FONTSDIR%%/Malige-b.ttf
+%%FONTSDIR%%/Malige-i.ttf
+%%FONTSDIR%%/Malige-n.ttf
+%%FONTSDIR%%/Malige-t.ttf
+%%FONTSDIR%%/lohit_kn.ttf
+%%FONTSDIR%%/ttf-kannada-fonts.copyright
+%%FONTSDIR%%/AnjaliOldLipi.ttf
+%%FONTSDIR%%/Dyuthi3.ttf
+%%FONTSDIR%%/Kalyani121.ttf
+%%FONTSDIR%%/Meera_04.ttf
+%%FONTSDIR%%/Rachana_04.ttf
+%%FONTSDIR%%/RaghuMalayalamSans2.ttf
+%%FONTSDIR%%/Samyak-Malayalam.ttf
+%%FONTSDIR%%/lohit_ml.ttf
+%%FONTSDIR%%/suruma2.ttf
+%%FONTSDIR%%/ttf-malayalam-fonts.copyright
+%%FONTSDIR%%/Samyak-Oriya.ttf
+%%FONTSDIR%%/lohit_or.ttf
+%%FONTSDIR%%/ttf-oriya-fonts.copyright
+%%FONTSDIR%%/utkal.ttf
+%%FONTSDIR%%/Saab.ttf
+%%FONTSDIR%%/lohit_pa.ttf
+%%FONTSDIR%%/ttf-punjabi-fonts.copyright
+%%FONTSDIR%%/Samyak-Tamil.ttf
+%%FONTSDIR%%/lohit_ta.ttf
+%%FONTSDIR%%/ttf-tamil-fonts.copyright
+%%FONTSDIR%%/Pothana2000.ttf
+%%FONTSDIR%%/Vemana.ttf
+%%FONTSDIR%%/lohit_te.ttf
+%%FONTSDIR%%/ttf-telugu-fonts.copyright
+%%FONTSDIR%%/ttf-indic-fonts.copyright
diff --git a/x11-fonts/isabella/Makefile b/x11-fonts/isabella/Makefile
index e9b80f0e91c5..1a71784834a9 100644
--- a/x11-fonts/isabella/Makefile
+++ b/x11-fonts/isabella/Makefile
@@ -3,7 +3,7 @@
PORTNAME= isabella-ttf
PORTVERSION= 1.202
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.thibault.org/fonts/isabella/
DISTNAME= Isabella-${PORTVERSION}-ttf
@@ -13,17 +13,13 @@ COMMENT= Font by John Stracke based on the Isabella Breviary
OPTIONS_DEFINE= DOCS
-RUN_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-
+USES= fonts
NO_BUILD= yes
WRKSRC= ${WRKDIR}/Isabella
-FONTDIR= ${PREFIX}/lib/X11/fonts/stracke
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
do-install:
- ${MKDIR} ${STAGEDIR}${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
diff --git a/x11-fonts/isabella/pkg-plist b/x11-fonts/isabella/pkg-plist
index eede2204542e..f2c658d37441 100644
--- a/x11-fonts/isabella/pkg-plist
+++ b/x11-fonts/isabella/pkg-plist
@@ -1,3 +1,2 @@
-%%FONTDIR%%/Isabella.ttf
-@fontsdir %%FONTDIR%%
+%%FONTSDIR%%/Isabella.ttf
%%PORTDOCS%%%%DOCSDIR%%/README.txt
diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile
index 58c60dcf65f5..93a46018e3d7 100644
--- a/x11-fonts/jmk-x11-fonts/Makefile
+++ b/x11-fonts/jmk-x11-fonts/Makefile
@@ -2,7 +2,7 @@
PORTNAME= jmk-x11-fonts
PORTVERSION= 3.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= http://www.jmknoble.net/fonts/
@@ -14,8 +14,6 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
USES= fonts imake
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-
do-install:
@${MKDIR} ${STAGEDIR}${FONTSDIR}
${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile
index 71b13d9e2b08..71481dd9ea6e 100644
--- a/x11-fonts/junicode/Makefile
+++ b/x11-fonts/junicode/Makefile
@@ -3,7 +3,7 @@
PORTNAME= junicode
PORTVERSION= 0.7.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S|.|-|g} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
@@ -18,11 +18,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
USES= fonts zip
-FONTSDIR?= lib/X11/fonts/${PORTNAME}
-
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${STAGEDIR}${FONTSDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
diff --git a/x11-fonts/khmeros/Makefile b/x11-fonts/khmeros/Makefile
index 582562d9c7ea..abb1e4b2c08a 100644
--- a/x11-fonts/khmeros/Makefile
+++ b/x11-fonts/khmeros/Makefile
@@ -14,14 +14,13 @@ COMMENT= Khmer OS fonts
USES= fonts zip
NO_BUILD= yes
-FONTSDIR= lib/X11/fonts/Khmer
-PLIST_SUB+= FONTSDIR=${FONTSDIR}
+FONTNAME= Khmer
post-patch:
${MV} "${WRKSRC}/KhmerOS .ttf" ${WRKSRC}/KhmerOS.ttf
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile
index 34e2b43d8246..a04edf6273aa 100644
--- a/x11-fonts/lfpfonts-fix/Makefile
+++ b/x11-fonts/lfpfonts-fix/Makefile
@@ -2,26 +2,20 @@
PORTNAME= lfpfonts-fix
PORTVERSION= 0.82
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= SF/xfonts/${PORTNAME}/${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Fixed width fonts from the Linux Font Project
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
WRKSRC= ${WRKDIR}/lfpfonts-fix
NO_BUILD= yes
-USES= tar:bzip2
-
-FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+USES= fonts tar:bzip2
do-install:
- @${MKDIR} ${STAGEDIR}${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/lfp-fix/*.pcf.gz ${STAGEDIR}${FONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/lfp-fix/*.pcf.gz ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/lfpfonts-fix/pkg-plist b/x11-fonts/lfpfonts-fix/pkg-plist
index 9ba378df2eb0..b3686a751620 100644
--- a/x11-fonts/lfpfonts-fix/pkg-plist
+++ b/x11-fonts/lfpfonts-fix/pkg-plist
@@ -1,74 +1,73 @@
-%%FONTDIR%%/antique-10-m-r.pcf.gz
-%%FONTDIR%%/artist-10-m-r-alt.pcf.gz
-%%FONTDIR%%/artist-10-m-r-serif.pcf.gz
-%%FONTDIR%%/artist-10-m-r.pcf.gz
-%%FONTDIR%%/artsie-09-m-r.pcf.gz
-%%FONTDIR%%/asimov-09-m-r.pcf.gz
-%%FONTDIR%%/bright-09-m-r.pcf.gz
-%%FONTDIR%%/cantor-10-m-r-sc.pcf.gz
-%%FONTDIR%%/cantor-10-m-r.pcf.gz
-%%FONTDIR%%/cntdown-09-m-r.pcf.gz
-%%FONTDIR%%/computer-09-m-r-alt.pcf.gz
-%%FONTDIR%%/computer-09-m-r.pcf.gz
-%%FONTDIR%%/computer-11-m-r.pcf.gz
-%%FONTDIR%%/escher-10-m-r.pcf.gz
-%%FONTDIR%%/eurotype-12-m-r.pcf.gz
-%%FONTDIR%%/feynman-10-m-r.pcf.gz
-%%FONTDIR%%/gagarin-10-m-i.pcf.gz
-%%FONTDIR%%/gagarin-10-m-r-sc.pcf.gz
-%%FONTDIR%%/gagarin-10-m-r.pcf.gz
-%%FONTDIR%%/gamow-05-m-r.pcf.gz
-%%FONTDIR%%/gamow-06-m-r.pcf.gz
-%%FONTDIR%%/gamow-07-b-i.pcf.gz
-%%FONTDIR%%/gamow-07-b-r.pcf.gz
-%%FONTDIR%%/gamow-07-m-i.pcf.gz
-%%FONTDIR%%/gamow-07-m-r-sc.pcf.gz
-%%FONTDIR%%/gamow-07-m-r.pcf.gz
-%%FONTDIR%%/gamow-08-b-i.pcf.gz
-%%FONTDIR%%/gamow-08-b-r.pcf.gz
-%%FONTDIR%%/gamow-08-m-i.pcf.gz
-%%FONTDIR%%/gamow-08-m-r-iso10646-1.pcf.gz
-%%FONTDIR%%/gamow-08-m-r-sc.pcf.gz
-%%FONTDIR%%/gamow-08-m-r.pcf.gz
-%%FONTDIR%%/gamow-09-b-i-sc.pcf.gz
-%%FONTDIR%%/gamow-09-b-i.pcf.gz
-%%FONTDIR%%/gamow-09-b-r-alt.pcf.gz
-%%FONTDIR%%/gamow-09-b-r-sc-alt.pcf.gz
-%%FONTDIR%%/gamow-09-b-r.pcf.gz
-%%FONTDIR%%/gamow-09-m-i-sc.pcf.gz
-%%FONTDIR%%/gamow-09-m-i.pcf.gz
-%%FONTDIR%%/gamow-09-m-r.pcf.gz
-%%FONTDIR%%/hollow-11-m-r.pcf.gz
-%%FONTDIR%%/julie-10-m-r.pcf.gz
-%%FONTDIR%%/kandinsky-08-m-r-alt.pcf.gz
-%%FONTDIR%%/kandinsky-09-m-r.pcf.gz
-%%FONTDIR%%/lomonosov-08-m-r.pcf.gz
-%%FONTDIR%%/lomonosov-10-m-r.pcf.gz
-%%FONTDIR%%/lucidaterminal-10-b-r.pcf.gz
-%%FONTDIR%%/lucidaterminal-10-m-r.pcf.gz
-%%FONTDIR%%/nexus-08-m-r.pcf.gz
-%%FONTDIR%%/noxis-08-m-r.pcf.gz
-%%FONTDIR%%/ocr-10-m-r.pcf.gz
-%%FONTDIR%%/shine-08-m-r.pcf.gz
-%%FONTDIR%%/smooth-09-m-r.pcf.gz
-%%FONTDIR%%/terminal-10-m-r-sc.pcf.gz
-%%FONTDIR%%/terminal-10-m-r.pcf.gz
-%%FONTDIR%%/terminal-16-m-r-iso10646-1.pcf.gz
-%%FONTDIR%%/terminal-16-m-r.pcf.gz
-%%FONTDIR%%/terminal-20-m-r-iso10646-1.pcf.gz
-%%FONTDIR%%/terminal-20-m-r.pcf.gz
-%%FONTDIR%%/thin-09-m-r.pcf.gz
-%%FONTDIR%%/tixus-08-m-r-alt.pcf.gz
-%%FONTDIR%%/tixus-08-m-r.pcf.gz
-%%FONTDIR%%/trachtenberg-11-m-r.pcf.gz
-%%FONTDIR%%/uniread-08-m-r-iso10646-1.pcf.gz
-%%FONTDIR%%/uniread-08-m-r-koi8-r.pcf.gz
-%%FONTDIR%%/uniread-08-m-r.pcf.gz
-%%FONTDIR%%/uniread-09-m-i-iso10646-1.pcf.gz
-%%FONTDIR%%/uniread-09-m-i.pcf.gz
-%%FONTDIR%%/uniread-09-m-r-iso10646-1.pcf.gz
-%%FONTDIR%%/uniread-09-m-r-koi8-r.pcf.gz
-%%FONTDIR%%/uniread-09-m-r.pcf.gz
-%%FONTDIR%%/zin-09-m-r.pcf.gz
-%%FONTDIR%%/zin-09-t-r.pcf.gz
-@fontsdir %%FONTDIR%%
+%%FONTSDIR%%/antique-10-m-r.pcf.gz
+%%FONTSDIR%%/artist-10-m-r-alt.pcf.gz
+%%FONTSDIR%%/artist-10-m-r-serif.pcf.gz
+%%FONTSDIR%%/artist-10-m-r.pcf.gz
+%%FONTSDIR%%/artsie-09-m-r.pcf.gz
+%%FONTSDIR%%/asimov-09-m-r.pcf.gz
+%%FONTSDIR%%/bright-09-m-r.pcf.gz
+%%FONTSDIR%%/cantor-10-m-r-sc.pcf.gz
+%%FONTSDIR%%/cantor-10-m-r.pcf.gz
+%%FONTSDIR%%/cntdown-09-m-r.pcf.gz
+%%FONTSDIR%%/computer-09-m-r-alt.pcf.gz
+%%FONTSDIR%%/computer-09-m-r.pcf.gz
+%%FONTSDIR%%/computer-11-m-r.pcf.gz
+%%FONTSDIR%%/escher-10-m-r.pcf.gz
+%%FONTSDIR%%/eurotype-12-m-r.pcf.gz
+%%FONTSDIR%%/feynman-10-m-r.pcf.gz
+%%FONTSDIR%%/gagarin-10-m-i.pcf.gz
+%%FONTSDIR%%/gagarin-10-m-r-sc.pcf.gz
+%%FONTSDIR%%/gagarin-10-m-r.pcf.gz
+%%FONTSDIR%%/gamow-05-m-r.pcf.gz
+%%FONTSDIR%%/gamow-06-m-r.pcf.gz
+%%FONTSDIR%%/gamow-07-b-i.pcf.gz
+%%FONTSDIR%%/gamow-07-b-r.pcf.gz
+%%FONTSDIR%%/gamow-07-m-i.pcf.gz
+%%FONTSDIR%%/gamow-07-m-r-sc.pcf.gz
+%%FONTSDIR%%/gamow-07-m-r.pcf.gz
+%%FONTSDIR%%/gamow-08-b-i.pcf.gz
+%%FONTSDIR%%/gamow-08-b-r.pcf.gz
+%%FONTSDIR%%/gamow-08-m-i.pcf.gz
+%%FONTSDIR%%/gamow-08-m-r-iso10646-1.pcf.gz
+%%FONTSDIR%%/gamow-08-m-r-sc.pcf.gz
+%%FONTSDIR%%/gamow-08-m-r.pcf.gz
+%%FONTSDIR%%/gamow-09-b-i-sc.pcf.gz
+%%FONTSDIR%%/gamow-09-b-i.pcf.gz
+%%FONTSDIR%%/gamow-09-b-r-alt.pcf.gz
+%%FONTSDIR%%/gamow-09-b-r-sc-alt.pcf.gz
+%%FONTSDIR%%/gamow-09-b-r.pcf.gz
+%%FONTSDIR%%/gamow-09-m-i-sc.pcf.gz
+%%FONTSDIR%%/gamow-09-m-i.pcf.gz
+%%FONTSDIR%%/gamow-09-m-r.pcf.gz
+%%FONTSDIR%%/hollow-11-m-r.pcf.gz
+%%FONTSDIR%%/julie-10-m-r.pcf.gz
+%%FONTSDIR%%/kandinsky-08-m-r-alt.pcf.gz
+%%FONTSDIR%%/kandinsky-09-m-r.pcf.gz
+%%FONTSDIR%%/lomonosov-08-m-r.pcf.gz
+%%FONTSDIR%%/lomonosov-10-m-r.pcf.gz
+%%FONTSDIR%%/lucidaterminal-10-b-r.pcf.gz
+%%FONTSDIR%%/lucidaterminal-10-m-r.pcf.gz
+%%FONTSDIR%%/nexus-08-m-r.pcf.gz
+%%FONTSDIR%%/noxis-08-m-r.pcf.gz
+%%FONTSDIR%%/ocr-10-m-r.pcf.gz
+%%FONTSDIR%%/shine-08-m-r.pcf.gz
+%%FONTSDIR%%/smooth-09-m-r.pcf.gz
+%%FONTSDIR%%/terminal-10-m-r-sc.pcf.gz
+%%FONTSDIR%%/terminal-10-m-r.pcf.gz
+%%FONTSDIR%%/terminal-16-m-r-iso10646-1.pcf.gz
+%%FONTSDIR%%/terminal-16-m-r.pcf.gz
+%%FONTSDIR%%/terminal-20-m-r-iso10646-1.pcf.gz
+%%FONTSDIR%%/terminal-20-m-r.pcf.gz
+%%FONTSDIR%%/thin-09-m-r.pcf.gz
+%%FONTSDIR%%/tixus-08-m-r-alt.pcf.gz
+%%FONTSDIR%%/tixus-08-m-r.pcf.gz
+%%FONTSDIR%%/trachtenberg-11-m-r.pcf.gz
+%%FONTSDIR%%/uniread-08-m-r-iso10646-1.pcf.gz
+%%FONTSDIR%%/uniread-08-m-r-koi8-r.pcf.gz
+%%FONTSDIR%%/uniread-08-m-r.pcf.gz
+%%FONTSDIR%%/uniread-09-m-i-iso10646-1.pcf.gz
+%%FONTSDIR%%/uniread-09-m-i.pcf.gz
+%%FONTSDIR%%/uniread-09-m-r-iso10646-1.pcf.gz
+%%FONTSDIR%%/uniread-09-m-r-koi8-r.pcf.gz
+%%FONTSDIR%%/uniread-09-m-r.pcf.gz
+%%FONTSDIR%%/zin-09-m-r.pcf.gz
+%%FONTSDIR%%/zin-09-t-r.pcf.gz
diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile
index 4e3decb7aa3e..c76a0c4cb3cf 100644
--- a/x11-fonts/lfpfonts-var/Makefile
+++ b/x11-fonts/lfpfonts-var/Makefile
@@ -2,26 +2,20 @@
PORTNAME= lfpfonts-var
PORTVERSION= 0.83
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= SF/xfonts/${PORTNAME}/${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Variable width fonts from the Linux Font Project
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
WRKSRC= ${WRKDIR}/lfpfonts-var
NO_BUILD= yes
-USES= tar:bzip2
-
-FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+USES= fonts tar:bzip2
do-install:
- @${MKDIR} ${STAGEDIR}${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/lfp-var/*.pcf.gz ${STAGEDIR}${FONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/lfp-var/*.pcf.gz ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/lfpfonts-var/pkg-plist b/x11-fonts/lfpfonts-var/pkg-plist
index b6045365d526..b10587d34932 100644
--- a/x11-fonts/lfpfonts-var/pkg-plist
+++ b/x11-fonts/lfpfonts-var/pkg-plist
@@ -1,94 +1,93 @@
-%%FONTDIR%%/lomonosov-v-08-m-r.pcf.gz
-%%FONTDIR%%/lomonosov-v-10-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-05-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-i.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-sc-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-sc-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-sc-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r-sc.pcf.gz
-%%FONTDIR%%/uniread-v-05-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-07-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-i.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-07-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-i-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-i-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-09-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-i-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-i-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-i.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-w-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r-w.pcf.gz
-%%FONTDIR%%/uniread-v-09-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-10-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-10-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-10-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-10-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-i.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-10-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-i-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-i-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-i-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-12-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-12-bb-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-12-bb-r.pcf.gz
-%%FONTDIR%%/uniread-v-12-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-12-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-12-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-12-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-14-b-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-14-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-14-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-14-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-18-m-r-ISO8859-1.pcf.gz
-%%FONTDIR%%/uniread-v-18-m-r-ISO8859-5.pcf.gz
-%%FONTDIR%%/uniread-v-18-m-r-KOI8-R.pcf.gz
-%%FONTDIR%%/uniread-v-18-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-05-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-05-m-r-sc.pcf.gz
-%%FONTDIR%%/uniread-v-alt-05-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-06-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-06-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-08-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-08-m-r.pcf.gz
-%%FONTDIR%%/uniread-v-alt-14-b-i.pcf.gz
-%%FONTDIR%%/uniread-v-alt-14-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-s-10-b-r.pcf.gz
-%%FONTDIR%%/uniread-v-s-10-m-r.pcf.gz
-%%FONTDIR%%/vizing-06-b-r.pcf.gz
-%%FONTDIR%%/vizing-06-m-r.pcf.gz
-@fontsdir %%FONTDIR%%
+%%FONTSDIR%%/lomonosov-v-08-m-r.pcf.gz
+%%FONTSDIR%%/lomonosov-v-10-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-05-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-i.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-sc-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-sc-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-sc-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r-sc.pcf.gz
+%%FONTSDIR%%/uniread-v-05-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-07-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-i.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-07-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-i-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-i-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-09-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-i-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-i-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-i.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-w-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r-w.pcf.gz
+%%FONTSDIR%%/uniread-v-09-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-10-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-10-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-10-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-10-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-i.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-10-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-i-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-i-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-i-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-12-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-12-bb-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-12-bb-r.pcf.gz
+%%FONTSDIR%%/uniread-v-12-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-12-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-12-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-12-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-14-b-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-14-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-14-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-14-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-18-m-r-ISO8859-1.pcf.gz
+%%FONTSDIR%%/uniread-v-18-m-r-ISO8859-5.pcf.gz
+%%FONTSDIR%%/uniread-v-18-m-r-KOI8-R.pcf.gz
+%%FONTSDIR%%/uniread-v-18-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-05-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-05-m-r-sc.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-05-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-06-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-06-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-08-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-08-m-r.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-14-b-i.pcf.gz
+%%FONTSDIR%%/uniread-v-alt-14-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-s-10-b-r.pcf.gz
+%%FONTSDIR%%/uniread-v-s-10-m-r.pcf.gz
+%%FONTSDIR%%/vizing-06-b-r.pcf.gz
+%%FONTSDIR%%/vizing-06-m-r.pcf.gz
diff --git a/x11-fonts/linuxlibertine/Makefile b/x11-fonts/linuxlibertine/Makefile
index abe3f04bfb35..24f297991711 100644
--- a/x11-fonts/linuxlibertine/Makefile
+++ b/x11-fonts/linuxlibertine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= linuxlibertine
PORTVERSION= 4.7.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= SF
DISTNAME= LinLibertineFont-${PORTVERSION}-2
@@ -29,7 +29,6 @@ LICENSE_PERMS_OFL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
SUB_FILES= pkg-deinstall
WRKSRC= ${WRKDIR}/LinLibertine
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${PORTNAME}
NO_BUILD= yes
PORTDOCS= Bugs.txt \
diff --git a/x11-fonts/manu-gothica/Makefile b/x11-fonts/manu-gothica/Makefile
index 26bded8b0f2b..038aa6f6540d 100644
--- a/x11-fonts/manu-gothica/Makefile
+++ b/x11-fonts/manu-gothica/Makefile
@@ -3,7 +3,7 @@
PORTNAME= manu-gothica
DISTVERSION= 0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://www.bryld.dk/filer/ \
http://www.kswla.org/KATG%20Page%20Files/
@@ -13,11 +13,11 @@ EXTRACT_SUFX= .ttf
MAINTAINER= ports@FreeBSD.org
COMMENT= Old German blackletter handwriting (Suetterlin)
-BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+USES= fonts
RESTRICTED= The font is free for personal use
+FONTNAME= TTF
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= ${WRKSRC}
@@ -25,13 +25,11 @@ EXTRACT_AFTER_ARGS= ${WRKSRC}
NO_BUILD= yes
NO_WRKSUBDIR= yes
NO_ARCH= yes
+PLIST_FILES= ${FONTSDIR}/manugot19.ttf
do-install:
- @${MKDIR} ${STAGEDIR}${DATADIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} manugot19.ttf \
- ${STAGEDIR}${DATADIR})
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/TTF
- @${LN} -sf ${DATADIR}/manugot19.ttf \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/TTF
+ ${STAGEDIR}${FONTSDIR})
.include <bsd.port.mk>
diff --git a/x11-fonts/manu-gothica/pkg-plist b/x11-fonts/manu-gothica/pkg-plist
deleted file mode 100644
index 609f910137af..000000000000
--- a/x11-fonts/manu-gothica/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/X11/fonts/TTF/manugot19.ttf
-%%DATADIR%%/manugot19.ttf
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/lib/X11/fonts/TTF 2>/dev/null || true
-@unexec rm %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || true
-@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/lib/X11/fonts/TTF 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/TTF/fonts.cache-1 -a ! -s %D/lib/X11/fonts/TTF/fonts.cache-1 ]; then rm %D/lib/X11/fonts/TTF/fonts.cache-1; fi
diff --git a/x11-fonts/mgopen/Makefile b/x11-fonts/mgopen/Makefile
index c5b4209788c0..b5c136e22b5c 100644
--- a/x11-fonts/mgopen/Makefile
+++ b/x11-fonts/mgopen/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mgopen
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://pub.ellak.gr/fonts/${PORTNAME}/files/
DISTNAME= MgOpen
@@ -15,8 +15,6 @@ USES= fonts
NO_BUILD= yes
-FONTSDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-
SUB_FILES= pkg-message
do-install:
diff --git a/x11-fonts/mondulkiri/Makefile b/x11-fonts/mondulkiri/Makefile
index 4dafb2a35499..54064b97bdc3 100644
--- a/x11-fonts/mondulkiri/Makefile
+++ b/x11-fonts/mondulkiri/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mondulkiri
PORTVERSION= 2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= SF/khmer/Fonts%20-%20Mondulkiri/Mondulkiri%20Unicode%20Fonts%20v2E3s/
DISTNAME= Mondulkiri_Unicode_fonts_V2E3s
@@ -14,12 +14,12 @@ COMMENT= Mondulkiri Khmer fonts
USES= fonts zip
NO_BUILD= yes
-FONTSDIR= lib/X11/fonts/Khmer
+FONTNAME= Khmer
WRKSRC= ${WRKDIR}/Opentype\ only\ fonts
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/montecarlo_fonts/Makefile b/x11-fonts/montecarlo_fonts/Makefile
index bc70f8b0e724..f793126048c6 100644
--- a/x11-fonts/montecarlo_fonts/Makefile
+++ b/x11-fonts/montecarlo_fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= montecarlo_fonts
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://bok.net/MonteCarlo/downloads/ \
http://mirror.4bit.ws/
@@ -13,16 +13,12 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Monospace font
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
+USES= fonts
USE_XORG= x11
NO_BUILD= yes
-FONTDIR= ${PREFIX}/lib/X11/fonts/montecarlo
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
do-install:
- @${MKDIR} ${STAGEDIR}${FONTDIR}
- @${INSTALL_DATA} ${WRKSRC}/*.pcf ${STAGEDIR}${FONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/*.pcf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/montecarlo_fonts/pkg-plist b/x11-fonts/montecarlo_fonts/pkg-plist
index b6aadffa2ada..748a6cd95c10 100644
--- a/x11-fonts/montecarlo_fonts/pkg-plist
+++ b/x11-fonts/montecarlo_fonts/pkg-plist
@@ -1,3 +1,2 @@
-%%FONTDIR%%/MonteCarloBold.pcf
-%%FONTDIR%%/MonteCarloMedium.pcf
-@fontsdir %%FONTDIR%%
+%%FONTSDIR%%/MonteCarloBold.pcf
+%%FONTSDIR%%/MonteCarloMedium.pcf
diff --git a/x11-fonts/noto/Makefile b/x11-fonts/noto/Makefile
index 695bd59f95bd..96f4115fed61 100644
--- a/x11-fonts/noto/Makefile
+++ b/x11-fonts/noto/Makefile
@@ -2,7 +2,7 @@
PORTNAME= noto
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.google.com/get/noto/pkgs/
diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index 03ceceb5237d..6b80a6deb4bc 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -2,27 +2,24 @@
PORTNAME= nucleus
PORTVERSION= 0.77
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= SF/xfonts/OldFiles
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Another font package for X
+USES= fonts
+
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
WRKSRC= ${WRKDIR}/${PORTNAME}
-FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
-
do-build:
@cd ${WRKSRC}/src && ./compile
do-install:
- @${MKDIR} ${STAGEDIR}${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/*.gz ${STAGEDIR}${FONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/*.gz ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/nucleus/pkg-plist b/x11-fonts/nucleus/pkg-plist
index 43503fc012d1..6407fd02086a 100644
--- a/x11-fonts/nucleus/pkg-plist
+++ b/x11-fonts/nucleus/pkg-plist
@@ -1,45 +1,44 @@
-%%FONTDIR%%/achilles-12-m-r-inline.pcf.gz
-%%FONTDIR%%/achilles-12-m-r.pcf.gz
-%%FONTDIR%%/asimov-12-m-r.pcf.gz
-%%FONTDIR%%/cantor-16-m-r-sc.pcf.gz
-%%FONTDIR%%/cantor-16-m-r.pcf.gz
-%%FONTDIR%%/escher-14-m-r.pcf.gz
-%%FONTDIR%%/gagarin-14-m-i.pcf.gz
-%%FONTDIR%%/gagarin-14-m-r-sc.pcf.gz
-%%FONTDIR%%/gagarin-14-m-r.pcf.gz
-%%FONTDIR%%/gamow-10-b-i.pcf.gz
-%%FONTDIR%%/gamow-10-b-r.pcf.gz
-%%FONTDIR%%/gamow-10-m-i.pcf.gz
-%%FONTDIR%%/gamow-10-m-r-sc.pcf.gz
-%%FONTDIR%%/gamow-10-m-r.pcf.gz
-%%FONTDIR%%/gamow-12-b-i.pcf.gz
-%%FONTDIR%%/gamow-12-b-r.pcf.gz
-%%FONTDIR%%/gamow-12-m-i.pcf.gz
-%%FONTDIR%%/gamow-12-m-r-iso10646.pcf.gz
-%%FONTDIR%%/gamow-12-m-r-sc.pcf.gz
-%%FONTDIR%%/gamow-12-m-r.pcf.gz
-%%FONTDIR%%/gamow-14-b-i-sc.pcf.gz
-%%FONTDIR%%/gamow-14-b-i.pcf.gz
-%%FONTDIR%%/gamow-14-b-r-alt.pcf.gz
-%%FONTDIR%%/gamow-14-b-r-sc-alt.pcf.gz
-%%FONTDIR%%/gamow-14-b-r.pcf.gz
-%%FONTDIR%%/gamow-14-m-i-sc.pcf.gz
-%%FONTDIR%%/gamow-14-m-i.pcf.gz
-%%FONTDIR%%/gamow-14-m-r.pcf.gz
-%%FONTDIR%%/lomonosov-14-m-r.pcf.gz
-%%FONTDIR%%/lucidaterminal-14-b-r.pcf.gz
-%%FONTDIR%%/lucidaterminal-14-m-r.pcf.gz
-%%FONTDIR%%/marathon-12-m-r-alt.pcf.gz
-%%FONTDIR%%/marathon-12-m-r-sc-alt.pcf.gz
-%%FONTDIR%%/marathon-14-b-r-sc.pcf.gz
-%%FONTDIR%%/marathon-14-b-r.pcf.gz
-%%FONTDIR%%/marathon-14-m-r-sc.pcf.gz
-%%FONTDIR%%/marathon-14-m-r.pcf.gz
-%%FONTDIR%%/terminal-14-m-r-sc.pcf.gz
-%%FONTDIR%%/terminal-14-m-r.pcf.gz
-%%FONTDIR%%/terminal-26-m-r-iso10646.pcf.gz
-%%FONTDIR%%/terminal-26-m-r.pcf.gz
-%%FONTDIR%%/terminal-32-m-r-iso10646.pcf.gz
-%%FONTDIR%%/terminal-32-m-r.pcf.gz
-%%FONTDIR%%/trachtenberg-14-m-r.pcf.gz
-@fontsdir %%FONTDIR%%
+%%FONTSDIR%%/achilles-12-m-r-inline.pcf.gz
+%%FONTSDIR%%/achilles-12-m-r.pcf.gz
+%%FONTSDIR%%/asimov-12-m-r.pcf.gz
+%%FONTSDIR%%/cantor-16-m-r-sc.pcf.gz
+%%FONTSDIR%%/cantor-16-m-r.pcf.gz
+%%FONTSDIR%%/escher-14-m-r.pcf.gz
+%%FONTSDIR%%/gagarin-14-m-i.pcf.gz
+%%FONTSDIR%%/gagarin-14-m-r-sc.pcf.gz
+%%FONTSDIR%%/gagarin-14-m-r.pcf.gz
+%%FONTSDIR%%/gamow-10-b-i.pcf.gz
+%%FONTSDIR%%/gamow-10-b-r.pcf.gz
+%%FONTSDIR%%/gamow-10-m-i.pcf.gz
+%%FONTSDIR%%/gamow-10-m-r-sc.pcf.gz
+%%FONTSDIR%%/gamow-10-m-r.pcf.gz
+%%FONTSDIR%%/gamow-12-b-i.pcf.gz
+%%FONTSDIR%%/gamow-12-b-r.pcf.gz
+%%FONTSDIR%%/gamow-12-m-i.pcf.gz
+%%FONTSDIR%%/gamow-12-m-r-iso10646.pcf.gz
+%%FONTSDIR%%/gamow-12-m-r-sc.pcf.gz
+%%FONTSDIR%%/gamow-12-m-r.pcf.gz
+%%FONTSDIR%%/gamow-14-b-i-sc.pcf.gz
+%%FONTSDIR%%/gamow-14-b-i.pcf.gz
+%%FONTSDIR%%/gamow-14-b-r-alt.pcf.gz
+%%FONTSDIR%%/gamow-14-b-r-sc-alt.pcf.gz
+%%FONTSDIR%%/gamow-14-b-r.pcf.gz
+%%FONTSDIR%%/gamow-14-m-i-sc.pcf.gz
+%%FONTSDIR%%/gamow-14-m-i.pcf.gz
+%%FONTSDIR%%/gamow-14-m-r.pcf.gz
+%%FONTSDIR%%/lomonosov-14-m-r.pcf.gz
+%%FONTSDIR%%/lucidaterminal-14-b-r.pcf.gz
+%%FONTSDIR%%/lucidaterminal-14-m-r.pcf.gz
+%%FONTSDIR%%/marathon-12-m-r-alt.pcf.gz
+%%FONTSDIR%%/marathon-12-m-r-sc-alt.pcf.gz
+%%FONTSDIR%%/marathon-14-b-r-sc.pcf.gz
+%%FONTSDIR%%/marathon-14-b-r.pcf.gz
+%%FONTSDIR%%/marathon-14-m-r-sc.pcf.gz
+%%FONTSDIR%%/marathon-14-m-r.pcf.gz
+%%FONTSDIR%%/terminal-14-m-r-sc.pcf.gz
+%%FONTSDIR%%/terminal-14-m-r.pcf.gz
+%%FONTSDIR%%/terminal-26-m-r-iso10646.pcf.gz
+%%FONTSDIR%%/terminal-26-m-r.pcf.gz
+%%FONTSDIR%%/terminal-32-m-r-iso10646.pcf.gz
+%%FONTSDIR%%/terminal-32-m-r.pcf.gz
+%%FONTSDIR%%/trachtenberg-14-m-r.pcf.gz
diff --git a/x11-fonts/padauk/Makefile b/x11-fonts/padauk/Makefile
index cf903ef45582..c3f4b9d4b565 100644
--- a/x11-fonts/padauk/Makefile
+++ b/x11-fonts/padauk/Makefile
@@ -15,10 +15,8 @@ FETCH_BEFORE_ARGS= -o ${DISTFILES}
NO_BUILD= yes
USES= fonts zip
-FONTSDIR= lib/X11/fonts/Myanmar
-
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/paratype/Makefile b/x11-fonts/paratype/Makefile
index 7428e3c3eafe..8e1d6026d9bf 100644
--- a/x11-fonts/paratype/Makefile
+++ b/x11-fonts/paratype/Makefile
@@ -3,7 +3,7 @@
PORTNAME= paratype
PORTVERSION= 2.004
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= http://paratype.0xdc.ru/
MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
@@ -19,7 +19,6 @@ NO_WRKSUBDIR= yes
USES= fonts zip
FONTNAME= ParaType
-FONTSDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME}
SUB_FILES= pkg-message
do-install:
diff --git a/x11-fonts/pingwi/Makefile b/x11-fonts/pingwi/Makefile
index 841d97c542ba..a199ee5822df 100644
--- a/x11-fonts/pingwi/Makefile
+++ b/x11-fonts/pingwi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pingwi
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.pingwinsoft.ru/system/uploads/16/original/ \
http://fbsd.zlonet.ru/distfiles/
@@ -15,7 +15,6 @@ COMMENT= PingWi Typography fonts
USES= fonts zip
NO_BUILD= yes
-FONTSDIR= ${PREFIX}/lib/X11/fonts/pingwi
SUB_FILES= pkg-message
do-install:
diff --git a/x11-fonts/profont/Makefile b/x11-fonts/profont/Makefile
index 434a1a7752ba..654f7a539de5 100644
--- a/x11-fonts/profont/Makefile
+++ b/x11-fonts/profont/Makefile
@@ -3,7 +3,7 @@
PORTNAME= profont
PORTVERSION= 400
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.tobiasjung.net/dl/
DISTNAME= ${PORTNAME}-x11
@@ -11,18 +11,13 @@ DISTNAME= ${PORTNAME}-x11
MAINTAINER= ports@FreeBSD.org
COMMENT= Ultimate programming font
-BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
-FONTDIR= lib/X11/fonts/${PORTNAME}
-PLIST_SUB+= FONTDIR=${FONTDIR}
+USES= fonts
do-build:
${GZIP_CMD} ${WRKSRC}/*.pcf
do-install:
- @${MKDIR} ${STAGEDIR}${LOCALBASE}/${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${LOCALBASE}/${FONTDIR}
- (cd ${STAGEDIR}${LOCALBASE}/${FONTDIR}; mkfontdir; mkfontscale)
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/profont/pkg-plist b/x11-fonts/profont/pkg-plist
index 0a68881d8966..f1db16f7d153 100644
--- a/x11-fonts/profont/pkg-plist
+++ b/x11-fonts/profont/pkg-plist
@@ -1,9 +1,7 @@
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-%%FONTDIR%%/ProFont_r400-10.pcf.gz
-%%FONTDIR%%/ProFont_r400-11.pcf.gz
-%%FONTDIR%%/ProFont_r400-12.pcf.gz
-%%FONTDIR%%/ProFont_r400-15.pcf.gz
-%%FONTDIR%%/ProFont_r400-17.pcf.gz
-%%FONTDIR%%/ProFont_r400-22.pcf.gz
-%%FONTDIR%%/ProFont_r400-29.pcf.gz
+%%FONTSDIR%%/ProFont_r400-10.pcf.gz
+%%FONTSDIR%%/ProFont_r400-11.pcf.gz
+%%FONTSDIR%%/ProFont_r400-12.pcf.gz
+%%FONTSDIR%%/ProFont_r400-15.pcf.gz
+%%FONTSDIR%%/ProFont_r400-17.pcf.gz
+%%FONTSDIR%%/ProFont_r400-22.pcf.gz
+%%FONTSDIR%%/ProFont_r400-29.pcf.gz
diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile
index f60d52a44cb0..d28476374000 100644
--- a/x11-fonts/proggy_fonts/Makefile
+++ b/x11-fonts/proggy_fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= proggy_fonts
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://www.proggyfonts.com/download/
DISTFILES= ProggyClean.pcf.zip ProggySquare.pcf.zip \
@@ -25,21 +25,17 @@ EXTRACT_ONLY= ProggyClean.pcf.zip ProggySquare.pcf.zip \
MAINTAINER= ports@FreeBSD.org
COMMENT= The perfect monospaced bitmap programming fonts
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
ALREADY_UNZIP= ${DISTDIR}/Opti.pcf.gz ${DISTDIR}/OptiSmall.pcf.gz \
${DISTDIR}/PixelCarnageMono.pcf.gz
USE_XORG= x11
-USES= zip
+USES= fonts zip
NO_WRKSUBDIR= yes
NO_BUILD= yes
-XFONTDIR= ${STAGEDIR}${PREFIX}/lib/X11/fonts/local
do-install:
- @${MKDIR} ${XFONTDIR}
- @${CP} ${ALREADY_UNZIP} ${WRKDIR}
- @${INSTALL_DATA} ${WRKDIR}/*.pcf* ${XFONTDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${CP} ${ALREADY_UNZIP} ${WRKDIR}
+ ${INSTALL_DATA} ${WRKDIR}/*.pcf* ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/proggy_fonts/pkg-plist b/x11-fonts/proggy_fonts/pkg-plist
index 2d9ef23768ba..f524e7dda63e 100644
--- a/x11-fonts/proggy_fonts/pkg-plist
+++ b/x11-fonts/proggy_fonts/pkg-plist
@@ -1,22 +1,20 @@
-lib/X11/fonts/local/ProggyClean.pcf.gz
-lib/X11/fonts/local/ProggySquare.pcf.gz
-lib/X11/fonts/local/ProggySmall.pcf.gz
-lib/X11/fonts/local/ProggyTiny.pcf.gz
-lib/X11/fonts/local/ProggyCleanSZ.pcf.gz
-lib/X11/fonts/local/ProggySquareSZ.pcf.gz
-lib/X11/fonts/local/ProggyTinySZ.pcf.gz
-lib/X11/fonts/local/ProggyCleanSZBP.pcf.gz
-lib/X11/fonts/local/ProggyCleanCP.pcf.gz
-lib/X11/fonts/local/ProggyCleanSZCP.pcf.gz
-lib/X11/fonts/local/cft.pcf
-lib/X11/fonts/local/Opti.pcf.gz
-lib/X11/fonts/local/OptiSmall.pcf.gz
-lib/X11/fonts/local/Speedy11.pcf.gz
-lib/X11/fonts/local/Speedy12.pcf.gz
-lib/X11/fonts/local/Speedy.pcf.gz
-lib/X11/fonts/local/PixelCarnageMono.pcf.gz
-lib/X11/fonts/local/ProggyTinyBold.pcf.gz
-lib/X11/fonts/local/WebbySmall.pcf.gz
-lib/X11/fonts/local/WebbyCaps.pcf.gz
-@exec (cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir)
-@unexec (cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir)
+%%FONTSDIR%%/ProggyClean.pcf.gz
+%%FONTSDIR%%/ProggySquare.pcf.gz
+%%FONTSDIR%%/ProggySmall.pcf.gz
+%%FONTSDIR%%/ProggyTiny.pcf.gz
+%%FONTSDIR%%/ProggyCleanSZ.pcf.gz
+%%FONTSDIR%%/ProggySquareSZ.pcf.gz
+%%FONTSDIR%%/ProggyTinySZ.pcf.gz
+%%FONTSDIR%%/ProggyCleanSZBP.pcf.gz
+%%FONTSDIR%%/ProggyCleanCP.pcf.gz
+%%FONTSDIR%%/ProggyCleanSZCP.pcf.gz
+%%FONTSDIR%%/cft.pcf
+%%FONTSDIR%%/Opti.pcf.gz
+%%FONTSDIR%%/OptiSmall.pcf.gz
+%%FONTSDIR%%/Speedy11.pcf.gz
+%%FONTSDIR%%/Speedy12.pcf.gz
+%%FONTSDIR%%/Speedy.pcf.gz
+%%FONTSDIR%%/PixelCarnageMono.pcf.gz
+%%FONTSDIR%%/ProggyTinyBold.pcf.gz
+%%FONTSDIR%%/WebbySmall.pcf.gz
+%%FONTSDIR%%/WebbyCaps.pcf.gz
diff --git a/x11-fonts/roboto-fonts-ttf/Makefile b/x11-fonts/roboto-fonts-ttf/Makefile
index 74631e5b6c18..ec70d6bfc149 100644
--- a/x11-fonts/roboto-fonts-ttf/Makefile
+++ b/x11-fonts/roboto-fonts-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= roboto-fonts-ttf
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://developer.android.com/downloads/design/
@@ -17,7 +17,6 @@ LICENSE= APACHE20
USES= fonts zip:infozip
WRKSRC= ${WRKDIR}/Roboto_v${PORTVERSION}
-FONTSDIR= ${PREFIX}/lib/X11/fonts/Roboto
SUB_FILES= pkg-message
do-build:
diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile
index 719761ad9d0d..70a20603e435 100644
--- a/x11-fonts/sgifonts/Makefile
+++ b/x11-fonts/sgifonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sgifonts
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= ftp://patches.sgi.com/pub/linux/ProPack1.4/SRPMS/
DISTNAME= sgi-fonts-1.0-1.src
@@ -14,17 +14,17 @@ COMMENT= Fonts from the SGI ProPack 1.4 (originally for Linux)
LICENSE= MIT
-BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+USES= fonts
NO_ARCH= yes
NO_WRKSUBDIR= yes
SUB_FILES= pkg-message
-PLIST_FILES= lib/X11/fonts/local/sgi/fonts.alias \
- lib/X11/fonts/local/sgi/fonts.dir \
- ${FONTS:S!^!lib/X11/fonts/local/sgi/!:S!$!.pcf.gz!}
+FONTNAME= sgi
+PLIST_FILES= ${FONTS:S!^!${FONTSDIR}/!:S!$!.pcf.gz!} \
+ ${FONTSDIR}/fonts.alias
FONTS= Scr7 Scr8 Scr9 Scr10 Scr11 Scr12 \
Scr13 Scr14 Scr15 Scr16 Scr18 \
@@ -51,11 +51,10 @@ do-build:
.endfor
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/local/sgi
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
(cd ${WRKSRC}/sgi-fonts/sgi && ${INSTALL_DATA} fonts.alias \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/local/sgi)
+ ${STAGEDIR}${FONTSDIR})
(cd ${WRKSRC}/sgi-fonts/sgi && ${INSTALL_DATA} *.pcf.gz \
- ${STAGEDIR}${PREFIX}/lib/X11/fonts/local/sgi)
- (cd ${STAGEDIR}${PREFIX}/lib/X11/fonts/local/sgi && mkfontdir)
+ ${STAGEDIR}${FONTSDIR})
.include <bsd.port.mk>
diff --git a/x11-fonts/sgifonts/files/pkg-message.in b/x11-fonts/sgifonts/files/pkg-message.in
index 96a94c3ed0a8..0949aa3c69b8 100644
--- a/x11-fonts/sgifonts/files/pkg-message.in
+++ b/x11-fonts/sgifonts/files/pkg-message.in
@@ -1,6 +1,6 @@
******************************************
Add a line
-FontPath "%%PREFIX%%/lib/X11/fonts/local/sgi"
+FontPath "%%FONTSDIR%%
to your xorg.conf.
Then, restart the X server or do "xset fp rehash".
*****************************************
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index 1e4b3f2753b5..19523a8fbc4f 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -19,7 +19,7 @@ RESTRICTED= Shareware: cannot be distributed without prior authorization
NO_BUILD= yes
USES= fonts
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${PORTNAME}
+SUB_FILES= pkg-message
do-install:
@${MKDIR} ${STAGEDIR}${FONTSDIR}
diff --git a/x11-fonts/sharefonts/pkg-message b/x11-fonts/sharefonts/files/pkg-message.in
index 6939c2e43fcf..10f1e083eda0 100644
--- a/x11-fonts/sharefonts/pkg-message
+++ b/x11-fonts/sharefonts/files/pkg-message.in
@@ -1,8 +1,8 @@
============================================================
-You'll have to add /usr/local/lib/X11/fonts/sharefont
+You'll have to add %%FONTSDIR%%
to your X font path by either:
-$ xset fp+ /usr/local/lib/X11/fonts/sharefont
+$ xset fp+ %%FONTSDIR%%
$ xset fp rehash
or by adding it to your X-server configuration file (usually
diff --git a/x11-fonts/sourcecodepro-ttf/Makefile b/x11-fonts/sourcecodepro-ttf/Makefile
index 7466529b51ad..35f7bedbe753 100644
--- a/x11-fonts/sourcecodepro-ttf/Makefile
+++ b/x11-fonts/sourcecodepro-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sourcecodepro-ttf
PORTVERSION= 1.017
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/x11-fonts/stix-fonts/Makefile b/x11-fonts/stix-fonts/Makefile
index 6c0176ed3532..63698aad15b9 100644
--- a/x11-fonts/stix-fonts/Makefile
+++ b/x11-fonts/stix-fonts/Makefile
@@ -3,6 +3,7 @@
PORTNAME= stixfonts
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= SF/${PORTNAME}/Current%20Release/
DISTNAME= STIXv${PORTVERSION}-webfonts
@@ -12,28 +13,14 @@ COMMENT= OpenType Unicode fonts for Scientific, Technical, and Math texts
LICENSE= OFL11
-BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
NO_WRKSUBDIR= yes
-USES= zip
+USES= fonts zip
USE_XORG= x11
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}" \
- FCCACHE='${FCCACHE}'
-
SUB_FILES= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
-SUB_LIST= FONTDIR=${FONTDIR}
FONTNAME= stix
-FONTDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME}
-
-MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir
-FCCACHE= ${LOCALBASE}/bin/fc-cache -f -v
OPTIONS_DEFINE= DOCS
@@ -44,13 +31,10 @@ do-build:
.for group in stix-web STIX-MathJax/woff
${CP} ${WRKSRC}/${group}/*.woff ${WRKDIR}/build/
.endfor
- cd ${WRKDIR}/build && ${MKFONTSCL_CMD}
- ${REINPLACE_CMD} -e 's|-misc-|-stix-|' ${WRKDIR}/build/fonts.scale
- cd ${WRKDIR}/build && ${MKFONTDIR_CMD}
do-install:
- ${MKDIR} ${STAGEDIR}${FONTDIR}
- cd ${WRKDIR}/build && ${INSTALL_DATA} fonts.dir fonts.scale *.woff ${STAGEDIR}${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ cd ${WRKDIR}/build && ${INSTALL_DATA} *.woff ${STAGEDIR}${FONTSDIR}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/x11-fonts/stix-fonts/files/pkg-message.in b/x11-fonts/stix-fonts/files/pkg-message.in
index 9c1334d88b56..b61ca8aad6d0 100644
--- a/x11-fonts/stix-fonts/files/pkg-message.in
+++ b/x11-fonts/stix-fonts/files/pkg-message.in
@@ -7,4 +7,4 @@ line to the "Modules" section of your X11 / x.org configuration file:
Add the following line to the "Files" section:
- FontPath "%%FONTDIR%%/"
+ FontPath "%%FONTSDIR%%/"
diff --git a/x11-fonts/stix-fonts/pkg-plist b/x11-fonts/stix-fonts/pkg-plist
index 6fe7365e3ec3..e6d23d2d0091 100644
--- a/x11-fonts/stix-fonts/pkg-plist
+++ b/x11-fonts/stix-fonts/pkg-plist
@@ -1,89 +1,84 @@
-%%FONTDIR%%/STIXGeneral-Bold.woff
-%%FONTDIR%%/STIXGeneral-BoldItalic.woff
-%%FONTDIR%%/STIXGeneral-Italic.woff
-%%FONTDIR%%/STIXGeneral-Regular.woff
-%%FONTDIR%%/STIXIntegralsD-Bold.woff
-%%FONTDIR%%/STIXIntegralsD-Regular.woff
-%%FONTDIR%%/STIXIntegralsSm-Bold.woff
-%%FONTDIR%%/STIXIntegralsSm-Regular.woff
-%%FONTDIR%%/STIXIntegralsUp-Bold.woff
-%%FONTDIR%%/STIXIntegralsUp-Regular.woff
-%%FONTDIR%%/STIXIntegralsUpD-Bold.woff
-%%FONTDIR%%/STIXIntegralsUpD-Regular.woff
-%%FONTDIR%%/STIXIntegralsUpSm-Bold.woff
-%%FONTDIR%%/STIXIntegralsUpSm-Regular.woff
-%%FONTDIR%%/STIXMathJax_Alphabets-Bold.woff
-%%FONTDIR%%/STIXMathJax_Alphabets-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_Alphabets-Italic.woff
-%%FONTDIR%%/STIXMathJax_Alphabets-Regular.woff
-%%FONTDIR%%/STIXMathJax_Arrows-Bold.woff
-%%FONTDIR%%/STIXMathJax_Arrows-Regular.woff
-%%FONTDIR%%/STIXMathJax_DoubleStruck-Bold.woff
-%%FONTDIR%%/STIXMathJax_DoubleStruck-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_DoubleStruck-Italic.woff
-%%FONTDIR%%/STIXMathJax_DoubleStruck-Regular.woff
-%%FONTDIR%%/STIXMathJax_Fraktur-Bold.woff
-%%FONTDIR%%/STIXMathJax_Fraktur-Regular.woff
-%%FONTDIR%%/STIXMathJax_Latin-Bold.woff
-%%FONTDIR%%/STIXMathJax_Latin-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_Latin-Italic.woff
-%%FONTDIR%%/STIXMathJax_Latin-Regular.woff
-%%FONTDIR%%/STIXMathJax_Main-Bold.woff
-%%FONTDIR%%/STIXMathJax_Main-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_Main-Italic.woff
-%%FONTDIR%%/STIXMathJax_Main-Regular.woff
-%%FONTDIR%%/STIXMathJax_Marks-Bold.woff
-%%FONTDIR%%/STIXMathJax_Marks-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_Marks-Italic.woff
-%%FONTDIR%%/STIXMathJax_Marks-Regular.woff
-%%FONTDIR%%/STIXMathJax_Misc-Bold.woff
-%%FONTDIR%%/STIXMathJax_Misc-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_Misc-Italic.woff
-%%FONTDIR%%/STIXMathJax_Misc-Regular.woff
-%%FONTDIR%%/STIXMathJax_Monospace-Regular.woff
-%%FONTDIR%%/STIXMathJax_Normal-Bold.woff
-%%FONTDIR%%/STIXMathJax_Normal-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_Normal-Italic.woff
-%%FONTDIR%%/STIXMathJax_Operators-Bold.woff
-%%FONTDIR%%/STIXMathJax_Operators-Regular.woff
-%%FONTDIR%%/STIXMathJax_SansSerif-Bold.woff
-%%FONTDIR%%/STIXMathJax_SansSerif-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_SansSerif-Italic.woff
-%%FONTDIR%%/STIXMathJax_SansSerif-Regular.woff
-%%FONTDIR%%/STIXMathJax_Script-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_Script-Italic.woff
-%%FONTDIR%%/STIXMathJax_Script-Regular.woff
-%%FONTDIR%%/STIXMathJax_Shapes-Bold.woff
-%%FONTDIR%%/STIXMathJax_Shapes-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_Shapes-Regular.woff
-%%FONTDIR%%/STIXMathJax_Size1-Regular.woff
-%%FONTDIR%%/STIXMathJax_Size2-Regular.woff
-%%FONTDIR%%/STIXMathJax_Size3-Regular.woff
-%%FONTDIR%%/STIXMathJax_Size4-Regular.woff
-%%FONTDIR%%/STIXMathJax_Size5-Regular.woff
-%%FONTDIR%%/STIXMathJax_Symbols-Bold.woff
-%%FONTDIR%%/STIXMathJax_Symbols-Regular.woff
-%%FONTDIR%%/STIXMathJax_Variants-Bold.woff
-%%FONTDIR%%/STIXMathJax_Variants-BoldItalic.woff
-%%FONTDIR%%/STIXMathJax_Variants-Italic.woff
-%%FONTDIR%%/STIXMathJax_Variants-Regular.woff
-%%FONTDIR%%/STIXNonUnicode-Bold.woff
-%%FONTDIR%%/STIXNonUnicode-BoldItalic.woff
-%%FONTDIR%%/STIXNonUnicode-Italic.woff
-%%FONTDIR%%/STIXNonUnicode-Regular.woff
-%%FONTDIR%%/STIXSizeFiveSym-Regular.woff
-%%FONTDIR%%/STIXSizeFourSym-Bold.woff
-%%FONTDIR%%/STIXSizeFourSym-Regular.woff
-%%FONTDIR%%/STIXSizeOneSym-Bold.woff
-%%FONTDIR%%/STIXSizeOneSym-Regular.woff
-%%FONTDIR%%/STIXSizeThreeSym-Bold.woff
-%%FONTDIR%%/STIXSizeThreeSym-Regular.woff
-%%FONTDIR%%/STIXSizeTwoSym-Bold.woff
-%%FONTDIR%%/STIXSizeTwoSym-Regular.woff
-%%FONTDIR%%/STIXVariants-Bold.woff
-%%FONTDIR%%/STIXVariants-Regular.woff
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-@exec %%FCCACHE%% %D/%%FONTDIR%% 2>/dev/null || true
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
-@dirrm %%FONTDIR%%
+%%FONTSDIR%%/STIXGeneral-Bold.woff
+%%FONTSDIR%%/STIXGeneral-BoldItalic.woff
+%%FONTSDIR%%/STIXGeneral-Italic.woff
+%%FONTSDIR%%/STIXGeneral-Regular.woff
+%%FONTSDIR%%/STIXIntegralsD-Bold.woff
+%%FONTSDIR%%/STIXIntegralsD-Regular.woff
+%%FONTSDIR%%/STIXIntegralsSm-Bold.woff
+%%FONTSDIR%%/STIXIntegralsSm-Regular.woff
+%%FONTSDIR%%/STIXIntegralsUp-Bold.woff
+%%FONTSDIR%%/STIXIntegralsUp-Regular.woff
+%%FONTSDIR%%/STIXIntegralsUpD-Bold.woff
+%%FONTSDIR%%/STIXIntegralsUpD-Regular.woff
+%%FONTSDIR%%/STIXIntegralsUpSm-Bold.woff
+%%FONTSDIR%%/STIXIntegralsUpSm-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Alphabets-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Alphabets-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_Alphabets-Italic.woff
+%%FONTSDIR%%/STIXMathJax_Alphabets-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Arrows-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Arrows-Regular.woff
+%%FONTSDIR%%/STIXMathJax_DoubleStruck-Bold.woff
+%%FONTSDIR%%/STIXMathJax_DoubleStruck-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_DoubleStruck-Italic.woff
+%%FONTSDIR%%/STIXMathJax_DoubleStruck-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Fraktur-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Fraktur-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Latin-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Latin-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_Latin-Italic.woff
+%%FONTSDIR%%/STIXMathJax_Latin-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Main-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Main-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_Main-Italic.woff
+%%FONTSDIR%%/STIXMathJax_Main-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Marks-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Marks-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_Marks-Italic.woff
+%%FONTSDIR%%/STIXMathJax_Marks-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Misc-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Misc-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_Misc-Italic.woff
+%%FONTSDIR%%/STIXMathJax_Misc-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Monospace-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Normal-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Normal-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_Normal-Italic.woff
+%%FONTSDIR%%/STIXMathJax_Operators-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Operators-Regular.woff
+%%FONTSDIR%%/STIXMathJax_SansSerif-Bold.woff
+%%FONTSDIR%%/STIXMathJax_SansSerif-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_SansSerif-Italic.woff
+%%FONTSDIR%%/STIXMathJax_SansSerif-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Script-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_Script-Italic.woff
+%%FONTSDIR%%/STIXMathJax_Script-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Shapes-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Shapes-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_Shapes-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Size1-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Size2-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Size3-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Size4-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Size5-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Symbols-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Symbols-Regular.woff
+%%FONTSDIR%%/STIXMathJax_Variants-Bold.woff
+%%FONTSDIR%%/STIXMathJax_Variants-BoldItalic.woff
+%%FONTSDIR%%/STIXMathJax_Variants-Italic.woff
+%%FONTSDIR%%/STIXMathJax_Variants-Regular.woff
+%%FONTSDIR%%/STIXNonUnicode-Bold.woff
+%%FONTSDIR%%/STIXNonUnicode-BoldItalic.woff
+%%FONTSDIR%%/STIXNonUnicode-Italic.woff
+%%FONTSDIR%%/STIXNonUnicode-Regular.woff
+%%FONTSDIR%%/STIXSizeFiveSym-Regular.woff
+%%FONTSDIR%%/STIXSizeFourSym-Bold.woff
+%%FONTSDIR%%/STIXSizeFourSym-Regular.woff
+%%FONTSDIR%%/STIXSizeOneSym-Bold.woff
+%%FONTSDIR%%/STIXSizeOneSym-Regular.woff
+%%FONTSDIR%%/STIXSizeThreeSym-Bold.woff
+%%FONTSDIR%%/STIXSizeThreeSym-Regular.woff
+%%FONTSDIR%%/STIXSizeTwoSym-Bold.woff
+%%FONTSDIR%%/STIXSizeTwoSym-Regular.woff
+%%FONTSDIR%%/STIXVariants-Bold.woff
+%%FONTSDIR%%/STIXVariants-Regular.woff
diff --git a/x11-fonts/suxus/Makefile b/x11-fonts/suxus/Makefile
index 015bcf9969ae..70ad84e337aa 100644
--- a/x11-fonts/suxus/Makefile
+++ b/x11-fonts/suxus/Makefile
@@ -2,7 +2,7 @@
PORTNAME= suxus
PORTVERSION= 1.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://oldhome.schmorp.de/marc/data/ \
http://www.atarininja.org/distfiles/
@@ -12,12 +12,12 @@ DIST_SUBDIR= suxus
MAINTAINER= ports@FreeBSD.org
COMMENT= X11 font designed to be small yet easily read
-BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
SUB_FILES= pkg-message
USE_XORG= x11
+USES= fonts
+PLIST_FILES= ${FONTSDIR}/suxus-iso-8859-1.pcf.gz
do-extract:
@${MKDIR} ${WRKSRC}
@@ -29,7 +29,7 @@ do-build:
${PREFIX}/bin/bdftopcf -t ${WRKSRC}/suxus-iso-8859-1.bdf | ${GZIP_CMD} > ${WRKSRC}/suxus-iso-8859-1.pcf.gz
do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/local/suxus
- @${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${PREFIX}/lib/X11/fonts/local/suxus
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/suxus/files/pkg-message.in b/x11-fonts/suxus/files/pkg-message.in
index f873a6749cc6..8077012130cd 100644
--- a/x11-fonts/suxus/files/pkg-message.in
+++ b/x11-fonts/suxus/files/pkg-message.in
@@ -1,8 +1,8 @@
============================================================
-You'll have to add %%PREFIX%%/lib/X11/fonts/local/suxus
+You'll have to add %%FONTSDIR%%
to your X font path:
-$ xset fp+ %%PREFIX%%/lib/X11/fonts/local/suxus
+$ xset fp+ %%FONTSDIR%%
$ xset fp rehash
============================================================
diff --git a/x11-fonts/suxus/pkg-plist b/x11-fonts/suxus/pkg-plist
deleted file mode 100644
index 97962efa3d57..000000000000
--- a/x11-fonts/suxus/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/X11/fonts/local/suxus/suxus-iso-8859-1.pcf.gz
-@fontsdir lib/X11/fonts/local/suxus
diff --git a/x11-fonts/symbola/Makefile b/x11-fonts/symbola/Makefile
index 18f9e582ee4d..9c5ffa851393 100644
--- a/x11-fonts/symbola/Makefile
+++ b/x11-fonts/symbola/Makefile
@@ -2,6 +2,7 @@
PORTNAME= symbola
PORTVERSION= 7.19
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://users.teilar.gr/~g1951d/
DISTNAME= Symbola
@@ -17,24 +18,17 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USES= zip
-
-FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+USES= fonts zip
OPTIONS_DEFINE= DOCS
PORTDOCS= *
-.include <bsd.port.options.mk>
-
do-install:
-.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/*.htm ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/*.docx ${STAGEDIR}${DOCSDIR}
-.endif
- ${MKDIR} ${STAGEDIR}${FONTDIR}
- ${INSTALL_DATA} ${WRKDIR}/*.ttf ${STAGEDIR}${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/*.ttf ${STAGEDIR}${FONTSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/symbola/pkg-plist b/x11-fonts/symbola/pkg-plist
index f0d1a06378cc..f0e465281379 100644
--- a/x11-fonts/symbola/pkg-plist
+++ b/x11-fonts/symbola/pkg-plist
@@ -1,2 +1,2 @@
-%%FONTDIR%%/Symbola.ttf
-%%FONTDIR%%/Symbola_hint.ttf
+%%FONTSDIR%%/Symbola.ttf
+%%FONTSDIR%%/Symbola_hint.ttf
diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile
index c1b497dc7cb9..05227b001fdd 100644
--- a/x11-fonts/tv-fonts/Makefile
+++ b/x11-fonts/tv-fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tv-fonts
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= http://dl.bytesex.org/releases/${PORTNAME}/
@@ -16,7 +16,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
USES= gmake fonts tar:bzip2
MAKE_JOBS_UNSAFE= yes
-FONTSDIR= ${PREFIX}/lib/X11/fonts/misc
+FONTNAME= misc
FONTS= caption.pcf.gz captioni.pcf.gz led-iso10646-1.pcf.gz \
led-iso8859-1.pcf.gz led-iso8859-10.pcf.gz led-iso8859-13.pcf.gz \
led-iso8859-14.pcf.gz led-iso8859-15.pcf.gz led-iso8859-2.pcf.gz \
diff --git a/x11-fonts/tv-fonts/pkg-plist b/x11-fonts/tv-fonts/pkg-plist
index 3569af4ac13f..17d98024edf5 100644
--- a/x11-fonts/tv-fonts/pkg-plist
+++ b/x11-fonts/tv-fonts/pkg-plist
@@ -1,22 +1,22 @@
-lib/X11/fonts/misc/caption.pcf.gz
-lib/X11/fonts/misc/captioni.pcf.gz
-lib/X11/fonts/misc/led-iso10646-1.pcf.gz
-lib/X11/fonts/misc/led-iso8859-1.pcf.gz
-lib/X11/fonts/misc/led-iso8859-10.pcf.gz
-lib/X11/fonts/misc/led-iso8859-13.pcf.gz
-lib/X11/fonts/misc/led-iso8859-14.pcf.gz
-lib/X11/fonts/misc/led-iso8859-15.pcf.gz
-lib/X11/fonts/misc/led-iso8859-2.pcf.gz
-lib/X11/fonts/misc/led-iso8859-3.pcf.gz
-lib/X11/fonts/misc/led-iso8859-4.pcf.gz
-lib/X11/fonts/misc/led-iso8859-5.pcf.gz
-lib/X11/fonts/misc/led-iso8859-7.pcf.gz
-lib/X11/fonts/misc/led-iso8859-8.pcf.gz
-lib/X11/fonts/misc/led-iso8859-9.pcf.gz
-lib/X11/fonts/misc/led-koi8-r.pcf.gz
-lib/X11/fonts/misc/teletext1.pcf.gz
-lib/X11/fonts/misc/teletext1i.pcf.gz
-lib/X11/fonts/misc/teletext2.pcf.gz
-lib/X11/fonts/misc/teletext2i.pcf.gz
-lib/X11/fonts/misc/teletext4.pcf.gz
-lib/X11/fonts/misc/teletext4i.pcf.gz
+%%FONTSDIR%%/caption.pcf.gz
+%%FONTSDIR%%/captioni.pcf.gz
+%%FONTSDIR%%/led-iso10646-1.pcf.gz
+%%FONTSDIR%%/led-iso8859-1.pcf.gz
+%%FONTSDIR%%/led-iso8859-10.pcf.gz
+%%FONTSDIR%%/led-iso8859-13.pcf.gz
+%%FONTSDIR%%/led-iso8859-14.pcf.gz
+%%FONTSDIR%%/led-iso8859-15.pcf.gz
+%%FONTSDIR%%/led-iso8859-2.pcf.gz
+%%FONTSDIR%%/led-iso8859-3.pcf.gz
+%%FONTSDIR%%/led-iso8859-4.pcf.gz
+%%FONTSDIR%%/led-iso8859-5.pcf.gz
+%%FONTSDIR%%/led-iso8859-7.pcf.gz
+%%FONTSDIR%%/led-iso8859-8.pcf.gz
+%%FONTSDIR%%/led-iso8859-9.pcf.gz
+%%FONTSDIR%%/led-koi8-r.pcf.gz
+%%FONTSDIR%%/teletext1.pcf.gz
+%%FONTSDIR%%/teletext1i.pcf.gz
+%%FONTSDIR%%/teletext2.pcf.gz
+%%FONTSDIR%%/teletext2i.pcf.gz
+%%FONTSDIR%%/teletext4.pcf.gz
+%%FONTSDIR%%/teletext4i.pcf.gz
diff --git a/x11-fonts/vollkorn-ttf/Makefile b/x11-fonts/vollkorn-ttf/Makefile
index 09c71cba7e9a..f4a3606a2a1f 100644
--- a/x11-fonts/vollkorn-ttf/Makefile
+++ b/x11-fonts/vollkorn-ttf/Makefile
@@ -13,17 +13,14 @@ LICENSE= OFL11
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USES= zip
-
-FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+USES= fonts zip
OPTIONS_DEFINE= DOCS
do-install:
- ${MKDIR} ${STAGEDIR}${FONTDIR}
+ ${MKDIR} ${STAGEDIR}${FONTSDIR}
cd ${WRKSRC} && \
- ${INSTALL_DATA} TTF/Vollkorn-*.ttf ${STAGEDIR}${FONTDIR}
+ ${INSTALL_DATA} TTF/Vollkorn-*.ttf ${STAGEDIR}${FONTSDIR}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && \
diff --git a/x11-fonts/vollkorn-ttf/pkg-plist b/x11-fonts/vollkorn-ttf/pkg-plist
index 6be506d78e25..79cb8f1a260e 100644
--- a/x11-fonts/vollkorn-ttf/pkg-plist
+++ b/x11-fonts/vollkorn-ttf/pkg-plist
@@ -1,10 +1,10 @@
-%%FONTDIR%%/Vollkorn-Bold.ttf
-%%FONTDIR%%/Vollkorn-BoldItalic.ttf
-%%FONTDIR%%/Vollkorn-Italic.ttf
-%%FONTDIR%%/Vollkorn-Medium.ttf
-%%FONTDIR%%/Vollkorn-MediumItalic.ttf
-%%FONTDIR%%/Vollkorn-Regular.ttf
-%%FONTDIR%%/Vollkorn-Semibold.ttf
-%%FONTDIR%%/Vollkorn-SemiboldItalic.ttf
+%%FONTSDIR%%/Vollkorn-Bold.ttf
+%%FONTSDIR%%/Vollkorn-BoldItalic.ttf
+%%FONTSDIR%%/Vollkorn-Italic.ttf
+%%FONTSDIR%%/Vollkorn-Medium.ttf
+%%FONTSDIR%%/Vollkorn-MediumItalic.ttf
+%%FONTSDIR%%/Vollkorn-Regular.ttf
+%%FONTSDIR%%/Vollkorn-Semibold.ttf
+%%FONTSDIR%%/Vollkorn-SemiboldItalic.ttf
%%PORTDOCS%%%%DOCSDIR%%/OFL-FAQ.txt
%%PORTDOCS%%%%DOCSDIR%%/Fontlog.txt
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index 94cd72521002..38c13c8b310b 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= webfonts
PORTVERSION= 0.30
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-fonts
MASTER_SITES= SF/corefonts/the%20fonts/final:group1 \
ftp://ftp.botik.ru/rented/znamensk/distributions/ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \
@@ -33,10 +33,6 @@ OPTIONS_SUB= yes
EXTRAFONTS_DESC= Fonts licensed under MS Windows license
EXTRAFONTS_DISTFILES= ielpkth.cab:group2
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
-
-PLIST_SUB= FONTNAME="${FONTNAME}"
-
SUB_FILES= pkg-message
.include <bsd.port.options.mk>
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index ce6f25f7bf68..2f96d9cfa5fa 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xfs
PORTVERSION= 1.1.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fonts
@@ -24,7 +25,6 @@ post-build:
@cd ${WRKSRC}/config/ && ${MAKE_CMD} config
post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config.default
- ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config; \
+ ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config.sample
.include <bsd.port.mk>
diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist
index e175b97fd85c..6119782e3096 100644
--- a/x11-fonts/xfs/pkg-plist
+++ b/x11-fonts/xfs/pkg-plist
@@ -1,7 +1,3 @@
bin/xfs
man/man1/xfs.1.gz
-@unexec if cmp -s %D/etc/X11/fs/config.default %D/etc/X11/fs/config; then rm -f %D/etc/X11/fs/config; fi
-etc/X11/fs/config.default
-@exec if [ ! -f %D/etc/X11/fs/config ] ; then cp -p %D/%F %B/config; fi
-@dirrmtry etc/X11/fs
-@dirrmtry etc/X11
+@sample etc/X11/fs/config.sample
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index 7517c7737f25..2d1b68b9d73d 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -22,8 +22,7 @@ CONFLICTS= XFree86-font100dpi-*
NO_BUILD= # none
NO_MTREE= yes
-FONTDIR= ${LOCALBASE}/lib/X11/fonts
-
-do-install: # empty
+NO_INSTALL= yes
+FONTDIR= ${LOCALBASE}/share/fonts
.include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index f8632676fd10..08fb5844ee0c 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -22,8 +22,7 @@ CONFLICTS= XFree86-font75dpi-*
NO_BUILD= # none
NO_MTREE= yes
-FONTDIR= ${LOCALBASE}/lib/X11/fonts
-
-do-install: # empty
+NO_INSTALL= yes
+FONTDIR= ${LOCALBASE}/share/fonts
.include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index d2242bccc1eb..21adb7d821f2 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -21,8 +21,7 @@ CONFLICTS= XFree86-fontCyrillic-*
NO_BUILD= # none
NO_MTREE= yes
-FONTDIR= ${LOCALBASE}/lib/X11/fonts
-
-do-install: # empty
+NO_INSTALL= yes
+FONTDIR= ${LOCALBASE}/share/fonts
.include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 193725ed0589..72c77b2b2034 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -27,9 +27,8 @@ RUN_DEPENDS= ${FONTDIR}/misc/arabic24.pcf.gz:${PORTSDIR}/x11-fonts/font-arabic-m
CONFLICTS= XFree86-fontDefaultBitmaps-*
NO_BUILD= # none
+NO_INSTALL= yes
NO_MTREE= yes
-FONTDIR= ${LOCALBASE}/lib/X11/fonts
-
-do-install: # empty
+FONTDIR= ${LOCALBASE}/share/fonts
.include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index 76d230c911ea..9d903b655f23 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -15,13 +15,12 @@ COMMENT= X.Org TrueType fonts
RUN_DEPENDS= ${FONTDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf \
${FONTDIR}/OTF/SyrCOMAdiabene.otf:${PORTSDIR}/x11-fonts/font-misc-meltho \
${FONTDIR}/TTF/GohaTibebZemen.ttf:${PORTSDIR}/x11-fonts/font-misc-ethiopic \
- ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
- ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
-
-do-install: # empty
+ ${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
+ ${FONTDIR}/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
NO_BUILD= # none
+NO_INSTALL= yes
NO_MTREE= yes
-FONTDIR= ${LOCALBASE}/lib/X11/fonts
+FONTDIR= ${LOCALBASE}/share/fonts
.include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index f254b37620be..7b5d25ee028e 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -20,10 +20,9 @@ RUN_DEPENDS= ${FONTDIR}/Type1/UTBI____.afm:${PORTSDIR}/x11-fonts/font-adobe-utop
CONFLICTS= XFree86-fontScalable-*
-do-install: # empty
-
-NO_BUILD= # none
+NO_BUILD= yes
+NO_INSTALL= yes
NO_MTREE= yes
-FONTDIR= ${LOCALBASE}/lib/X11/fonts
+FONTDIR= ${LOCALBASE}/share/fonts
.include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index 6d61d8c93543..e2ba8b318ada 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -12,7 +12,6 @@ COMMENT= X.org fonts meta-port
USE_XORG= fontutil
-FONTSDIR= ${PREFIX}/lib/X11/fonts
RUN_DEPENDS= xorg-fonts-100dpi>=0:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
xorg-fonts-75dpi>=0:${PORTSDIR}/x11-fonts/xorg-fonts-75dpi \
xorg-fonts-cyrillic>=0:${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic \
diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index 6bd42693a17d..ad9ce936e2d8 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfstt
PORTVERSION= 1.9.1
+PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= http://archive.hadrons.org/software/xfstt/
@@ -17,7 +18,7 @@ USE_RC_SUBR= xfstt
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var --disable-nls
-TTFONTDIR= ${PREFIX}/lib/X11/fonts/TrueType
+TTFONTDIR= ${PREFIX}/share/fonts/TrueType
SUB_FILES= pkg-message
@@ -30,7 +31,6 @@ post-install:
${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.in \
> ${WRKSRC}/xfstt
${INSTALL_SCRIPT} ${WRKSRC}/xfstt ${STAGEDIR}${PREFIX}/etc/rc.d/
- ${MKDIR} ${STAGEDIR}${TTFONTDIR}
${MKDIR} ${STAGEDIR}${DOCSDIR}
.for _file in INSTALL THANKS
${INSTALL_DATA} ${WRKSRC}/${_file} ${STAGEDIR}${DOCSDIR}
diff --git a/x11-servers/Xfstt/files/pkg-message.in b/x11-servers/Xfstt/files/pkg-message.in
index 8b6524bcfd75..62b44ae1be33 100644
--- a/x11-servers/Xfstt/files/pkg-message.in
+++ b/x11-servers/Xfstt/files/pkg-message.in
@@ -1,7 +1,7 @@
******************************************************************
You will have to install your TrueType fonts in
- %%PREFIX%%/lib/X11/fonts/TrueType
+ %%PREFIX%%/share/fonts/TrueType
Remember to run the "xfstt --sync" command if you
add fonts while the font server is running.
diff --git a/x11-servers/Xfstt/pkg-plist b/x11-servers/Xfstt/pkg-plist
index bf000c7896a4..daf5614259d8 100644
--- a/x11-servers/Xfstt/pkg-plist
+++ b/x11-servers/Xfstt/pkg-plist
@@ -2,6 +2,4 @@ bin/xfstt
man/man1/xfstt.1x.gz
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/THANKS
-@rmtry lib/X11/fonts/TrueType/ttname.dir
-@rmtry lib/X11/fonts/TrueType/ttinfo.dir
-@dir lib/X11/fonts/TrueType
+@dir share/fonts/TrueType
diff --git a/x11-servers/x11rdp/Makefile b/x11-servers/x11rdp/Makefile
index 5128c1011db7..f620a3bd4f1f 100644
--- a/x11-servers/x11rdp/Makefile
+++ b/x11-servers/x11rdp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= x11rdp
PORTVERSION= 0.5.0.${X11RDPREVISION}
+PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= http://www.club.kyutech.ac.jp/~meta/distfiles/:x11rdp
DISTNAME= ${PORTNAME}_xorg71
diff --git a/x11-servers/x11rdp/files/patch-buildx_sh b/x11-servers/x11rdp/files/patch-buildx_sh
index 78e113a26d0d..86431acc2500 100644
--- a/x11-servers/x11rdp/files/patch-buildx_sh
+++ b/x11-servers/x11rdp/files/patch-buildx_sh
@@ -539,7 +539,7 @@
+ --with-mesa-source=$SRCDIR/Mesa-6.5 \
+ --disable-dmx \
+ --enable-xprint=no \
-+ --with-fontdir=%%LOCALBASE%%/lib/X11/fonts \
++ --with-fontdir=%%LOCALBASE%%/share/fonts \
+ --with-xkb-path=%%LOCALBASE%%/share/X11/xkb
+ find . -name Makefile|xargs sed -i".bak" -e "s|-I%%LOCALBASE%%/include||g"
if ! test $? -eq 0
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 9d9a54644276..fc71f8891ca6 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xorg-nestserver
PORTVERSION= 1.14.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= XORG
@@ -39,7 +40,9 @@ CONFIGURE_ARGS= --disable-dmx \
--disable-glx-tls \
--disable-vbe \
--disable-vgahw \
- --disable-xvfb
+ --disable-xvfb \
+ --with-fontrootdir=${PREFIX}/share/fonts \
+ --with-default-font-path="catalogue:${LOCALBASE}/etc/X11/fontpath.d,built-ins"
USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
damageproto xcmiscproto xextproto xf86miscproto inputproto \
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index b01ad4d4fffc..dd566bd9080c 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= xorg-server
PORTVERSION= 1.14.7
-PORTREVISION?= 2
+PORTREVISION?= 3
PORTEPOCH?= 1
CATEGORIES= x11-servers
MASTER_SITES= XORG
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index f06e9ce5dbc3..f46ce8012867 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xorg-vfbserver
PORTVERSION= 1.14.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= XORG
@@ -39,7 +40,9 @@ CONFIGURE_ARGS= --disable-dmx \
--disable-glx-tls \
--disable-vbe \
--disable-vgahw \
- --enable-xvfb
+ --enable-xvfb \
+ --with-fontrootdir=${PREFIX}/share/fonts \
+ --with-default-font-path="catalogue:${LOCALBASE}/etc/X11/fontpath.d,built-ins"
USE_XORG= pixman x11 fixesproto damageproto xcmiscproto xtrans \
bigreqsproto randrproto renderproto xextproto inputproto \
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 5a54d96c24f1..2d54e031c6f4 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -36,8 +36,8 @@ VERSION= 1.8.0
LIBVERSION= 0.3600.8
PLIST_SUB+= VERSION=${VERSION} LIBVERSION=${LIBVERSION}
-FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
+FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf
+FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir
OPTIONS_DEFINE= X11
OPTIONS_DEFAULT=X11
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index be8ed9f90995..7d69f97889ca 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -46,8 +46,8 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \
-I../../include/Qt -I../../include
-FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
+FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf
+FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir
.include "${.CURDIR}/../../devel/qt4/files/Makefile.options"
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index 67ee719685fd..932b821ddadb 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -58,13 +58,13 @@ QT_CONFIG= accessibility accessibility-atspi-bridge dbus \
# Inherited from Qt 4.
.if defined(PACKAGE_BUILDING)
-RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
+RUN_DEPENDS+= ${LOCALBASE}/share/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
xorg-fonts-truetype>0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
.endif
CFLAGS_powerpc64= -mminimal-toc
-post-build:
+post-build
.for d in ${MORE_WRKSRCS}
@cd ${WRKSRC}/${d} && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 984d0b742fc0..a9947005500e 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdockapp
PORTVERSION= 0.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= xride
@@ -14,16 +14,16 @@ COMMENT= Standard library for Window Maker dock apps
OPTIONS_DEFINE= EXAMPLES
OPTIONS_SUB= yes
-USES= libtool tar:bzip2
+USES= libtool fonts tar:bzip2
USE_LDCONFIG= yes
USE_XORG= xext xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-font --without-examples
post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/dockapp
-.for file in fonts.alias fonts.dir *.pcf.gz
- ${INSTALL_DATA} ${WRKSRC}/fonts/${file} ${STAGEDIR}${PREFIX}/lib/X11/fonts/dockapp
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+.for file in fonts.alias *.pcf.gz
+ ${INSTALL_DATA} ${WRKSRC}/fonts/${file} ${STAGEDIR}${FONTSDIR}
.endfor
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
.for file in README
diff --git a/x11-wm/libdockapp/pkg-plist b/x11-wm/libdockapp/pkg-plist
index c5bfdd1d7fc5..14e4c7750833 100644
--- a/x11-wm/libdockapp/pkg-plist
+++ b/x11-wm/libdockapp/pkg-plist
@@ -3,10 +3,9 @@ lib/libdockapp.a
lib/libdockapp.so
lib/libdockapp.so.2
lib/libdockapp.so.2.0.0
-lib/X11/fonts/dockapp/fonts.alias
-lib/X11/fonts/dockapp/fonts.dir
-lib/X11/fonts/dockapp/luxel-ascii-06x09.pcf.gz
-lib/X11/fonts/dockapp/seg7-ascii-05x07.pcf.gz
+%%FONTSDIR%%/fonts/dockapp/fonts.alias
+%%FONTSDIR%%/fonts/dockapp/luxel-ascii-06x09.pcf.gz
+%%FONTSDIR%%/fonts/dockapp/seg7-ascii-05x07.pcf.gz
%%EXAMPLES%%%%EXAMPLESDIR%%/README
%%EXAMPLES%%%%EXAMPLESDIR%%/basic/Imakefile
%%EXAMPLES%%%%EXAMPLESDIR%%/basic/README
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 783759eedadf..442ecdffd7ac 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS?= dconf-editor:${PORTSDIR}/devel/dconf-editor \
gnome-tweak-tool:${PORTSDIR}/deskutils/gnome-tweak-tool \
sushi>=0:${PORTSDIR}/x11-fm/sushi \
nautilus>=3.0.0:${PORTSDIR}/x11-fm/nautilus \
- ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+ ${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
yelp>=3.0.0:${PORTSDIR}/x11/yelp \
zenity>=3.0.0:${PORTSDIR}/x11/zenity \
diff --git a/x11/mate-base/Makefile b/x11/mate-base/Makefile
index 1f188ee06d76..65d5f2b34a27 100644
--- a/x11/mate-base/Makefile
+++ b/x11/mate-base/Makefile
@@ -11,7 +11,7 @@ EXTRACT_ONLY= # empty
MAINTAINER= gnome@FreeBSD.org
COMMENT= "meta-port" for the MATE base integrated X11 desktop
-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 \
${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
${LOCALBASE}/share/mate-background-properties/mate-desktop.xml:${PORTSDIR}/x11-themes/mate-backgrounds \
${LOCALBASE}/bin/mate-session:${PORTSDIR}/x11/mate-session-manager \
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index ad04188d9986..34fdf42b69b3 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -3,7 +3,7 @@
PORTNAME= metisse
PORTVERSION= 0.4.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= http://insitu.lri.fr/metisse/download/metisse/
@@ -34,7 +34,7 @@ SHEBANG_FILES= ${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.4.in \
${WRKSRC}/fvwm-insitu/modules/FvwmWindowMenu/FvwmWindowMenu.in
perl_OLD_CMD= @PERL@
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/lib/X11/fonts
+CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/share/fonts
USE_LDCONFIG= yes
USE_XORG= xcursor xft xinerama xpm xrender xt xtst
WANT_GNOME= yes
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index a244c140c843..15285bf3b628 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -3,6 +3,7 @@
PORTNAME= x3270
PORTVERSION= 3.3.15
+PORTREVISION= 1
CATEGORIES= x11 net
MASTER_SITES= http://x3270.bgp.nu/download/current/
EXTRACT_SUFX= ga7-src.tgz
@@ -17,10 +18,10 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
# Conflict due to x3270if
CONFLICTS= c3270-*
-USES= iconv imake:env
+USES= iconv fonts imake:env
USE_XORG= ice sm x11 xaw xext xmu xt
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/lib/X11/fonts/${PORTNAME} \
+CONFIGURE_ARGS+= --with-fontdir=${FONTSDIR} \
--disable-dbcs
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
diff --git a/x11/x3270/pkg-plist b/x11/x3270/pkg-plist
index 04d3eee84a9e..d0d420e271c8 100644
--- a/x11/x3270/pkg-plist
+++ b/x11/x3270/pkg-plist
@@ -1,25 +1,25 @@
bin/x3270
bin/x3270if
etc/x3270/ibm_hosts
-lib/X11/fonts/x3270/3270-12.pcf.gz
-lib/X11/fonts/x3270/3270-12b.pcf.gz
-lib/X11/fonts/x3270/3270-20.pcf.gz
-lib/X11/fonts/x3270/3270-20b.pcf.gz
-lib/X11/fonts/x3270/3270.pcf.gz
-lib/X11/fonts/x3270/3270b.pcf.gz
-lib/X11/fonts/x3270/3270gr.pcf.gz
-lib/X11/fonts/x3270/3270gt12.pcf.gz
-lib/X11/fonts/x3270/3270gt12b.pcf.gz
-lib/X11/fonts/x3270/3270gt16.pcf.gz
-lib/X11/fonts/x3270/3270gt16b.pcf.gz
-lib/X11/fonts/x3270/3270gt24.pcf.gz
-lib/X11/fonts/x3270/3270gt24b.pcf.gz
-lib/X11/fonts/x3270/3270gt32.pcf.gz
-lib/X11/fonts/x3270/3270gt32b.pcf.gz
-lib/X11/fonts/x3270/3270gt8.pcf.gz
-lib/X11/fonts/x3270/3270h.pcf.gz
+%%FONTSDIR%%/3270-12.pcf.gz
+%%FONTSDIR%%/3270-12b.pcf.gz
+%%FONTSDIR%%/3270-20.pcf.gz
+%%FONTSDIR%%/3270-20b.pcf.gz
+%%FONTSDIR%%/3270.pcf.gz
+%%FONTSDIR%%/3270b.pcf.gz
+%%FONTSDIR%%/3270gr.pcf.gz
+%%FONTSDIR%%/3270gt12.pcf.gz
+%%FONTSDIR%%/3270gt12b.pcf.gz
+%%FONTSDIR%%/3270gt16.pcf.gz
+%%FONTSDIR%%/3270gt16b.pcf.gz
+%%FONTSDIR%%/3270gt24.pcf.gz
+%%FONTSDIR%%/3270gt24b.pcf.gz
+%%FONTSDIR%%/3270gt32.pcf.gz
+%%FONTSDIR%%/3270gt32b.pcf.gz
+%%FONTSDIR%%/3270gt8.pcf.gz
+%%FONTSDIR%%/3270h.pcf.gz
+@comment %%FONTSDIR%%/fonts.dir
man/man1/x3270-script.man.gz
man/man1/x3270.man.gz
man/man1/x3270if.man.gz
man/man5/ibm_hosts.man.gz
-@fontsdir lib/X11/fonts/x3270