diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-20 01:12:20 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-20 01:12:20 +0000 |
| commit | 6bc7b7ce5dca31aeba10feab51f6522baef39fa3 (patch) | |
| tree | 6c84536921c7c5a3def1d614c13a8a70d850700c | |
| parent | 82ae895c0bfc875ead9a37815f837215abb5eaf8 (diff) | |
| download | ports-6bc7b7ce5dca31aeba10feab51f6522baef39fa3.tar.gz ports-6bc7b7ce5dca31aeba10feab51f6522baef39fa3.zip | |
Rework XORG_CAT= font
Fonts are now generating the fonts.scale and fonts.dir at install time
font-alias is not needed anymore for the above reason
extract font-util and encodings out of XORG_CAT=fonts because they do not
install any fonts
make XORG_CAT=fonts use USES=fonts
Notes
Notes:
svn path=/head/; revision=381702
75 files changed, 224 insertions, 363 deletions
@@ -7441,3 +7441,4 @@ devel/p5-Errno||2015-03-09|Errno is part of Perl devel/p5-Class-XSAccessor-Array||2015-03-09|Has been a part of devel/p5-Class-XSAccessor for >5 years. Use that port instead multimedia/ffmpeg25|multimedia/ffmpeg26|2015-03-14|ffmpeg upstream now points to 2.6.x series www/squid33|www/squid|2015-03-15|Has expired: Reached EOL on 28 August 2014, use www/squid (v3.4) instead +x11-fonts/font-alias||2015-03-20|Not needed anymore aliases are created dynamically diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk index 5b5c8b533559..200b58b26703 100644 --- a/Mk/Uses/display.mk +++ b/Mk/Uses/display.mk @@ -18,7 +18,6 @@ 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/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index 941505d3f50e..72427c95bb3c 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -69,50 +69,12 @@ USES+= libtool . endif . if ${XORG_CAT} == "font" -FONTDIR?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/} +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 -NEED_MKFONTFOO= yes - -. if ${PORTNAME:M*type1*}x != x -INSTALLS_TTF?= yes -. elif ${PORTNAME:M*ttf*}x != x -INSTALLS_TTF?= yes -. elif ${PORTNAME:M*encodings*}x != x -# This is terrific, we want mkfontscale at build time, but don't use it like for the other ports. -NEED_MKFONTFOO= no -BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -INSTALLS_TTF?= no -. else -INSTALLS_TTF?= no -. endif - -. if ${PORTNAME:M*font-util*}x != x -USES+= pathfix -NEED_MKFONTFOO= no -. elif ${INSTALLS_TTF} == "yes" -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig -. else -BUILD_DEPENDS+= ${LOCALBASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf -. endif - -. if ${NEED_MKFONTFOO} == "yes" -BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -RUN_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -. endif - -. for _fontdir in ${FONTDIR} -. if ${INSTALLS_TTF} == yes && ${NEED_MKFONTFOO} == yes -PLIST_FILES+= "@fcfontsdir ${PREFIX}/lib/X11/fonts/${_fontdir}" -. elif ${INSTALLS_TTF} == yes && ${NEED_MKFONTFOO} == no -PLIST_FILES+= "@fc ${PREFIX}/lib/X11/fonts/${_fontdir}" -. elif ${NEED_MKFONTFOO} == yes -PLIST_FILES+= "@fontsdir ${PREFIX}/lib/X11/fonts/${_fontdir}" -. endif -. endfor +USES+= fonts +BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf .endif . if ${XORG_CAT} == "lib" diff --git a/japanese/font-jisx0213/Makefile b/japanese/font-jisx0213/Makefile index 34f86cd53c75..bf6445757fa4 100644 --- a/japanese/font-jisx0213/Makefile +++ b/japanese/font-jisx0213/Makefile @@ -3,7 +3,7 @@ PORTNAME= jisx0213 PORTVERSION= 20040425 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese x11-fonts MASTER_SITES= http://www12.ocn.ne.jp/~imamura/ \ LOCAL/hrs:yagi @@ -20,30 +20,21 @@ COMMENT= Japanese jisx0213 fonts BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +USES= fonts USE_XORG= fontutil -XORG_CAT= font NO_WRKSUBDIR= yes EXTRACT_CMD= ${GZCAT} EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= > ${WRKDIR}/$${file%.gz} MAKE_ENV= STAGEDIR=${STAGEDIR} FONTDIR=${LOCALFONTDIR} -PLIST_SUB= FONTDIR=${LOCALFONTDIR} XFONTDIR=lib/X11/fonts/${FONTDIR} -SUB_FILES= Makefile +PLIST_SUB= LOCALFONTSDIR=${LOCALFONTDIR} +MAKEFILE= ${FILESDIR}/Makefile LOCALFONTDIR= share/font-${PORTNAME} -pre-build: apply-slist - -do-configure: - @${DO_NADA} - -post-install-fontdir: - ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/X11/fonts/${FONTDIR} - cd ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR} && ${LN} -s -f \ - ${FONTDIR:C,[^/]+,..,g}/../../../${LOCALFONTDIR}/*.pcf.gz . - ${LOCALBASE}/bin/mkfontscale ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR} - ${LOCALBASE}/bin/mkfontdir ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR} - -post-install: post-install-fontdir +post-install: + ${MKDIR} ${STAGEDIR}/${FONTSDIR} + cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \ + ../../../../${LOCALFONTDIR}/*.pcf.gz . \ .include <bsd.port.mk> diff --git a/japanese/font-jisx0213/distinfo b/japanese/font-jisx0213/distinfo index 99137a7bf98c..44d1608f8d86 100644 --- a/japanese/font-jisx0213/distinfo +++ b/japanese/font-jisx0213/distinfo @@ -1,20 +1,20 @@ -SHA256 (xorg/font/jiskan16-2004-1.bdf.gz) = d79a57b81d3626414cb207eafec8d7b94fc2e7efabb5dce9d3ae58416e82ea3d -SIZE (xorg/font/jiskan16-2004-1.bdf.gz) = 303930 -SHA256 (xorg/font/jiskan16-2000-1.bdf.gz) = 34e05cb59ae562d53b4b8fa5620454e9a060208f76da915c7da844f581e94830 -SIZE (xorg/font/jiskan16-2000-1.bdf.gz) = 303401 -SHA256 (xorg/font/jiskan16-2000-2.bdf.gz) = 14d5db8001d4f289df98ce1371f782e81add21281bf4b7f8cd7041cb1c6306cd -SIZE (xorg/font/jiskan16-2000-2.bdf.gz) = 92122 -SHA256 (xorg/font/K14-2004-1.bdf.gz) = 3b5a49ebc3673d672cef3353110c8ee7ba277173c967c69b2b6e406aeae5309f -SIZE (xorg/font/K14-2004-1.bdf.gz) = 256459 -SHA256 (xorg/font/K14-2000-1.bdf.gz) = ceaa15568961fba5b86734b1aa86ebfeee641e2f43c55bde4a419e373bb5bdf9 -SIZE (xorg/font/K14-2000-1.bdf.gz) = 255684 -SHA256 (xorg/font/K14-2000-2.bdf.gz) = 05f1f7729a167b01e9d28d704fdf5cb83a20e69a659acae69e1f08e45eb036a9 -SIZE (xorg/font/K14-2000-2.bdf.gz) = 75139 -SHA256 (xorg/font/K12-1.bdf.gz) = 6095fcca99d24dd0dd749a83f99663f24c2a6972e7848844185ba52afbbdab00 -SIZE (xorg/font/K12-1.bdf.gz) = 212803 -SHA256 (xorg/font/K12-2.bdf.gz) = 5cd4f41095a7c4c2d89bcf85a0a467066cd3824ed80ca4434e02a3968bde0376 -SIZE (xorg/font/K12-2.bdf.gz) = 64099 -SHA256 (xorg/font/jiskan24-2000-1.bdf.gz) = 8de41ed35156ccd77d9930ee91322819bc568d468be99a8e59f905e4bdc5821b -SIZE (xorg/font/jiskan24-2000-1.bdf.gz) = 516369 -SHA256 (xorg/font/jiskan24-2000-2.bdf.gz) = fe6412ffa9feb11eccad206417864c81bb880b477b9f5693d438d028958cdb1b -SIZE (xorg/font/jiskan24-2000-2.bdf.gz) = 155750 +SHA256 (jiskan16-2004-1.bdf.gz) = d79a57b81d3626414cb207eafec8d7b94fc2e7efabb5dce9d3ae58416e82ea3d +SIZE (jiskan16-2004-1.bdf.gz) = 303930 +SHA256 (jiskan16-2000-1.bdf.gz) = 34e05cb59ae562d53b4b8fa5620454e9a060208f76da915c7da844f581e94830 +SIZE (jiskan16-2000-1.bdf.gz) = 303401 +SHA256 (jiskan16-2000-2.bdf.gz) = 14d5db8001d4f289df98ce1371f782e81add21281bf4b7f8cd7041cb1c6306cd +SIZE (jiskan16-2000-2.bdf.gz) = 92122 +SHA256 (K14-2004-1.bdf.gz) = 3b5a49ebc3673d672cef3353110c8ee7ba277173c967c69b2b6e406aeae5309f +SIZE (K14-2004-1.bdf.gz) = 256459 +SHA256 (K14-2000-1.bdf.gz) = ceaa15568961fba5b86734b1aa86ebfeee641e2f43c55bde4a419e373bb5bdf9 +SIZE (K14-2000-1.bdf.gz) = 255684 +SHA256 (K14-2000-2.bdf.gz) = 05f1f7729a167b01e9d28d704fdf5cb83a20e69a659acae69e1f08e45eb036a9 +SIZE (K14-2000-2.bdf.gz) = 75139 +SHA256 (K12-1.bdf.gz) = 6095fcca99d24dd0dd749a83f99663f24c2a6972e7848844185ba52afbbdab00 +SIZE (K12-1.bdf.gz) = 212803 +SHA256 (K12-2.bdf.gz) = 5cd4f41095a7c4c2d89bcf85a0a467066cd3824ed80ca4434e02a3968bde0376 +SIZE (K12-2.bdf.gz) = 64099 +SHA256 (jiskan24-2000-1.bdf.gz) = 8de41ed35156ccd77d9930ee91322819bc568d468be99a8e59f905e4bdc5821b +SIZE (jiskan24-2000-1.bdf.gz) = 516369 +SHA256 (jiskan24-2000-2.bdf.gz) = fe6412ffa9feb11eccad206417864c81bb880b477b9f5693d438d028958cdb1b +SIZE (jiskan24-2000-2.bdf.gz) = 155750 diff --git a/japanese/font-jisx0213/files/Makefile.in b/japanese/font-jisx0213/files/Makefile index beed26ca22bf..beed26ca22bf 100644 --- a/japanese/font-jisx0213/files/Makefile.in +++ b/japanese/font-jisx0213/files/Makefile diff --git a/japanese/font-jisx0213/pkg-plist b/japanese/font-jisx0213/pkg-plist index 79f9206b17f8..bf1ae6e7e9b0 100644 --- a/japanese/font-jisx0213/pkg-plist +++ b/japanese/font-jisx0213/pkg-plist @@ -1,82 +1,80 @@ -%%FONTDIR%%/K12-1.pcf.gz -%%FONTDIR%%/K12-1b.pcf.gz -%%FONTDIR%%/K12-1bi.pcf.gz -%%FONTDIR%%/K12-1i.pcf.gz -%%FONTDIR%%/K12-2.pcf.gz -%%FONTDIR%%/K12-2b.pcf.gz -%%FONTDIR%%/K12-2bi.pcf.gz -%%FONTDIR%%/K12-2i.pcf.gz -%%FONTDIR%%/K14-2000-1.pcf.gz -%%FONTDIR%%/K14-2000-1b.pcf.gz -%%FONTDIR%%/K14-2000-1bi.pcf.gz -%%FONTDIR%%/K14-2000-1i.pcf.gz -%%FONTDIR%%/K14-2000-2.pcf.gz -%%FONTDIR%%/K14-2000-2b.pcf.gz -%%FONTDIR%%/K14-2000-2bi.pcf.gz -%%FONTDIR%%/K14-2000-2i.pcf.gz -%%FONTDIR%%/K14-2004-1.pcf.gz -%%FONTDIR%%/K14-2004-1b.pcf.gz -%%FONTDIR%%/K14-2004-1bi.pcf.gz -%%FONTDIR%%/K14-2004-1i.pcf.gz -%%FONTDIR%%/jiskan16-2000-1.pcf.gz -%%FONTDIR%%/jiskan16-2000-1b.pcf.gz -%%FONTDIR%%/jiskan16-2000-1bi.pcf.gz -%%FONTDIR%%/jiskan16-2000-1i.pcf.gz -%%FONTDIR%%/jiskan16-2000-2.pcf.gz -%%FONTDIR%%/jiskan16-2000-2b.pcf.gz -%%FONTDIR%%/jiskan16-2000-2bi.pcf.gz -%%FONTDIR%%/jiskan16-2000-2i.pcf.gz -%%FONTDIR%%/jiskan16-2004-1.pcf.gz -%%FONTDIR%%/jiskan16-2004-1b.pcf.gz -%%FONTDIR%%/jiskan16-2004-1bi.pcf.gz -%%FONTDIR%%/jiskan16-2004-1i.pcf.gz -%%FONTDIR%%/jiskan24-2000-1.pcf.gz -%%FONTDIR%%/jiskan24-2000-1b.pcf.gz -%%FONTDIR%%/jiskan24-2000-1bi.pcf.gz -%%FONTDIR%%/jiskan24-2000-1i.pcf.gz -%%FONTDIR%%/jiskan24-2000-2.pcf.gz -%%FONTDIR%%/jiskan24-2000-2b.pcf.gz -%%FONTDIR%%/jiskan24-2000-2bi.pcf.gz -%%FONTDIR%%/jiskan24-2000-2i.pcf.gz -%%XFONTDIR%%/K12-1.pcf.gz -%%XFONTDIR%%/K12-1b.pcf.gz -%%XFONTDIR%%/K12-1bi.pcf.gz -%%XFONTDIR%%/K12-1i.pcf.gz -%%XFONTDIR%%/K12-2.pcf.gz -%%XFONTDIR%%/K12-2b.pcf.gz -%%XFONTDIR%%/K12-2bi.pcf.gz -%%XFONTDIR%%/K12-2i.pcf.gz -%%XFONTDIR%%/K14-2000-1.pcf.gz -%%XFONTDIR%%/K14-2000-1b.pcf.gz -%%XFONTDIR%%/K14-2000-1bi.pcf.gz -%%XFONTDIR%%/K14-2000-1i.pcf.gz -%%XFONTDIR%%/K14-2000-2.pcf.gz -%%XFONTDIR%%/K14-2000-2b.pcf.gz -%%XFONTDIR%%/K14-2000-2bi.pcf.gz -%%XFONTDIR%%/K14-2000-2i.pcf.gz -%%XFONTDIR%%/K14-2004-1.pcf.gz -%%XFONTDIR%%/K14-2004-1b.pcf.gz -%%XFONTDIR%%/K14-2004-1bi.pcf.gz -%%XFONTDIR%%/K14-2004-1i.pcf.gz -%%XFONTDIR%%/jiskan16-2000-1.pcf.gz -%%XFONTDIR%%/jiskan16-2000-1b.pcf.gz -%%XFONTDIR%%/jiskan16-2000-1bi.pcf.gz -%%XFONTDIR%%/jiskan16-2000-1i.pcf.gz -%%XFONTDIR%%/jiskan16-2000-2.pcf.gz -%%XFONTDIR%%/jiskan16-2000-2b.pcf.gz -%%XFONTDIR%%/jiskan16-2000-2bi.pcf.gz -%%XFONTDIR%%/jiskan16-2000-2i.pcf.gz -%%XFONTDIR%%/jiskan16-2004-1.pcf.gz -%%XFONTDIR%%/jiskan16-2004-1b.pcf.gz -%%XFONTDIR%%/jiskan16-2004-1bi.pcf.gz -%%XFONTDIR%%/jiskan16-2004-1i.pcf.gz -%%XFONTDIR%%/jiskan24-2000-1.pcf.gz -%%XFONTDIR%%/jiskan24-2000-1b.pcf.gz -%%XFONTDIR%%/jiskan24-2000-1bi.pcf.gz -%%XFONTDIR%%/jiskan24-2000-1i.pcf.gz -%%XFONTDIR%%/jiskan24-2000-2.pcf.gz -%%XFONTDIR%%/jiskan24-2000-2b.pcf.gz -%%XFONTDIR%%/jiskan24-2000-2bi.pcf.gz -%%XFONTDIR%%/jiskan24-2000-2i.pcf.gz -%%XFONTDIR%%/fonts.dir -%%XFONTDIR%%/fonts.scale +%%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 +%%FONTSDIR%%/K12-1i.pcf.gz +%%FONTSDIR%%/K12-2.pcf.gz +%%FONTSDIR%%/K12-2b.pcf.gz +%%FONTSDIR%%/K12-2bi.pcf.gz +%%FONTSDIR%%/K12-2i.pcf.gz +%%FONTSDIR%%/K14-2000-1.pcf.gz +%%FONTSDIR%%/K14-2000-1b.pcf.gz +%%FONTSDIR%%/K14-2000-1bi.pcf.gz +%%FONTSDIR%%/K14-2000-1i.pcf.gz +%%FONTSDIR%%/K14-2000-2.pcf.gz +%%FONTSDIR%%/K14-2000-2b.pcf.gz +%%FONTSDIR%%/K14-2000-2bi.pcf.gz +%%FONTSDIR%%/K14-2000-2i.pcf.gz +%%FONTSDIR%%/K14-2004-1.pcf.gz +%%FONTSDIR%%/K14-2004-1b.pcf.gz +%%FONTSDIR%%/K14-2004-1bi.pcf.gz +%%FONTSDIR%%/K14-2004-1i.pcf.gz +%%FONTSDIR%%/jiskan16-2000-1.pcf.gz +%%FONTSDIR%%/jiskan16-2000-1b.pcf.gz +%%FONTSDIR%%/jiskan16-2000-1bi.pcf.gz +%%FONTSDIR%%/jiskan16-2000-1i.pcf.gz +%%FONTSDIR%%/jiskan16-2000-2.pcf.gz +%%FONTSDIR%%/jiskan16-2000-2b.pcf.gz +%%FONTSDIR%%/jiskan16-2000-2bi.pcf.gz +%%FONTSDIR%%/jiskan16-2000-2i.pcf.gz +%%FONTSDIR%%/jiskan16-2004-1.pcf.gz +%%FONTSDIR%%/jiskan16-2004-1b.pcf.gz +%%FONTSDIR%%/jiskan16-2004-1bi.pcf.gz +%%FONTSDIR%%/jiskan16-2004-1i.pcf.gz +%%FONTSDIR%%/jiskan24-2000-1.pcf.gz +%%FONTSDIR%%/jiskan24-2000-1b.pcf.gz +%%FONTSDIR%%/jiskan24-2000-1bi.pcf.gz +%%FONTSDIR%%/jiskan24-2000-1i.pcf.gz +%%FONTSDIR%%/jiskan24-2000-2.pcf.gz +%%FONTSDIR%%/jiskan24-2000-2b.pcf.gz +%%FONTSDIR%%/jiskan24-2000-2bi.pcf.gz +%%FONTSDIR%%/jiskan24-2000-2i.pcf.gz diff --git a/net/vnc/Makefile b/net/vnc/Makefile index 97cd5b0a4e40..13fc7285c610 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vnc PORTVERSION= 4.1.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net ipv6 MASTER_SITES= http://home.bluelife.at/ports/distfiles/${DIST_SUBDIR}/:vnc DISTNAME= vnc-4_1_3-unixsrc @@ -55,8 +55,7 @@ MAKE_ARGS= AR='ar rc' .endif 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 + xorg-fonts-miscbitmaps>0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps EXTRA_PATCHES+= ${WRKSRC}/xc.patch \ ${PATCHDIR}/vnc.def-patch \ diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile index e9e20dc38373..ae2ce7734b13 100644 --- a/x11-fonts/Makefile +++ b/x11-fonts/Makefile @@ -47,7 +47,6 @@ SUBDIR += font-adobe-utopia-100dpi SUBDIR += font-adobe-utopia-75dpi SUBDIR += font-adobe-utopia-type1 - SUBDIR += font-alias SUBDIR += font-arabic-misc SUBDIR += font-bh-100dpi SUBDIR += font-bh-75dpi diff --git a/x11-fonts/andika/Makefile b/x11-fonts/andika/Makefile index f0d769b7a841..be84557181b7 100644 --- a/x11-fonts/andika/Makefile +++ b/x11-fonts/andika/Makefile @@ -2,6 +2,7 @@ PORTNAME= Andika PORTVERSION= 1.004 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MEDIA_ID}&filename=/ @@ -10,18 +11,14 @@ COMMENT= Andika TrueType fonts LICENSE= OFL11 -XORG_CAT= font +USES= fonts -FONTLIBPATH= lib/X11/fonts -FONTROOTDIR= ${PREFIX}/${FONTLIBPATH} -INSTALLS_TTF= yes MEDIA_ID= ${PORTNAME}-${PORTVERSION}.zip NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME:S,.orig,,:S,_,-,} -PLIST_FILES= ${FONTLIBPATH}/${FONTDIR}/Andika-R.ttf +PLIST_FILES= ${FONTSDIR}/Andika-R.ttf -SUB_LIST= "FONTPATH=${FONTROOTDIR}/${FONTDIR}" SUB_FILES= pkg-message DOCSLIST= FONTLOG.txt OFL-FAQ.txt README.txt @@ -29,15 +26,10 @@ PORTDOCS= ${DOCSLIST:C,^.*/,,} OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -do-configure: - ${DO_NADA} - do-install: - ${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCSLIST:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/andika/distinfo b/x11-fonts/andika/distinfo index e30a3d0c7b2d..9d1aa2e57e1b 100644 --- a/x11-fonts/andika/distinfo +++ b/x11-fonts/andika/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/font/Andika-1.004.tar.bz2) = e7de847f4ccfd881249630992e8b3d2dba2bec093eda9991d554228c7f14e77c -SIZE (xorg/font/Andika-1.004.tar.bz2) = 1000025 +SHA256 (Andika-1.004.tar.gz) = e7de847f4ccfd881249630992e8b3d2dba2bec093eda9991d554228c7f14e77c +SIZE (Andika-1.004.tar.gz) = 1000025 diff --git a/x11-fonts/andika/files/pkg-message.in b/x11-fonts/andika/files/pkg-message.in index 7117adce42d0..66a3d98c1032 100644 --- a/x11-fonts/andika/files/pkg-message.in +++ b/x11-fonts/andika/files/pkg-message.in @@ -1,7 +1,7 @@ To use these fonts, add the following line to the "Files" section of xorg.conf: - FontPath "%%FONTPATH%%/" + FontPath "%%FONTSDIR%%/" Users of older versions of X may additionally have to make sure that the freetype module is loaded. Check /var/log/Xorg.0.log for error diff --git a/x11-fonts/charis-compact/Makefile b/x11-fonts/charis-compact/Makefile index 01ef0e66d84e..399bd2515328 100644 --- a/x11-fonts/charis-compact/Makefile +++ b/x11-fonts/charis-compact/Makefile @@ -3,6 +3,7 @@ PORTNAME= CharisSILCompact PORTVERSION= 4.114 +PORTREVISION= 1 CATEGORIES= x11-fonts #unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy .if defined(MAINTAINER_MODE) @@ -17,33 +18,23 @@ COMMENT= Charis SIL TrueType font collection, compact variant LICENSE= OFL11 -USES= zip -XORG_CAT= font +USES= fonts zip -FONTROOTDIR= ${PREFIX}/lib/X11/fonts -INSTALLS_TTF= yes NO_BUILD= yes -USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP .for type in B BI I R -PLIST_FILES+= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-${type}.ttf +PLIST_FILES+= ${FONTSDIR}/${PORTNAME}-${type}.ttf .endfor OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml -SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}" SUB_FILES= pkg-message -do-configure: - @${DO_NADA} - do-install: - ${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR} - (cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}) + ${MKDIR} ${STAGEDIR}${FONTSDIR} + (cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}) ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) diff --git a/x11-fonts/charis-compact/distinfo b/x11-fonts/charis-compact/distinfo index 46a872362d0f..2ed5572ef601 100644 --- a/x11-fonts/charis-compact/distinfo +++ b/x11-fonts/charis-compact/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/font/CharisSILCompact-4.114.zip) = b8df263c64d1590c419e0cb4317666312036da07ea6f2f2bea49736453042095 -SIZE (xorg/font/CharisSILCompact-4.114.zip) = 2743777 +SHA256 (CharisSILCompact-4.114.zip) = b8df263c64d1590c419e0cb4317666312036da07ea6f2f2bea49736453042095 +SIZE (CharisSILCompact-4.114.zip) = 2743777 diff --git a/x11-fonts/charis-compact/files/pkg-message.in b/x11-fonts/charis-compact/files/pkg-message.in index b648d77200d4..9ce0ab9fbb48 100644 --- a/x11-fonts/charis-compact/files/pkg-message.in +++ b/x11-fonts/charis-compact/files/pkg-message.in @@ -1,7 +1,7 @@ To use these fonts, add the following line to the "Files" section of xorg.conf: - FontPath "%%DIR%%/" + FontPath "%%FONTSDIR%%/" Users of older versions of X may additionally have to make sure that the freetype module is loaded. Check /var/log/Xorg.0.log for error diff --git a/x11-fonts/charis/Makefile b/x11-fonts/charis/Makefile index 02e5e1cb2102..489cd7ba0717 100644 --- a/x11-fonts/charis/Makefile +++ b/x11-fonts/charis/Makefile @@ -3,6 +3,7 @@ PORTNAME= CharisSIL PORTVERSION= 4.114 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \ LOCAL/bf @@ -13,34 +14,24 @@ COMMENT= Charis SIL TrueType font collection LICENSE= OFL11 -USES= zip -XORG_CAT= font +USES= fonts zip -FONTROOTDIR= ${PREFIX}/lib/X11/fonts -INSTALLS_TTF= yes MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX} NO_BUILD= yes -USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP .for type in B BI I R -PLIST_FILES+= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-${type}.ttf +PLIST_FILES+= ${FONTSDIR}/${PORTNAME}-${type}.ttf .endfor OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt -SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}" SUB_FILES= pkg-message -do-configure: - @${DO_NADA} - do-install: - ${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR} - (cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}) + ${MKDIR} ${STAGEDIR}${FONTSDIR} + (cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}) ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) diff --git a/x11-fonts/charis/distinfo b/x11-fonts/charis/distinfo index 9429a3599b8e..3b6a3396ac23 100644 --- a/x11-fonts/charis/distinfo +++ b/x11-fonts/charis/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/font/CharisSIL-4.114.zip) = 92ea75512a0bee4d491ba23fb295fd410707f6e8dedacd1af81e222a3081dd56 -SIZE (xorg/font/CharisSIL-4.114.zip) = 2782898 +SHA256 (CharisSIL-4.114.zip) = 92ea75512a0bee4d491ba23fb295fd410707f6e8dedacd1af81e222a3081dd56 +SIZE (CharisSIL-4.114.zip) = 2782898 diff --git a/x11-fonts/charis/files/pkg-message.in b/x11-fonts/charis/files/pkg-message.in index b648d77200d4..9ce0ab9fbb48 100644 --- a/x11-fonts/charis/files/pkg-message.in +++ b/x11-fonts/charis/files/pkg-message.in @@ -1,7 +1,7 @@ To use these fonts, add the following line to the "Files" section of xorg.conf: - FontPath "%%DIR%%/" + FontPath "%%FONTSDIR%%/" Users of older versions of X may additionally have to make sure that the freetype module is loaded. Check /var/log/Xorg.0.log for error diff --git a/x11-fonts/doulos-compact/Makefile b/x11-fonts/doulos-compact/Makefile index 4bc3356bfbf0..43776052c7cf 100644 --- a/x11-fonts/doulos-compact/Makefile +++ b/x11-fonts/doulos-compact/Makefile @@ -3,7 +3,7 @@ PORTNAME= DoulosSILCompact PORTVERSION= 4.110 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts #unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy .if defined(MAINTAINER_MODE) @@ -18,33 +18,22 @@ COMMENT= Doulos SIL TrueType font collection, compact variant LICENSE= OFL11 -USES= zip -XORG_CAT= font +USES= fonts zip -FONTROOTDIR= ${PREFIX}/lib/X11/fonts -INSTALLS_TTF= yes NO_BUILD= yes -PLIST_FILES= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf +PLIST_FILES= ${FONTSDIR}/${PORTNAME}-R.ttf OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml -SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}" SUB_FILES= pkg-message -do-configure: - @${DO_NADA} - do-install: - @${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR} - @(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}) -.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${FONTSDIR} + @(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}) @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> diff --git a/x11-fonts/doulos-compact/distinfo b/x11-fonts/doulos-compact/distinfo index 15b3e633d8b4..1f78d7109b15 100644 --- a/x11-fonts/doulos-compact/distinfo +++ b/x11-fonts/doulos-compact/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/font/DoulosSILCompact-4.110.zip) = 9a9ccec7a722ba86d7b45aa335fa4fdab23e46392876358b6ac99dc6233a8b92 -SIZE (xorg/font/DoulosSILCompact-4.110.zip) = 1491644 +SHA256 (DoulosSILCompact-4.110.zip) = 9a9ccec7a722ba86d7b45aa335fa4fdab23e46392876358b6ac99dc6233a8b92 +SIZE (DoulosSILCompact-4.110.zip) = 1491644 diff --git a/x11-fonts/doulos-compact/files/pkg-message.in b/x11-fonts/doulos-compact/files/pkg-message.in index b648d77200d4..9ce0ab9fbb48 100644 --- a/x11-fonts/doulos-compact/files/pkg-message.in +++ b/x11-fonts/doulos-compact/files/pkg-message.in @@ -1,7 +1,7 @@ To use these fonts, add the following line to the "Files" section of xorg.conf: - FontPath "%%DIR%%/" + FontPath "%%FONTSDIR%%/" Users of older versions of X may additionally have to make sure that the freetype module is loaded. Check /var/log/Xorg.0.log for error diff --git a/x11-fonts/doulos/Makefile b/x11-fonts/doulos/Makefile index d666574b6ca1..3ac40620f05d 100644 --- a/x11-fonts/doulos/Makefile +++ b/x11-fonts/doulos/Makefile @@ -3,44 +3,33 @@ PORTNAME= DoulosSIL PORTVERSION= 4.112 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \ LOCAL/bf -MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory MAINTAINER= bf@FreeBSD.org COMMENT= Doulos SIL TrueType font collection LICENSE= OFL11 -USES= zip -XORG_CAT= font +USES= fonts zip -FONTROOTDIR= ${PREFIX}/lib/X11/fonts -INSTALLS_TTF= yes MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX} NO_BUILD= yes -PLIST_FILES= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf +PLIST_FILES= ${FONTSDIR}/${PORTNAME}-R.ttf OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt -SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}" SUB_FILES= pkg-message -do-configure: - @${DO_NADA} - do-install: - @${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR} - @(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}) -.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${FONTSDIR} + @(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}) @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> diff --git a/x11-fonts/doulos/distinfo b/x11-fonts/doulos/distinfo index 2ffe31f4c614..679ddb7645d7 100644 --- a/x11-fonts/doulos/distinfo +++ b/x11-fonts/doulos/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/font/DoulosSIL-4.112.zip) = c8716224955d3991fdaf1d70fefdef1b0f76e122291b6d741c401778987c096a -SIZE (xorg/font/DoulosSIL-4.112.zip) = 1075038 +SHA256 (DoulosSIL-4.112.zip) = c8716224955d3991fdaf1d70fefdef1b0f76e122291b6d741c401778987c096a +SIZE (DoulosSIL-4.112.zip) = 1075038 diff --git a/x11-fonts/doulos/files/pkg-message.in b/x11-fonts/doulos/files/pkg-message.in index b648d77200d4..9ce0ab9fbb48 100644 --- a/x11-fonts/doulos/files/pkg-message.in +++ b/x11-fonts/doulos/files/pkg-message.in @@ -1,7 +1,7 @@ To use these fonts, add the following line to the "Files" section of xorg.conf: - FontPath "%%DIR%%/" + FontPath "%%FONTSDIR%%/" Users of older versions of X may additionally have to make sure that the freetype module is loaded. Check /var/log/Xorg.0.log for error diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile index bcc592cd8603..08d61facd99c 100644 --- a/x11-fonts/encodings/Makefile +++ b/x11-fonts/encodings/Makefile @@ -2,15 +2,18 @@ PORTNAME= encodings PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 +MASTER_SITES= XORG/individual/font CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Encoding fonts -XORG_CAT= font +USES= tar:bzip2 USE_XORG= fontutil -FONTDIR= encodings/large encodings +BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/lib/X11/fonts .include <bsd.port.mk> diff --git a/x11-fonts/encodings/distinfo b/x11-fonts/encodings/distinfo index ec8027edeeba..8869cc5896de 100644 --- a/x11-fonts/encodings/distinfo +++ b/x11-fonts/encodings/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/font/encodings-1.0.4.tar.bz2) = ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539 -SIZE (xorg/font/encodings-1.0.4.tar.bz2) = 665087 +SHA256 (encodings-1.0.4.tar.bz2) = ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539 +SIZE (encodings-1.0.4.tar.bz2) = 665087 diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile index 59cdb52ed499..acac64d40c77 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile index 63c41f57c972..b8a266de97a5 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile index 4ad846942bdc..7393e3c0eead 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile index e20690f7e000..b7d9ea18ba64 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile index 31e8fc41b9ba..ec80dd6c5d90 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile deleted file mode 100644 index ed6aa51e0819..000000000000 --- a/x11-fonts/font-alias/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Pawel Worach -# $FreeBSD$ - -PORTNAME= font-alias -PORTVERSION= 1.0.3 -PORTREVISION= 1 -CATEGORIES= x11-fonts - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org Font aliases - -XORG_CAT= font -FONTDIR= 100dpi 75dpi misc cyrillic - -.include <bsd.port.mk> diff --git a/x11-fonts/font-alias/distinfo b/x11-fonts/font-alias/distinfo deleted file mode 100644 index ff640278ee95..000000000000 --- a/x11-fonts/font-alias/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/font/font-alias-1.0.3.tar.bz2) = 8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a -SIZE (xorg/font/font-alias-1.0.3.tar.bz2) = 102537 diff --git a/x11-fonts/font-alias/pkg-descr b/x11-fonts/font-alias/pkg-descr deleted file mode 100644 index 448b621e1ac1..000000000000 --- a/x11-fonts/font-alias/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains X.Org Font aliases. - -WWW: http://www.x.org/ diff --git a/x11-fonts/font-alias/pkg-plist b/x11-fonts/font-alias/pkg-plist deleted file mode 100644 index 77c2e5ec4897..000000000000 --- a/x11-fonts/font-alias/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -lib/X11/fonts/100dpi/fonts.alias -lib/X11/fonts/75dpi/fonts.alias -lib/X11/fonts/cyrillic/fonts.alias -lib/X11/fonts/misc/fonts.alias diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile index 334a6a019716..c59d32fee18b 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile index de413085a685..a3541652862d 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile index 9c6f73271d7f..0254f0c8e5df 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile index 10325d1bef44..95f3f03915cf 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile index 296cbb122fa7..1095b82508fb 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile index b48d9417cedf..447c6afe3907 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile index 747936c0257e..37433a589482 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile index e681a8d9bafe..9a924547ef1c 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile index 81f44256ccc0..81481b36748b 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile index c9b7dabb59ea..8fdfbd68941a 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile index 01f3a2c00c78..142b110ed14f 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile index 75dcb84080c7..cccf42dd548e 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile index 989a37d312c7..b347db7340cc 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile index 7c86b547155d..429c28b6414b 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile index 8f2926107bc4..d7e4bd1d599b 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile index 42fa7c5acbdc..3d77d4d7ac0e 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile index da7dfa753791..b88dc7855055 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile index ae8f580b081a..83904dc9a1ff 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile index 253e3c7d62e2..b1b35958ebe9 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile index 9669dd77f9ab..ec60868ecd40 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile index 96a10897fad6..72b2a33092d2 100644 --- a/x11-fonts/font-misc-ethiopic/Makefile +++ b/x11-fonts/font-misc-ethiopic/Makefile @@ -2,14 +2,14 @@ PORTNAME= font-misc-ethiopic PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Ethiopic font XORG_CAT= font -INSTALLS_TTF= yes -FONTDIR= TTF OTF +FONTNAME= TTF +PLIST_FILES= "@fcfontsdir ${PREFIX}/lib/X11/fonts/OTF" .include <bsd.port.mk> diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile index 1eb225d0b7c1..4769205630e7 100644 --- a/x11-fonts/font-misc-meltho/Makefile +++ b/x11-fonts/font-misc-meltho/Makefile @@ -2,14 +2,13 @@ PORTNAME= font-misc-meltho PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Meltho font XORG_CAT= font -INSTALLS_TTF= yes -FONTDIR= OTF +FONTNAME= OTF .include <bsd.port.mk> diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile index 892e937da7f0..fb2d5090f123 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile index 0f7a9c0cd1f4..4efa69d60878 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile index 387c96d846dd..2d16a4b55a98 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile index 977ef07bc2d5..7f7b50cc4087 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile index ac761738d57c..3fc4a48cc447 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= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile index 18ebce3cf7e1..0dd7dc4c4d33 100644 --- a/x11-fonts/font-sun-misc/Makefile +++ b/x11-fonts/font-sun-misc/Makefile @@ -4,18 +4,11 @@ PORTNAME= font-sun-misc PORTVERSION= 1.0.3 PORTREVISION= 2 -MASTER_SITES= XORG/individual/font CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Sun fonts -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ - mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir - -USES= fonts tar:bzip2 -FONTNAME= misc -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/lib/X11/fonts +XORG_CAT= font .include <bsd.port.mk> diff --git a/x11-fonts/font-sun-misc/distinfo b/x11-fonts/font-sun-misc/distinfo index 3a16f57b8199..2c7a1154cda5 100644 --- a/x11-fonts/font-sun-misc/distinfo +++ b/x11-fonts/font-sun-misc/distinfo @@ -1,2 +1,2 @@ -SHA256 (font-sun-misc-1.0.3.tar.bz2) = 481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0 -SIZE (font-sun-misc-1.0.3.tar.bz2) = 116360 +SHA256 (xorg/font/font-sun-misc-1.0.3.tar.bz2) = 481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0 +SIZE (xorg/font/font-sun-misc-1.0.3.tar.bz2) = 116360 diff --git a/x11-fonts/font-sun-misc/pkg-plist b/x11-fonts/font-sun-misc/pkg-plist index 2381c9b24cb4..545fdca117cb 100644 --- a/x11-fonts/font-sun-misc/pkg-plist +++ b/x11-fonts/font-sun-misc/pkg-plist @@ -1,5 +1,5 @@ -%%FONTSDIR%%/olcursor.pcf.gz -%%FONTSDIR%%/olgl10.pcf.gz -%%FONTSDIR%%/olgl12.pcf.gz -%%FONTSDIR%%/olgl14.pcf.gz -%%FONTSDIR%%/olgl19.pcf.gz +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 diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile index fab4f6c45625..3856a8376da4 100644 --- a/x11-fonts/font-util/Makefile +++ b/x11-fonts/font-util/Makefile @@ -4,11 +4,14 @@ PORTNAME= font-util PORTVERSION= 1.3.0 PORTREVISION= 1 +MASTER_SITES= XORG/individual/font CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= Create an index of X font files in a directory -XORG_CAT= font +USES= pathfix tar:bzip2 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/lib/X11/fonts .include <bsd.port.mk> diff --git a/x11-fonts/font-util/distinfo b/x11-fonts/font-util/distinfo index 04b5d74769f3..0121d288665a 100644 --- a/x11-fonts/font-util/distinfo +++ b/x11-fonts/font-util/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/font/font-util-1.3.0.tar.bz2) = dfa9e55625a4e0250f32fabab1fd5c8ffcd2d1ff2720d6fcf0f74bc8a5929195 -SIZE (xorg/font/font-util-1.3.0.tar.bz2) = 142059 +SHA256 (font-util-1.3.0.tar.bz2) = dfa9e55625a4e0250f32fabab1fd5c8ffcd2d1ff2720d6fcf0f74bc8a5929195 +SIZE (font-util-1.3.0.tar.bz2) = 142059 diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile index bd1d540709ad..83530dcd2195 100644 --- a/x11-fonts/font-winitzki-cyrillic/Makefile +++ b/x11-fonts/font-winitzki-cyrillic/Makefile @@ -4,19 +4,11 @@ PORTNAME= font-winitzki-cyrillic PORTVERSION= 1.0.3 PORTREVISION= 2 -MASTER_SITES= XORG/individual/font CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Winitzki Cyrillic font -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ - mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir - -USES= fonts -FONTNAME= cyrillic -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/lib/X11/fonts -PLIST_FILES= ${FONTSDIR}/proof9x16.pcf.gz +XORG_CAT= font .include <bsd.port.mk> diff --git a/x11-fonts/font-winitzki-cyrillic/distinfo b/x11-fonts/font-winitzki-cyrillic/distinfo index c97e43fb29c6..83a29cda6e61 100644 --- a/x11-fonts/font-winitzki-cyrillic/distinfo +++ b/x11-fonts/font-winitzki-cyrillic/distinfo @@ -1,2 +1,2 @@ -SHA256 (font-winitzki-cyrillic-1.0.3.tar.gz) = 503e70ee66af34f6ec4426c0f4ae708e9d30dafdcd58f671a87c7bf56b1952a3 -SIZE (font-winitzki-cyrillic-1.0.3.tar.gz) = 122005 +SHA256 (xorg/font/font-winitzki-cyrillic-1.0.3.tar.bz2) = abd13b63d02fcaec488686c23683e5cf640b43bd32f8ca22eeae6f84df0a36a0 +SIZE (xorg/font/font-winitzki-cyrillic-1.0.3.tar.bz2) = 100564 diff --git a/x11-fonts/font-winitzki-cyrillic/pkg-plist b/x11-fonts/font-winitzki-cyrillic/pkg-plist new file mode 100644 index 000000000000..34cd024a0471 --- /dev/null +++ b/x11-fonts/font-winitzki-cyrillic/pkg-plist @@ -0,0 +1 @@ +lib/X11/fonts/cyrillic/proof9x16.pcf.gz diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile index 848beddc24ce..f6343afdf145 100644 --- a/x11-fonts/font-xfree86-type1/Makefile +++ b/x11-fonts/font-xfree86-type1/Makefile @@ -3,19 +3,12 @@ PORTNAME= font-xfree86-type1 PORTVERSION= 1.0.4 -PORTREVISION= 1 -MASTER_SITES= XORG/individual/font +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org XFree86 Type1 font -BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir - -USES= fonts -FONTNAME= Type1 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/lib/X11/fonts -PLIST_FILES= ${FONTSDIR}/cursor.pfa +XORG_CAT= font .include <bsd.port.mk> diff --git a/x11-fonts/font-xfree86-type1/distinfo b/x11-fonts/font-xfree86-type1/distinfo index e7f3b5c8352f..7e38de29ee2c 100644 --- a/x11-fonts/font-xfree86-type1/distinfo +++ b/x11-fonts/font-xfree86-type1/distinfo @@ -1,2 +1,2 @@ -SHA256 (font-xfree86-type1-1.0.4.tar.gz) = 02b3839ae79ba6a7750525bb3b0c281305664b95bf63b4a0baa230a277b4f928 -SIZE (font-xfree86-type1-1.0.4.tar.gz) = 151426 +SHA256 (xorg/font/font-xfree86-type1-1.0.4.tar.bz2) = caebf42aec7be7f3bd40e0f232d6f34881b853dc84acfcdf7458358701fbe34a +SIZE (xorg/font/font-xfree86-type1-1.0.4.tar.bz2) = 126641 diff --git a/x11-fonts/font-xfree86-type1/pkg-plist b/x11-fonts/font-xfree86-type1/pkg-plist new file mode 100644 index 000000000000..a312274597a2 --- /dev/null +++ b/x11-fonts/font-xfree86-type1/pkg-plist @@ -0,0 +1 @@ +lib/X11/fonts/Type1/cursor.pfa diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile index 33a70418a992..6d61d8c93543 100644 --- a/x11-fonts/xorg-fonts/Makefile +++ b/x11-fonts/xorg-fonts/Makefile @@ -18,8 +18,7 @@ RUN_DEPENDS= xorg-fonts-100dpi>=0:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \ xorg-fonts-cyrillic>=0:${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic \ xorg-fonts-miscbitmaps>=0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \ xorg-fonts-truetype>=0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \ - xorg-fonts-type1>=0:${PORTSDIR}/x11-fonts/xorg-fonts-type1 \ - ${FONTSDIR}/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias + xorg-fonts-type1>=0:${PORTSDIR}/x11-fonts/xorg-fonts-type1 NO_BUILD= yes diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile index 90b75155ec8e..e5e3c4af23ff 100644 --- a/x11/xcalc/Makefile +++ b/x11/xcalc/Makefile @@ -2,6 +2,7 @@ PORTNAME= xcalc PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -9,7 +10,6 @@ COMMENT= Scientific calculator for X RUN_DEPENDS= font-misc-misc>=1.1.2:${PORTSDIR}/x11-fonts/font-misc-misc \ font-adobe-100dpi>=1.0.3:${PORTSDIR}/x11-fonts/font-adobe-100dpi \ - font-alias>=1.0.3:${PORTSDIR}/x11-fonts/font-alias \ xbitmaps>=1.1.0:${PORTSDIR}/x11/xbitmaps XORG_CAT= app |