svn commit: r381702 - in head: . Mk Mk/Uses japanese/font-jisx0213 japanese/font-jisx0213/files net/vnc x11-fonts x11-fonts/andika x11-fonts/andika/files x11-fonts/charis x11-fonts/charis-compact x...
Baptiste Daroussin
bapt at FreeBSD.org
Fri Mar 20 01:12:38 UTC 2015
Author: bapt
Date: Fri Mar 20 01:12:20 2015
New Revision: 381702
URL: https://svnweb.freebsd.org/changeset/ports/381702
QAT: https://qat.redports.org/buildarchive/r381702/
Log:
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
Added:
head/japanese/font-jisx0213/files/Makefile
- copied unchanged from r381700, head/japanese/font-jisx0213/files/Makefile.in
head/x11-fonts/font-winitzki-cyrillic/pkg-plist
- copied unchanged from r381672, head/x11-fonts/font-winitzki-cyrillic/pkg-plist
head/x11-fonts/font-xfree86-type1/pkg-plist
- copied unchanged from r381670, head/x11-fonts/font-xfree86-type1/pkg-plist
Deleted:
head/japanese/font-jisx0213/files/Makefile.in
head/x11-fonts/font-alias/
Modified:
head/MOVED
head/Mk/Uses/display.mk
head/Mk/bsd.xorg.mk
head/japanese/font-jisx0213/Makefile
head/japanese/font-jisx0213/distinfo
head/japanese/font-jisx0213/pkg-plist
head/net/vnc/Makefile
head/x11-fonts/Makefile
head/x11-fonts/andika/Makefile
head/x11-fonts/andika/distinfo
head/x11-fonts/andika/files/pkg-message.in
head/x11-fonts/charis-compact/Makefile
head/x11-fonts/charis-compact/distinfo
head/x11-fonts/charis-compact/files/pkg-message.in
head/x11-fonts/charis/Makefile
head/x11-fonts/charis/distinfo
head/x11-fonts/charis/files/pkg-message.in
head/x11-fonts/doulos-compact/Makefile
head/x11-fonts/doulos-compact/distinfo
head/x11-fonts/doulos-compact/files/pkg-message.in
head/x11-fonts/doulos/Makefile
head/x11-fonts/doulos/distinfo
head/x11-fonts/doulos/files/pkg-message.in
head/x11-fonts/encodings/Makefile
head/x11-fonts/encodings/distinfo
head/x11-fonts/font-adobe-100dpi/Makefile
head/x11-fonts/font-adobe-75dpi/Makefile
head/x11-fonts/font-adobe-utopia-100dpi/Makefile
head/x11-fonts/font-adobe-utopia-75dpi/Makefile
head/x11-fonts/font-adobe-utopia-type1/Makefile
head/x11-fonts/font-arabic-misc/Makefile
head/x11-fonts/font-bh-100dpi/Makefile
head/x11-fonts/font-bh-75dpi/Makefile
head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
head/x11-fonts/font-bh-ttf/Makefile
head/x11-fonts/font-bh-type1/Makefile
head/x11-fonts/font-bitstream-100dpi/Makefile
head/x11-fonts/font-bitstream-75dpi/Makefile
head/x11-fonts/font-bitstream-speedo/Makefile
head/x11-fonts/font-bitstream-type1/Makefile
head/x11-fonts/font-cronyx-cyrillic/Makefile
head/x11-fonts/font-cursor-misc/Makefile
head/x11-fonts/font-daewoo-misc/Makefile
head/x11-fonts/font-dec-misc/Makefile
head/x11-fonts/font-ibm-type1/Makefile
head/x11-fonts/font-isas-misc/Makefile
head/x11-fonts/font-jis-misc/Makefile
head/x11-fonts/font-micro-misc/Makefile
head/x11-fonts/font-misc-cyrillic/Makefile
head/x11-fonts/font-misc-ethiopic/Makefile
head/x11-fonts/font-misc-meltho/Makefile
head/x11-fonts/font-misc-misc/Makefile
head/x11-fonts/font-mutt-misc/Makefile
head/x11-fonts/font-schumacher-misc/Makefile
head/x11-fonts/font-screen-cyrillic/Makefile
head/x11-fonts/font-sony-misc/Makefile
head/x11-fonts/font-sun-misc/Makefile
head/x11-fonts/font-sun-misc/distinfo
head/x11-fonts/font-sun-misc/pkg-plist
head/x11-fonts/font-util/Makefile
head/x11-fonts/font-util/distinfo
head/x11-fonts/font-winitzki-cyrillic/Makefile
head/x11-fonts/font-winitzki-cyrillic/distinfo
head/x11-fonts/font-xfree86-type1/Makefile
head/x11-fonts/font-xfree86-type1/distinfo
head/x11-fonts/xorg-fonts/Makefile
head/x11/xcalc/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Thu Mar 19 23:11:48 2015 (r381701)
+++ head/MOVED Fri Mar 20 01:12:20 2015 (r381702)
@@ -7441,3 +7441,4 @@ devel/p5-Errno||2015-03-09|Errno is part
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
Modified: head/Mk/Uses/display.mk
==============================================================================
--- head/Mk/Uses/display.mk Thu Mar 19 23:11:48 2015 (r381701)
+++ head/Mk/Uses/display.mk Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/Mk/bsd.xorg.mk
==============================================================================
--- head/Mk/bsd.xorg.mk Thu Mar 19 23:11:48 2015 (r381701)
+++ head/Mk/bsd.xorg.mk Fri Mar 20 01:12:20 2015 (r381702)
@@ -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"
Modified: head/japanese/font-jisx0213/Makefile
==============================================================================
--- head/japanese/font-jisx0213/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/japanese/font-jisx0213/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -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>
Modified: head/japanese/font-jisx0213/distinfo
==============================================================================
--- head/japanese/font-jisx0213/distinfo Thu Mar 19 23:11:48 2015 (r381701)
+++ head/japanese/font-jisx0213/distinfo Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Copied: head/japanese/font-jisx0213/files/Makefile (from r381700, head/japanese/font-jisx0213/files/Makefile.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/font-jisx0213/files/Makefile Fri Mar 20 01:12:20 2015 (r381702, copy of r381700, head/japanese/font-jisx0213/files/Makefile.in)
@@ -0,0 +1,71 @@
+# $FreeBSD$
+.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
+MKITALIC_CMD?= ${LOCALBASE}/bin/mkitalic
+BDFTOPCF_CMD?= ${LOCALBASE}/bin/bdftopcf
+
+SRCS= K12-1.bdf K12-2.bdf \
+ K14-2004-1.bdf K14-2000-1.bdf K14-2000-2.bdf \
+ jiskan16-2004-1.bdf jiskan16-2000-1.bdf jiskan16-2000-2.bdf \
+ jiskan24-2000-1.bdf jiskan24-2000-2.bdf
+
+TARGETS=${SRCS:S/.bdf/.pcf.gz/} \
+ ${SRCS:S/.bdf/b.pcf.gz/} \
+ ${SRCS:S/.bdf/i.pcf.gz/} \
+ ${SRCS:S/.bdf/bi.pcf.gz/}
+
+all: ${TARGETS}
+
+.bdf.pcf:
+ ${BDFTOPCF_CMD} $> > $@
+CLEANFILES+= ${SRCS:S/.bdf/.pcf/}
+.for B in ${SRCS:S/.bdf//}
+${B}.pcf.gz: ${B}.pcf
+ ${GZIP_CMD} -c $> > $@
+CLEANFILES+= ${B}.pcf.gz
+.endfor
+
+# bold
+.for B in ${SRCS:S/.bdf//}
+${B}b.bdf: ${B}.bdf
+ ${MKBOLD_CMD} $> > $@
+${B}b.pcf: ${B}b.bdf
+ ${BDFTOPCF_CMD} $> > $@
+${B}b.pcf.gz: ${B}b.pcf
+ ${GZIP_CMD} -c $> > $@
+CLEANFILES+= ${B}b.bdf ${B}b.pcf ${B}b.pcf.gz
+.endfor
+
+# italic
+.for B in ${SRCS:S/.bdf//}
+${B}i.bdf: ${B}.bdf
+ ${MKITALIC_CMD} $> > $@
+${B}i.pcf: ${B}i.bdf
+ ${BDFTOPCF_CMD} $> > $@
+${B}i.pcf.gz: ${B}i.pcf
+ ${GZIP_CMD} -c $> > $@
+
+${B}bi.bdf: ${B}b.bdf
+ ${MKITALIC_CMD} $> > $@
+${B}bi.pcf: ${B}bi.bdf
+ ${BDFTOPCF_CMD} $> > $@
+${B}bi.pcf.gz: ${B}bi.pcf
+ ${GZIP_CMD} -c $> > $@
+CLEANFILES+= ${B}i.bdf ${B}bi.bdf \
+ ${B}i.pcf ${B}bi.pcf \
+ ${B}i.pcf.gz ${B}bi.pcf.gz
+.endfor
+
+install::
+ mkdir -p ${PREFIX}/${FONTDIR}
+ ${BSD_INSTALL_DATA} ${TARGETS} ${PREFIX}/${FONTDIR}
+
+clean::
+ rm -f ${TARGETS} ${CLEANFILES}
Modified: head/japanese/font-jisx0213/pkg-plist
==============================================================================
--- head/japanese/font-jisx0213/pkg-plist Thu Mar 19 23:11:48 2015 (r381701)
+++ head/japanese/font-jisx0213/pkg-plist Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/net/vnc/Makefile
==============================================================================
--- head/net/vnc/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/net/vnc/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -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 \
Modified: head/x11-fonts/Makefile
==============================================================================
--- head/x11-fonts/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/andika/Makefile
==============================================================================
--- head/x11-fonts/andika/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/andika/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -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>
Modified: head/x11-fonts/andika/distinfo
==============================================================================
--- head/x11-fonts/andika/distinfo Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/andika/distinfo Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/andika/files/pkg-message.in
==============================================================================
--- head/x11-fonts/andika/files/pkg-message.in Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/andika/files/pkg-message.in Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/charis-compact/Makefile
==============================================================================
--- head/x11-fonts/charis-compact/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/charis-compact/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -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 collec
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})
Modified: head/x11-fonts/charis-compact/distinfo
==============================================================================
--- head/x11-fonts/charis-compact/distinfo Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/charis-compact/distinfo Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/charis-compact/files/pkg-message.in
==============================================================================
--- head/x11-fonts/charis-compact/files/pkg-message.in Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/charis-compact/files/pkg-message.in Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/charis/Makefile
==============================================================================
--- head/x11-fonts/charis/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/charis/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -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 collec
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})
Modified: head/x11-fonts/charis/distinfo
==============================================================================
--- head/x11-fonts/charis/distinfo Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/charis/distinfo Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/charis/files/pkg-message.in
==============================================================================
--- head/x11-fonts/charis/files/pkg-message.in Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/charis/files/pkg-message.in Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/doulos-compact/Makefile
==============================================================================
--- head/x11-fonts/doulos-compact/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/doulos-compact/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -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 collec
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>
Modified: head/x11-fonts/doulos-compact/distinfo
==============================================================================
--- head/x11-fonts/doulos-compact/distinfo Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/doulos-compact/distinfo Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/doulos-compact/files/pkg-message.in
==============================================================================
--- head/x11-fonts/doulos-compact/files/pkg-message.in Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/doulos-compact/files/pkg-message.in Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/doulos/Makefile
==============================================================================
--- head/x11-fonts/doulos/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/doulos/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -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 at 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>
Modified: head/x11-fonts/doulos/distinfo
==============================================================================
--- head/x11-fonts/doulos/distinfo Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/doulos/distinfo Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/doulos/files/pkg-message.in
==============================================================================
--- head/x11-fonts/doulos/files/pkg-message.in Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/doulos/files/pkg-message.in Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/encodings/Makefile
==============================================================================
--- head/x11-fonts/encodings/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/encodings/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -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 at 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>
Modified: head/x11-fonts/encodings/distinfo
==============================================================================
--- head/x11-fonts/encodings/distinfo Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/encodings/distinfo Fri Mar 20 01:12:20 2015 (r381702)
@@ -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
Modified: head/x11-fonts/font-adobe-100dpi/Makefile
==============================================================================
--- head/x11-fonts/font-adobe-100dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-adobe-100dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-adobe-75dpi/Makefile
==============================================================================
--- head/x11-fonts/font-adobe-75dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-adobe-75dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-adobe-utopia-100dpi/Makefile
==============================================================================
--- head/x11-fonts/font-adobe-utopia-100dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-adobe-utopia-100dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-utopia-100dpi
PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-adobe-utopia-75dpi/Makefile
==============================================================================
--- head/x11-fonts/font-adobe-utopia-75dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-adobe-utopia-75dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-utopia-75dpi
PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-adobe-utopia-type1/Makefile
==============================================================================
--- head/x11-fonts/font-adobe-utopia-type1/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-adobe-utopia-type1/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-utopia-type1
PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-arabic-misc/Makefile
==============================================================================
--- head/x11-fonts/font-arabic-misc/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-arabic-misc/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-arabic-misc
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bh-100dpi/Makefile
==============================================================================
--- head/x11-fonts/font-bh-100dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bh-100dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-bh-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bh-75dpi/Makefile
==============================================================================
--- head/x11-fonts/font-bh-75dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bh-75dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-bh-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
==============================================================================
--- head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-bh-lucidatypewriter-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
==============================================================================
--- head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-bh-lucidatypewriter-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bh-ttf/Makefile
==============================================================================
--- head/x11-fonts/font-bh-ttf/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bh-ttf/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-bh-ttf
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bh-type1/Makefile
==============================================================================
--- head/x11-fonts/font-bh-type1/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bh-type1/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-bh-type1
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bitstream-100dpi/Makefile
==============================================================================
--- head/x11-fonts/font-bitstream-100dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bitstream-100dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-bitstream-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bitstream-75dpi/Makefile
==============================================================================
--- head/x11-fonts/font-bitstream-75dpi/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bitstream-75dpi/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-bitstream-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bitstream-speedo/Makefile
==============================================================================
--- head/x11-fonts/font-bitstream-speedo/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bitstream-speedo/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -2,7 +2,7 @@
PORTNAME= font-bitstream-speedo
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-bitstream-type1/Makefile
==============================================================================
--- head/x11-fonts/font-bitstream-type1/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-bitstream-type1/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-bitstream-type1
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-cronyx-cyrillic/Makefile
==============================================================================
--- head/x11-fonts/font-cronyx-cyrillic/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-cronyx-cyrillic/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-cronyx-cyrillic
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
Modified: head/x11-fonts/font-cursor-misc/Makefile
==============================================================================
--- head/x11-fonts/font-cursor-misc/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-cursor-misc/Makefile Fri Mar 20 01:12:20 2015 (r381702)
@@ -3,7 +3,7 @@
PORTNAME= font-cursor-misc
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list