Skip to content

Commit

Permalink
Rework XORG_CAT= font
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@bapt
bapt committed Mar 20, 2015
1 parent 075cd14 commit 915b957
Show file tree
Hide file tree
Showing 75 changed files with 224 additions and 363 deletions.
1 change: 1 addition & 0 deletions MOVED
View file
Expand Up @@ -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
1 change: 0 additions & 1 deletion Mk/Uses/display.mk
View file
Expand Up @@ -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

Expand Down
46 changes: 4 additions & 42 deletions Mk/bsd.xorg.mk
View file
Expand Up @@ -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"
Expand Down
25 changes: 8 additions & 17 deletions japanese/font-jisx0213/Makefile
View file
Expand Up @@ -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
Expand All @@ -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>
40 changes: 20 additions & 20 deletions japanese/font-jisx0213/distinfo
View file
@@ -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
0 japanese/font-jisx0213/files/Makefile.in → japanese/font-jisx0213/files/Makefile
View file
File renamed without changes.
162 changes: 80 additions & 82 deletions japanese/font-jisx0213/pkg-plist
View file
@@ -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
5 changes: 2 additions & 3 deletions net/vnc/Makefile
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion x11-fonts/Makefile
View file
Expand Up @@ -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
Expand Down
20 changes: 6 additions & 14 deletions x11-fonts/andika/Makefile
View file
Expand Up @@ -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=/

Expand All @@ -10,34 +11,25 @@ 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
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>
4 changes: 2 additions & 2 deletions x11-fonts/andika/distinfo
View file
@@ -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

0 comments on commit 915b957

Please sign in to comment.