diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /x11-fonts | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
Notes
Diffstat (limited to 'x11-fonts')
78 files changed, 179 insertions, 170 deletions
diff --git a/x11-fonts/arkpandora/Makefile b/x11-fonts/arkpandora/Makefile index 535510ca68c2..b53b3173f249 100644 --- a/x11-fonts/arkpandora/Makefile +++ b/x11-fonts/arkpandora/Makefile @@ -7,7 +7,7 @@ PORTNAME= arkpandora PORTVERSION= 2.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.users.bigpond.net.au/gavindi/ DISTNAME= ttf-${PORTNAME}-${PORTVERSION} @@ -20,7 +20,7 @@ BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig \ ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig -USE_X_PREFIX= yes +USE_XORG= x11 PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" @@ -33,7 +33,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTNAME= ${PORTNAME} FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME} -TTMKFDIR_CMD?= ${X11BASE}/bin/ttmkfdir +TTMKFDIR_CMD?= ${LOCALBASE}/bin/ttmkfdir .SILENT: @@ -75,7 +75,7 @@ install-conf: post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/arkpandora/pkg-plist b/x11-fonts/arkpandora/pkg-plist index 4bf58492e170..6f92b28fc224 100644 --- a/x11-fonts/arkpandora/pkg-plist +++ b/x11-fonts/arkpandora/pkg-plist @@ -20,4 +20,4 @@ etc/fonts/local.conf.arkpandora @unexec /bin/rm %D/%%FONTSDIR%%/fonts.scale @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/artwiz-aleczapka-de/Makefile b/x11-fonts/artwiz-aleczapka-de/Makefile index 6ba14bff2dbe..21431acaf89b 100644 --- a/x11-fonts/artwiz-aleczapka-de/Makefile +++ b/x11-fonts/artwiz-aleczapka-de/Makefile @@ -8,7 +8,7 @@ PORTNAME= artwiz-aleczapka-de PORTVERSION= 1.3 PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= artwizaleczapka MAINTAINER= herbert.skuhra@gmx.at @@ -21,7 +21,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTS= anorexia.de aqui.de cure.de drift.de edges.de fkp.de gelly.de \ glisp-bold.de glisp.de kates.de lime.de mints-mild.de \ mints-strong.de nu.de smoothansi.de snap.de -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias \ ${WRKSRC}/fonts.dir @@ -32,7 +32,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's|$${X11BASE}|${X11BASE}|g' \ + @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/artwiz-aleczapka-de/pkg-message b/x11-fonts/artwiz-aleczapka-de/pkg-message index 0831ae036e32..11bfafeb896f 100644 --- a/x11-fonts/artwiz-aleczapka-de/pkg-message +++ b/x11-fonts/artwiz-aleczapka-de/pkg-message @@ -6,11 +6,11 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/artwiz-aleczapka-de" + FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-de" Additionally you have to do: - # cd ${X11BASE}/lib/X11/fonts/artwiz-aleczapka-de + # cd ${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-de # fc-cache -v . ------------------------------------------------------------------ diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile index 442a4d545f3b..cdec317b8962 100644 --- a/x11-fonts/artwiz-aleczapka-se/Makefile +++ b/x11-fonts/artwiz-aleczapka-se/Makefile @@ -8,7 +8,7 @@ PORTNAME= artwiz-aleczapka-se PORTVERSION= 1.3 PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= artwizaleczapka MAINTAINER= herbert.skuhra@gmx.at @@ -21,7 +21,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTS= anorexia.se aqui.se cure.se drift.se edges.se fkp.se gelly.se \ glisp-bold.se glisp.se kates.se lime.se mints-mild.se \ mints-strong.se nu.se smoothansi.se snap.se -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias ${WRKSRC}/fonts.dir .include <bsd.port.pre.mk> @@ -31,7 +31,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's|$${X11BASE}|${X11BASE}|g' \ + @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/artwiz-aleczapka-se/pkg-message b/x11-fonts/artwiz-aleczapka-se/pkg-message index a8709505d38e..c4cd0b845dfb 100644 --- a/x11-fonts/artwiz-aleczapka-se/pkg-message +++ b/x11-fonts/artwiz-aleczapka-se/pkg-message @@ -6,11 +6,11 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/artwiz-aleczapka-se" + FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se" Additionally you have to do: - # cd ${X11BASE}/lib/X11/fonts/artwiz-aleczapka-se + # cd ${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se # fc-cache -v . ------------------------------------------------------------------ diff --git a/x11-fonts/artwiz-aleczapka/Makefile b/x11-fonts/artwiz-aleczapka/Makefile index 1bf4f134a5db..e66bf659f1b4 100644 --- a/x11-fonts/artwiz-aleczapka/Makefile +++ b/x11-fonts/artwiz-aleczapka/Makefile @@ -22,7 +22,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTS= anorexia aqui cure cursor drift edges fkp gelly \ glisp-bold glisp kates lime mints-mild mints-strong \ nu smoothansi snap -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias \ ${WRKSRC}/fonts.cache-1 ${WRKSRC}/fonts.dir @@ -33,7 +33,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's|$${X11BASE}|${X11BASE}|g' \ + @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/artwiz-aleczapka/pkg-message b/x11-fonts/artwiz-aleczapka/pkg-message index 6ce65b03252c..4154e64f29fa 100644 --- a/x11-fonts/artwiz-aleczapka/pkg-message +++ b/x11-fonts/artwiz-aleczapka/pkg-message @@ -6,6 +6,6 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/artwiz-aleczapka-en" + FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-en" ------------------------------------------------------------------ diff --git a/x11-fonts/artwiz-fonts/Makefile b/x11-fonts/artwiz-fonts/Makefile index 92bf0d329912..908ae2a99567 100644 --- a/x11-fonts/artwiz-fonts/Makefile +++ b/x11-fonts/artwiz-fonts/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/fluxbox-${PORTNAME} FONTS= anorexia aqui cure cursor drift edges gelly glisp-bold \ glisp lime mints-mild mints-strong nu snap -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf.gz,} ${FILESDIR}/fonts.dir .include <bsd.port.pre.mk> @@ -33,7 +33,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's|$${X11BASE}|${X11BASE}|g' \ + @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/artwiz-fonts/pkg-message b/x11-fonts/artwiz-fonts/pkg-message index da47a7453c2b..e9a245118b5f 100644 --- a/x11-fonts/artwiz-fonts/pkg-message +++ b/x11-fonts/artwiz-fonts/pkg-message @@ -6,6 +6,6 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/artwiz-fonts" + FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-fonts" ------------------------------------------------------------------ diff --git a/x11-fonts/avifonts/Makefile b/x11-fonts/avifonts/Makefile index c94d55dc938c..76673b2f90f8 100644 --- a/x11-fonts/avifonts/Makefile +++ b/x11-fonts/avifonts/Makefile @@ -33,7 +33,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/x11-fonts/avifonts/files/pkg-message.in b/x11-fonts/avifonts/files/pkg-message.in index fa36fd0606a7..53eac50fc8e4 100644 --- a/x11-fonts/avifonts/files/pkg-message.in +++ b/x11-fonts/avifonts/files/pkg-message.in @@ -9,6 +9,6 @@ Add the following line to the "Files" section of your X configuration file: FontPath "%%FONTSDIR%%/" -Note: your X configuration file is typically %%X11BASE%%/etc/X11/XF86Config -if you are using XFree86, and %%X11BASE%%/etc/X11/xorg.conf +Note: your X configuration file is typically %%LOCALBASE%%/etc/X11/XF86Config +if you are using XFree86, and %%LOCALBASE%%/etc/X11/xorg.conf if you are using X.Org. diff --git a/x11-fonts/avifonts/pkg-plist b/x11-fonts/avifonts/pkg-plist index 0bdc84fabe1c..e61897885f8b 100644 --- a/x11-fonts/avifonts/pkg-plist +++ b/x11-fonts/avifonts/pkg-plist @@ -17,4 +17,4 @@ %%FONTSDIR%%/fonts.dir @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile index 342ba0512467..1a16d07cc0c4 100644 --- a/x11-fonts/bitmap-fonts/Makefile +++ b/x11-fonts/bitmap-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= bitmap-fonts PORTVERSION= ${BITMAP_FONTS_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts elisp MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ \ ftp://ftp.jpl.org/pub/elisp/bitmap/snapshots/ @@ -16,7 +16,9 @@ DISTNAME= ${PORTNAME}-${BITMAP_FONTS_VER} MAINTAINER= conrads@cox.net COMMENT= Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale # distfile version BITMAP_FONTS_VER= 1.0 @@ -26,7 +28,6 @@ PKGINSTALL= ${WRKDIR}/INSTALL PKGDEINSTALL= ${WRKDIR}/DEINSTALL NO_WRKSUBDIR= yes -USE_X_PREFIX= yes PLIST_SUB= FONTSDIR=${FONTSDIR} @@ -43,18 +44,18 @@ do-build: done pre-install: - @${SETENV} PKG_PREFIX=${X11BASE} \ + @${SETENV} PKG_PREFIX=${LOCALBASE} \ ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: @(cd ${WRKSRC}; \ for i in ${BITMAP_FONTS_SIZE} ; do \ - ${INSTALL_DATA} bitmap$${i}.pcf.gz ${X11BASE}/${FONTSDIR} ; \ + ${INSTALL_DATA} bitmap$${i}.pcf.gz ${LOCALBASE}/${FONTSDIR} ; \ done ; \ ) post-install: - @${SETENV} PKG_PREFIX=${X11BASE} \ + @${SETENV} PKG_PREFIX=${LOCALBASE} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/x11-fonts/bitmap-fonts/pkg-descr b/x11-fonts/bitmap-fonts/pkg-descr index a539230a445d..b66d442678d9 100644 --- a/x11-fonts/bitmap-fonts/pkg-descr +++ b/x11-fonts/bitmap-fonts/pkg-descr @@ -3,6 +3,6 @@ Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font. Bitmap font is used on Mule with bitmap-mule or Emacs20 with bitmap-emacs20. Bitmap font is installed the following directory tree: - ${X11BASE}/lib/X11/fonts/local/ + ${LOCALBASE}/lib/X11/fonts/local/ --- Porting by shige <shige@FreeBSD.org> diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile index 559ff0d0c858..68dcfea5cd8e 100644 --- a/x11-fonts/bitstream-vera/Makefile +++ b/x11-fonts/bitstream-vera/Makefile @@ -22,7 +22,6 @@ BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig USE_BZIP2= yes -PREFIX?= ${X11BASE} NO_BUILD= yes MTREE_FILE= /etc/mtree/BSD.x11-4.dist @@ -67,7 +66,7 @@ install-docs: post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/bitstream-vera/pkg-plist b/x11-fonts/bitstream-vera/pkg-plist index 2298a6be2f44..c46c0ce42257 100644 --- a/x11-fonts/bitstream-vera/pkg-plist +++ b/x11-fonts/bitstream-vera/pkg-plist @@ -15,4 +15,4 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile index 6a1161ba690d..ab137e53a8b1 100644 --- a/x11-fonts/code2000/Makefile +++ b/x11-fonts/code2000/Makefile @@ -7,6 +7,7 @@ PORTNAME= code2000 PORTVERSION= 1.17 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://code2000.net/ DISTFILES= ${PORTNAME:U}${EXTRACT_SUFX:U} @@ -21,7 +22,6 @@ BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ RESTRICTED= Only unmodified original package can be distributed -USE_X_PREFIX= yes USE_ZIP= yes PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" @@ -33,9 +33,9 @@ SUB_LIST= FONTSDIR=${FONTSDIR} FONTNAME= ${PORTNAME} FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME} -MKFONTSCL_CMD= ${X11BASE}/bin/mkfontscale -MKFONTDIR_CMD= ${X11BASE}/bin/mkfontdir -FCCACHE_CMD= ${X11BASE}/bin/fc-cache -f -v +MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale +MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir +FCCACHE_CMD= ${LOCALBASE}/bin/fc-cache -f -v post-extract: move-fonts rename-license diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile index bdf91cdf176a..e5eda1711e03 100644 --- a/x11-fonts/cyr-rfx/Makefile +++ b/x11-fonts/cyr-rfx/Makefile @@ -7,7 +7,7 @@ PORTNAME= cyr-rfx-${CYR_RFX_ENCODING} PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts ukrainian russian MASTER_SITES= ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/%SUBDIR%/ \ ftp://ftp.inp.nsk.su/%SUBDIR%/ @@ -17,10 +17,11 @@ EXTRACT_SUFX= .bdfs.tgz MAINTAINER= mi@aldan.algebra.com COMMENT= Cyrillic X11 bitmap fonts from CYR-RFX project -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} \ - mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USE_X_PREFIX= yes +USE_XORG= x11 # See WWW for other available encodings CYR_RFX_ENCODING?= koi8-o @@ -30,11 +31,11 @@ NCPUS!= /sbin/sysctl -n hw.ncpu 2> /dev/null || echo 1 MAKE_ARGS+= -j ${NCPUS} MAKEFILE= ${FILESDIR}/Makefile.bdf2pcf INST_DIR= "lib/X11/fonts/${PORTNAME}" -MAKE_ENV+= INST_DIR="${X11BASE}/${INST_DIR}" MKDIR="${MKDIR}" +MAKE_ENV+= INST_DIR="${LOCALBASE}/${INST_DIR}" MKDIR="${MKDIR}" PLIST_SUB+= INST_DIR="${INST_DIR}" post-install: - @${SED} -e 's,/usr/X11R6,${X11BASE},g' -e \ + @${SED} -e 's,/usr/X11R6,${LOCALBASE},g' -e \ 's,koi8-o,${CYR_RFX_ENCODING},g' < ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile index e31a0f9adbb9..fbe367a52a08 100644 --- a/x11-fonts/dejavu/Makefile +++ b/x11-fonts/dejavu/Makefile @@ -8,9 +8,9 @@ PORTNAME= dejavu DISTVERSION= 2.24 +PORTREVISION= 1 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-fonts-ttf-${DISTVERSION} MAINTAINER= ahze@FreeBSD.org @@ -19,7 +19,7 @@ COMMENT= Bitstream Vera Fonts clone with a wider range of characters RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes PORTDOCS= README status.txt unicover.txt langcover.txt PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}/" @@ -43,7 +43,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} ${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile index e386b6f7eb62..a179da72ec50 100644 --- a/x11-fonts/etlfonts/Makefile +++ b/x11-fonts/etlfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= etlfonts-noncjk PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= # disappeared DISTNAME= non-cjk @@ -16,13 +16,14 @@ EXTRACT_SUFX= .tar MAINTAINER= mita@jp.FreeBSD.org COMMENT= X11 supplemental fonts -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf EXTRACT_AFTER_ARGS= # empty -USE_X_PREFIX= yes +USE_XORG= x11 post-extract: @${GUNZIP_CMD} ${WRKSRC}/*.gz diff --git a/x11-fonts/etlfonts/files/patch-aa b/x11-fonts/etlfonts/files/patch-aa index e6729548d8af..5677bfa0670a 100644 --- a/x11-fonts/etlfonts/files/patch-aa +++ b/x11-fonts/etlfonts/files/patch-aa @@ -11,13 +11,13 @@ + + install: .pcf_done + ( \ -+ if [ ! -d ${X11BASE}/lib/X11/fonts/non-cjk ] ; \ -+ then mkdir -p ${X11BASE}/lib/X11/fonts/non-cjk ; \ ++ if [ ! -d ${LOCALBASE}/lib/X11/fonts/non-cjk ] ; \ ++ then mkdir -p ${LOCALBASE}/lib/X11/fonts/non-cjk ; \ + fi ; \ + ) -+ cp *pcf* fonts.alias ${X11BASE}/lib/X11/fonts/non-cjk ++ cp *pcf* fonts.alias ${LOCALBASE}/lib/X11/fonts/non-cjk + ( \ -+ cd ${X11BASE}/lib/X11/fonts/non-cjk ; \ ++ cd ${LOCALBASE}/lib/X11/fonts/non-cjk ; \ + mkfontdir ; \ + ) + diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 124d2641e289..70da31009d97 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -22,14 +22,13 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ expat.6:${PORTSDIR}/textproc/expat2 USE_GMAKE= yes -PREFIX?= ${X11BASE} USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnometarget pkgconfig ltverhack CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ --with-expat-lib=${LOCALBASE}/lib \ - --with-default-fonts=${X11BASE}/lib/X11/fonts \ + --with-default-fonts=${LOCALBASE}/lib/X11/fonts \ --with-cache-dir=/var/db/fontconfig \ --without-add-fonts \ --disable-docs @@ -65,7 +64,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ fi @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ - s|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \ + s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} .if !defined(PACKAGE_BUILDING) @${LDCONFIG} -m ${PREFIX}/lib diff --git a/x11-fonts/fonts-indic/Makefile b/x11-fonts/fonts-indic/Makefile index 9a5c909736af..d8755742ca26 100644 --- a/x11-fonts/fonts-indic/Makefile +++ b/x11-fonts/fonts-indic/Makefile @@ -29,6 +29,6 @@ do-install: post-install: @${ECHO_MSG} "==> Running fc-cache" - @${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + @${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/fonts-te/Makefile b/x11-fonts/fonts-te/Makefile index da809e865133..46d70f21407e 100644 --- a/x11-fonts/fonts-te/Makefile +++ b/x11-fonts/fonts-te/Makefile @@ -36,7 +36,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} ${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/x11-fonts/fonts-te/pkg-plist b/x11-fonts/fonts-te/pkg-plist index 9984113c98e1..bad2de32825e 100644 --- a/x11-fonts/fonts-te/pkg-plist +++ b/x11-fonts/fonts-te/pkg-plist @@ -2,4 +2,4 @@ %%FONTSDIR%%/vemana.ttf @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile index 0932b80cbc10..66de0bdf44e8 100644 --- a/x11-fonts/geminifonts/Makefile +++ b/x11-fonts/geminifonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= gemini PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts MASTER_SITES= http://www.brama.com/compute/unix/ PKGNAMEPREFIX= koi8-u- @@ -18,17 +18,19 @@ EXTRACT_SUFX= .tgz MAINTAINER= mi@aldan.algebra.com COMMENT= Ukrainian KOI8 fonts for X11R6 (koi8-u) -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_PERL5_BUILD=yes -USE_X_PREFIX= yes +USE_XORG= x11 NO_WRKSUBDIR= yes MAKE_ARGS+= -j 2 post-patch: ${REINPLACE_CMD} -e 's/\.Z/.gz/g' \ - -e 's|DESTDIR =.*|DESTDIR=${X11BASE}/lib/X11/fonts/koi8-u-gemini|' \ + -e 's|DESTDIR =.*|DESTDIR=${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \ ${WRKSRC}/Makefile post-install: diff --git a/x11-fonts/geminifonts/pkg-message b/x11-fonts/geminifonts/pkg-message index 3be200142102..0e0b305c06a5 100644 --- a/x11-fonts/geminifonts/pkg-message +++ b/x11-fonts/geminifonts/pkg-message @@ -1,7 +1,7 @@ For your X-server to use the fonts, you have to add - the ${X11BASE}/lib/X11/fonts/koi8-u-gemini (X11BASE is, - usually, /usr/X11R6) to the server's font-path. Use + the ${LOCALBASE}/lib/X11/fonts/koi8-u-gemini (LOCALBASE is, + usually, /usr/local) to the server's font-path. Use ``xset fp+'' to do this for the current X-session and consult your X-server's documentation to make this permanent. diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile index 6f36916866d0..fa858d7b086d 100644 --- a/x11-fonts/gentium-basic/Makefile +++ b/x11-fonts/gentium-basic/Makefile @@ -70,7 +70,7 @@ install-docs: post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSTGT} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSTGT} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/gentium-basic/files/pkg-message.in b/x11-fonts/gentium-basic/files/pkg-message.in index f5ad2494becc..8a90340f04e5 100644 --- a/x11-fonts/gentium-basic/files/pkg-message.in +++ b/x11-fonts/gentium-basic/files/pkg-message.in @@ -1,7 +1,7 @@ IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts before using. The copyright can be found at - %%PREFIX%%/%%FONTSDIR%%/OFL + %%LOCALBASE%%/%%FONTSDIR%%/OFL To use these fonts, follow the instructions below. @@ -12,4 +12,4 @@ line to the "Modules" section of xorg.conf: Add the following line to the "Files" section of xorg.conf: - FontPath "%%PREFIX%%/%%FONTSDIR%%/" + FontPath "%%LOCALBASE%%/%%FONTSDIR%%/" diff --git a/x11-fonts/gentium-basic/pkg-plist b/x11-fonts/gentium-basic/pkg-plist index 5c0137f1186e..70513d3a0b94 100644 --- a/x11-fonts/gentium-basic/pkg-plist +++ b/x11-fonts/gentium-basic/pkg-plist @@ -16,5 +16,5 @@ etc/fonts/conf.d/%%FONTNAME%%.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true @dirrmtry etc/fonts/conf.d diff --git a/x11-fonts/gentium/Makefile b/x11-fonts/gentium/Makefile index 6f36916866d0..fa858d7b086d 100644 --- a/x11-fonts/gentium/Makefile +++ b/x11-fonts/gentium/Makefile @@ -70,7 +70,7 @@ install-docs: post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSTGT} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSTGT} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/gentium/files/pkg-message.in b/x11-fonts/gentium/files/pkg-message.in index f5ad2494becc..8a90340f04e5 100644 --- a/x11-fonts/gentium/files/pkg-message.in +++ b/x11-fonts/gentium/files/pkg-message.in @@ -1,7 +1,7 @@ IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts before using. The copyright can be found at - %%PREFIX%%/%%FONTSDIR%%/OFL + %%LOCALBASE%%/%%FONTSDIR%%/OFL To use these fonts, follow the instructions below. @@ -12,4 +12,4 @@ line to the "Modules" section of xorg.conf: Add the following line to the "Files" section of xorg.conf: - FontPath "%%PREFIX%%/%%FONTSDIR%%/" + FontPath "%%LOCALBASE%%/%%FONTSDIR%%/" diff --git a/x11-fonts/gentium/pkg-plist b/x11-fonts/gentium/pkg-plist index 5c0137f1186e..70513d3a0b94 100644 --- a/x11-fonts/gentium/pkg-plist +++ b/x11-fonts/gentium/pkg-plist @@ -16,5 +16,5 @@ etc/fonts/conf.d/%%FONTNAME%%.conf %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true @dirrmtry etc/fonts/conf.d diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile index fbb461bfdcb9..680b2f9e3f4e 100644 --- a/x11-fonts/getbdf/Makefile +++ b/x11-fonts/getbdf/Makefile @@ -7,7 +7,7 @@ PORTNAME= getbdf PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.netsw.org/x11/tools/internal/ DISTNAME= ${PORTNAME} @@ -18,7 +18,7 @@ COMMENT= Convert any X server font to .bdf format PLIST_FILES= bin/getbdf USE_PERL5_BUILD=yes -USE_X_PREFIX= yes +USE_XORG= x11 NO_WRKSUBDIR= yes ALL_TARGET= getbdf diff --git a/x11-fonts/getbdf/files/patch-aa b/x11-fonts/getbdf/files/patch-aa index f02f0a6b4f56..3c534f9d5464 100644 --- a/x11-fonts/getbdf/files/patch-aa +++ b/x11-fonts/getbdf/files/patch-aa @@ -27,11 +27,11 @@ --- 1,10 ---- OBJS= getbdf.o Xargs.o open_display.o -! CFLAGS+= -I. -I${X11BASE}/include +! CFLAGS+= -I. -I${LOCALBASE}/include getbdf: $(OBJS) -! cc $(CFLAGS) $(OBJS) -o getbdf -L${X11BASE}/lib -lX11 -lm +! cc $(CFLAGS) $(OBJS) -o getbdf -L${LOCALBASE}/lib -lX11 -lm clean: rm -f $(OBJS) getbdf diff --git a/x11-fonts/gnome-font-sampler/Makefile b/x11-fonts/gnome-font-sampler/Makefile index 78de511bc13e..90dfdf13c21a 100644 --- a/x11-fonts/gnome-font-sampler/Makefile +++ b/x11-fonts/gnome-font-sampler/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-font-sampler PORTVERSION= 0.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-fonts MASTER_SITES= http://linuxadvocate.org/projects/gfontsampler/downloads/ DISTNAME= gfontsampler-${PORTVERSION} @@ -15,8 +15,7 @@ DISTNAME= gfontsampler-${PORTVERSION} MAINTAINER= jylefort@FreeBSD.org COMMENT= A program for viewing several fonts at once -USE_X_PREFIX= yes -USE_GCC= 3.4+ +USE_XORG= x11 USE_GNOME= libgnomeui gnomeprefix USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index 2a6641b2530f..9dc729ec0b2d 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= intlfonts PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= intlfonts @@ -15,11 +15,12 @@ MASTER_SITE_SUBDIR= intlfonts MAINTAINER= conrads@cox.net COMMENT= Free X11 fonts for all characters that Emacs can handle -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} \ - type1inst:${PORTSDIR}/x11-fonts/p5-type1inst +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +RUN_DEPENDS= type1inst:${PORTSDIR}/x11-fonts/p5-type1inst -USE_X_PREFIX= yes +USE_XORG= x11 PLIST_SUB= FONTSDIR=${FONTSDIR} T1_FONTSDIR=${T1_FONTSDIR} \ TT_FONTSDIR=${TT_FONTSDIR} DOCDIR=${DOCDIR} diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile index f766a8043341..0e636b496097 100644 --- a/x11-fonts/jmk-x11-fonts/Makefile +++ b/x11-fonts/jmk-x11-fonts/Makefile @@ -7,14 +7,16 @@ PORTNAME= jmk-x11-fonts PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.jmknoble.net/fonts/ MAINTAINER= olgeni@FreeBSD.org COMMENT= Jim Knoble's font package for X -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_IMAKE= yes diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile index 96f7df57b6be..599fc323f19a 100644 --- a/x11-fonts/junicode/Makefile +++ b/x11-fonts/junicode/Makefile @@ -9,8 +9,7 @@ PORTNAME= junicode DISTVERSION= 0-6-12 PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gurkan@phys.ethz.ch COMMENT= Unicode font for medievalists (Latin, IPA and Runic) @@ -40,7 +39,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} .include <bsd.port.mk> diff --git a/x11-fonts/junicode/pkg-plist b/x11-fonts/junicode/pkg-plist index 0c123b225125..4924ba2e6e9d 100644 --- a/x11-fonts/junicode/pkg-plist +++ b/x11-fonts/junicode/pkg-plist @@ -2,6 +2,6 @@ %%FONTSDIR%%/Junicode-BoldItalic.ttf %%FONTSDIR%%/Junicode-Italic.ttf %%FONTSDIR%%/Junicode-Regular.ttf -@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile index 75c90d806bf7..880675c9efea 100644 --- a/x11-fonts/lfpfonts-fix/Makefile +++ b/x11-fonts/lfpfonts-fix/Makefile @@ -7,21 +7,22 @@ PORTNAME= lfpfonts-fix PORTVERSION= 0.82 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= xfonts MAINTAINER= olgeni@FreeBSD.org COMMENT= Fixed width fonts from the Linux Font Project -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/lfpfonts-fix NO_BUILD= yes USE_BZIP2= yes -USE_X_PREFIX= yes do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-fix diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile index 8194330500f3..359d5e01502c 100644 --- a/x11-fonts/lfpfonts-var/Makefile +++ b/x11-fonts/lfpfonts-var/Makefile @@ -7,21 +7,23 @@ PORTNAME= lfpfonts-var PORTVERSION= 0.83 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= xfonts MAINTAINER= olgeni@FreeBSD.org COMMENT= Variable width fonts from the Linux Font Project -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/lfpfonts-var NO_BUILD= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-var diff --git a/x11-fonts/liberation-fonts-ttf/Makefile b/x11-fonts/liberation-fonts-ttf/Makefile index c0f4ed74bdac..a9a81b87efb3 100644 --- a/x11-fonts/liberation-fonts-ttf/Makefile +++ b/x11-fonts/liberation-fonts-ttf/Makefile @@ -7,6 +7,7 @@ PORTNAME= liberation-fonts-ttf PORTVERSION= 3 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= https://www.redhat.com/f/fonts/ @@ -16,8 +17,8 @@ COMMENT= Liberation fonts from Red Hat to replace MS TTF fonts BUILD_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/liberation-fonts-0.2 +USE_XORG= x11 PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}" @@ -29,8 +30,8 @@ FONTNAME= Liberation FONTDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME} INSTDAT= License.txt fonts.dir fonts.scale -MKFONTSCL_CMD= ${X11BASE}/bin/mkfontscale -MKFONTDIR_CMD= ${X11BASE}/bin/mkfontdir +MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale +MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir do-build: cd ${WRKSRC} && \ diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile index fd8d8c954c47..47e2a68603dd 100644 --- a/x11-fonts/linux-f10-fontconfig/Makefile +++ b/x11-fonts/linux-f10-fontconfig/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" BRANDELF_DIRS= usr/bin diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile index fd8d8c954c47..47e2a68603dd 100644 --- a/x11-fonts/linux-f8-fontconfig/Makefile +++ b/x11-fonts/linux-f8-fontconfig/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" BRANDELF_DIRS= usr/bin diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile index fd8d8c954c47..47e2a68603dd 100644 --- a/x11-fonts/linux-fontconfig/Makefile +++ b/x11-fonts/linux-fontconfig/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" BRANDELF_DIRS= usr/bin diff --git a/x11-fonts/manu-gothica/Makefile b/x11-fonts/manu-gothica/Makefile index d07a543e4c1f..2010793bdf77 100644 --- a/x11-fonts/manu-gothica/Makefile +++ b/x11-fonts/manu-gothica/Makefile @@ -36,7 +36,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} @${ECHO_MSG} @${ECHO_MSG} diff --git a/x11-fonts/mathfonts/Makefile b/x11-fonts/mathfonts/Makefile index 3f19ba08957d..dd911da00806 100644 --- a/x11-fonts/mathfonts/Makefile +++ b/x11-fonts/mathfonts/Makefile @@ -35,11 +35,11 @@ PLIST_SUB+= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" PKGMESSAGE= ${WRKDIR}/pkg-message FONTNAME= ${PORTNAME} -FONTSBASE= ${X11BASE}/lib/X11/fonts +FONTSBASE= ${LOCALBASE}/lib/X11/fonts FONTSDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME} -MKFONTSCL_CMD= ${X11BASE}/bin/mkfontscale -MKFONTDIR_CMD= ${X11BASE}/bin/mkfontdir +MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale +MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir do-build: cd ${WRKSRC} && ${MKFONTSCL_CMD} diff --git a/x11-fonts/mgopen/Makefile b/x11-fonts/mgopen/Makefile index b1b517affbf2..ed8a9eb8b6c2 100644 --- a/x11-fonts/mgopen/Makefile +++ b/x11-fonts/mgopen/Makefile @@ -32,7 +32,7 @@ do-install: post-install: @${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/x11-fonts/mgopen/files/pkg-message.in b/x11-fonts/mgopen/files/pkg-message.in index fa36fd0606a7..754b5462d75d 100644 --- a/x11-fonts/mgopen/files/pkg-message.in +++ b/x11-fonts/mgopen/files/pkg-message.in @@ -9,6 +9,5 @@ Add the following line to the "Files" section of your X configuration file: FontPath "%%FONTSDIR%%/" -Note: your X configuration file is typically %%X11BASE%%/etc/X11/XF86Config -if you are using XFree86, and %%X11BASE%%/etc/X11/xorg.conf +Note: your X configuration file is typically %%LOCALBASE%%/etc/X11/xorg.conf if you are using X.Org. diff --git a/x11-fonts/mgopen/pkg-plist b/x11-fonts/mgopen/pkg-plist index 9a196e878029..1d15daa96f29 100644 --- a/x11-fonts/mgopen/pkg-plist +++ b/x11-fonts/mgopen/pkg-plist @@ -16,4 +16,4 @@ %%FONTSDIR%%/MgOpenModernaRegular.ttf @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/mkbold-mkitalic/Makefile b/x11-fonts/mkbold-mkitalic/Makefile index c2a609a588ab..e5fa20153fd4 100644 --- a/x11-fonts/mkbold-mkitalic/Makefile +++ b/x11-fonts/mkbold-mkitalic/Makefile @@ -14,7 +14,6 @@ MASTER_SITES= http://hp.vector.co.jp/authors/VA013651/lib/ MAINTAINER= koma2@lovepeers.org COMMENT= Programs to make BDF font bold/italic -PREFIX?= ${X11BASE} CONFLICTS= mkbold-[0-9]* mkitalic-[0-9]* PLIST_FILES= bin/mkbold bin/mkitalic bin/mkbolditalic diff --git a/x11-fonts/mkbold/Makefile b/x11-fonts/mkbold/Makefile index 80c46c878d9e..5ae56acafc04 100644 --- a/x11-fonts/mkbold/Makefile +++ b/x11-fonts/mkbold/Makefile @@ -15,7 +15,6 @@ EXTRACT_SUFX= .bz2 MAINTAINER= koma2@lovepeers.org COMMENT= Perl script to make BDF font bold -PREFIX?= ${X11BASE} CONFLICTS= mkbold-mkitalic-[0-9]* PLIST_FILES= bin/mkbold diff --git a/x11-fonts/mkitalic/Makefile b/x11-fonts/mkitalic/Makefile index ce404f9a0930..29f8c8097a1f 100644 --- a/x11-fonts/mkitalic/Makefile +++ b/x11-fonts/mkitalic/Makefile @@ -15,7 +15,6 @@ EXTRACT_SUFX= .bz2 MAINTAINER= koma2@lovepeers.org COMMENT= Perl script to make BDF font italic -PREFIX?= ${X11BASE} CONFLICTS= mkbold-mkitalic-[0-9]* PLIST_FILES= bin/mkitalic diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile index db393bb924cc..209c3e0a8aac 100644 --- a/x11-fonts/nucleus/Makefile +++ b/x11-fonts/nucleus/Makefile @@ -7,18 +7,20 @@ PORTNAME= nucleus PORTVERSION= 0.77 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= xfonts MAINTAINER= olgeni@FreeBSD.org COMMENT= Another font package for X -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_WRKSUBDIR= yes -USE_X_PREFIX= yes +USE_XORG= x11 post-install: @${CAT} ${DESCR} diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile index 3f26fa8fa5fd..e61f46874375 100644 --- a/x11-fonts/p5-type1inst/Makefile +++ b/x11-fonts/p5-type1inst/Makefile @@ -17,8 +17,8 @@ MAINTAINER= hrs@FreeBSD.org COMMENT= A script that helps install Postscript fonts in X Window System .if !defined(WITHOUT_X11) -RUN_DEPENDS= ${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +RUN_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .endif USE_PERL5= yes diff --git a/x11-fonts/ppantsfonts/Makefile b/x11-fonts/ppantsfonts/Makefile index 0ca6223bdedc..48443ab4f109 100644 --- a/x11-fonts/ppantsfonts/Makefile +++ b/x11-fonts/ppantsfonts/Makefile @@ -19,7 +19,7 @@ NO_BUILD= yes PKGMESSAGE= ${WRKDIR}/pkg-message FONTS= moosefont terminalpants -FONTDIR= ${X11BASE}/lib/X11/fonts/${PORTNAME}/ +FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ FILES= ${FONTS:S,$,.pcf.gz,} ${FILESDIR}/fonts.dir WRKSRC= ${WRKDIR}/ppants @@ -33,7 +33,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} post-install: - @${SED} 's,$${X11BASE},${X11BASE},g' \ + @${SED} 's,$${LOCALBASE},${LOCALBASE},g' \ ${PKGDIR}/pkg-message >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11-fonts/ppantsfonts/pkg-message b/x11-fonts/ppantsfonts/pkg-message index 20d332d831df..caac998e6a9f 100644 --- a/x11-fonts/ppantsfonts/pkg-message +++ b/x11-fonts/ppantsfonts/pkg-message @@ -6,6 +6,6 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${X11BASE}/lib/X11/fonts/ppantsfonts" + FontPath "${LOCALBASE}/lib/X11/fonts/ppantsfonts" ------------------------------------------------------------------ diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile index c6b67f80ab4c..ad2c1812a1e1 100644 --- a/x11-fonts/proggy_fonts/Makefile +++ b/x11-fonts/proggy_fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= proggy_fonts PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.proggyfonts.com/download/ DISTFILES= ProggyClean.pcf.zip ProggySquare.pcf.zip \ @@ -19,9 +19,10 @@ DISTFILES= ProggyClean.pcf.zip ProggySquare.pcf.zip \ MAINTAINER= llwang@infor.org COMMENT= The perfect monospaced bitmap programming fonts -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USE_X_PREFIX= yes +USE_XORG= x11 USE_ZIP= yes NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile index 0049ecc34fed..b08c411279f1 100644 --- a/x11-fonts/sgifonts/Makefile +++ b/x11-fonts/sgifonts/Makefile @@ -18,7 +18,8 @@ MAINTAINER= conrads@cox.net COMMENT= Fonts from the SGI ProPack 1.4 (originally for Linux) EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= lib/X11/fonts/local/sgi diff --git a/x11-fonts/suxus/Makefile b/x11-fonts/suxus/Makefile index d6e45c34a711..b3f143303c34 100644 --- a/x11-fonts/suxus/Makefile +++ b/x11-fonts/suxus/Makefile @@ -7,7 +7,7 @@ PORTNAME= suxus PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://www.goof.com/pcg/marc/data/ DISTFILES= ${PORTNAME}-iso-8859-1.bdf.gz fonts.alias @@ -16,11 +16,12 @@ DIST_SUBDIR= suxus MAINTAINER= wxs@FreeBSD.org COMMENT= An x11 font designed to be small yet easily read -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} \ - mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale SUB_FILES= pkg-message -USE_X_PREFIX= yes +USE_XORG= x11 do-extract: @${MKDIR} ${WRKSRC} diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile index 28e0da00f148..31e4ad9285b5 100644 --- a/x11-fonts/terminus-font/Makefile +++ b/x11-fonts/terminus-font/Makefile @@ -29,12 +29,12 @@ post-build: @${GZIP_CMD} ${WRKSRC}/*.pcf do-install: - @${MKDIR} ${X11BASE}/${FONTDIR} - @${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${X11BASE}/${FONTDIR} + @${MKDIR} ${LOCALBASE}/${FONTDIR} + @${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${LOCALBASE}/${FONTDIR} post-install: - @cd ${X11BASE}/${FONTDIR}; mkfontdir - @${CP} ${X11BASE}/${FONTDIR}/fonts.dir ${X11BASE}/${FONTDIR}/fonts.scale || true - @command fc-cache -f -v ${X11BASE}/${FONTDIR} || true + @cd ${LOCALBASE}/${FONTDIR}; mkfontdir + @${CP} ${LOCALBASE}/${FONTDIR}/fonts.dir ${LOCALBASE}/${FONTDIR}/fonts.scale || true + @command fc-cache -f -v ${LOCALBASE}/${FONTDIR} || true .include <bsd.port.mk> diff --git a/x11-fonts/texcm-ttf/Makefile b/x11-fonts/texcm-ttf/Makefile index c7e3fa68b088..03efa8d808b7 100644 --- a/x11-fonts/texcm-ttf/Makefile +++ b/x11-fonts/texcm-ttf/Makefile @@ -35,8 +35,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message FONTNAME= ${PORTNAME} FONTSDIR= ${PREFIX}/lib/X11/fonts/${FONTNAME} -MKFONTSCL_CMD= ${X11BASE}/bin/mkfontscale -MKFONTDIR_CMD= ${X11BASE}/bin/mkfontdir +MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale +MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir do-build: cd ${WRKSRC} && ${MKFONTSCL_CMD} diff --git a/x11-fonts/tolkien-ttf/Makefile b/x11-fonts/tolkien-ttf/Makefile index 802b702997e9..a901b1930528 100644 --- a/x11-fonts/tolkien-ttf/Makefile +++ b/x11-fonts/tolkien-ttf/Makefile @@ -33,7 +33,7 @@ do-install: post-install: @${ECHO_MSG} "==> Running fc-cache" - @${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + @${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile index 26954b3815fb..b906e64c6145 100644 --- a/x11-fonts/ttmkfdir/Makefile +++ b/x11-fonts/ttmkfdir/Makefile @@ -7,7 +7,7 @@ PORTNAME= ttmkfdir PORTVERSION= 3.0.9 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-fonts x11 MASTER_SITES= http://mbsd.msk.ru/dist/ @@ -20,7 +20,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 PLIST_FILES= bin/ttmkfdir USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 MAKE_ENV= LDFLAGS="${LDFLAGS}" CXXFLAGS="${CFLAGS}" CXX="${CXX}" diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile index 07498024140c..6a29cfad2069 100644 --- a/x11-fonts/tv-fonts/Makefile +++ b/x11-fonts/tv-fonts/Makefile @@ -41,6 +41,6 @@ do-install: .endfor post-install: - @-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + @-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile index e282f302f87b..4789dafa5188 100644 --- a/x11-fonts/webfonts/Makefile +++ b/x11-fonts/webfonts/Makefile @@ -43,11 +43,11 @@ EXTRACT_AFTER_ARGS= # FONTNAME= ${PORTNAME} FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME} -TTFONTSDIR?= ${X11BASE}/lib/X11/fonts/TrueType +TTFONTSDIR?= ${LOCALBASE}/lib/X11/fonts/TrueType PLIST_SUB= FONTNAME="${FONTNAME}" \ FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \ - TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}" + TTFONTSDIR="${TTFONTSDIR:S|${LOCALBASE}/||}" SUB_LIST= FONTSDIR="${FONTSDIR}" DOCSDIR="${DOCSDIR}" SUB_FILES= pkg-message @@ -108,7 +108,7 @@ do-install: # post-install: ${ECHO_MSG} "===> Running fc-cache" - -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} + -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/webfonts/pkg-plist b/x11-fonts/webfonts/pkg-plist index 8db024244000..8f5627afe9e6 100644 --- a/x11-fonts/webfonts/pkg-plist +++ b/x11-fonts/webfonts/pkg-plist @@ -37,4 +37,4 @@ %%DOCSDIR%%/LICENSE @dirrm %%DOCSDIR%% @dirrm %%FONTSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile index 32fb600dfdc8..dc6971a6dfb3 100644 --- a/x11-fonts/wqy/Makefile +++ b/x11-fonts/wqy/Makefile @@ -7,10 +7,10 @@ PORTNAME= wqy PORTVERSION= 0.8.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ http://dryice.name/computer/FreeBSD/distfiles/ MASTER_SITE_SUBDIR= wqy DISTNAME= ${PORTNAME}-bitmapfont-pcf-${PORTVERSION}-6 @@ -20,7 +20,7 @@ COMMENT= A font which includes all the CJK characters covered by Unicode 4.0 WRKSRC= ${WRKDIR}/${PORTNAME}-bitmapfont NO_BUILD= yes -USE_X_PREFIX= yes +USE_XORG= x11 FONTSDIR= lib/X11/fonts/wqy CONFDDIR= etc/fonts/conf.d CONFAVAILDIR= etc/fonts/conf.avail @@ -29,8 +29,10 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} \ CONFDDIR=${CONFDDIR} \ CONFAVAILDIR=${CONFAVAILDIR} -BUILD_DEPENDS+= mkfontdir:${X_CLIENTS_PORT} -BUILD_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ + fc-cache:${PORTSDIR}/x11-fonts/fontconfig OPTIONS= ALIAS "Install fonts.alias" off diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa index 1ab5342c4422..751e686ceb69 100644 --- a/x11-fonts/xmbdfed/files/patch-aa +++ b/x11-fonts/xmbdfed/files/patch-aa @@ -64,8 +64,8 @@ $FreeBSD$ #LIBS = -L/usr/Motif-1.2/lib32 -lXm \ # -L/usr/lib/X11 -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS) -+INCS = -I${X11BASE}/include ${FTYPE_INCS} -+LIBS = -L${X11BASE}/lib ${MOTIFLIB} \ ++INCS = -I${LOCALBASE}/include ${FTYPE_INCS} ++LIBS = -L${LOCALBASE}/lib ${MOTIFLIB} \ + -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext ${FTYPE_LIBS} + all: xmbdfed diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index 6f64938cc598..be413b06e564 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${FONTDIR}/100dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-1 CONFLICTS= XFree86-font100dpi-* NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index a300aa357c4a..0981f2d82729 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${FONTDIR}/75dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75 CONFLICTS= XFree86-font75dpi-* NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index 7855454e1a26..3ee0e6454351 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= ${FONTDIR}/cyrillic/crox1c.pcf.gz:${PORTSDIR}/x11-fonts/font-cronyx CONFLICTS= XFree86-fontCyrillic-* NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index 39a8fd8f26c1..2d89072e96b7 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -31,7 +31,7 @@ RUN_DEPENDS= ${FONTDIR}/misc/arabic24.pcf.gz:${PORTSDIR}/x11-fonts/font-arabic-m CONFLICTS= XFree86-fontDefaultBitmaps-* NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index f95b4aec7dea..684022a20695 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -18,14 +18,12 @@ COMMENT= X.Org TrueType fonts RUN_DEPENDS= ${FONTDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf \ ${FONTDIR}/OTF/SyrCOMAdiabene.otf:${PORTSDIR}/x11-fonts/font-misc-meltho \ ${FONTDIR}/TTF/GohaTibebZemen.ttf:${PORTSDIR}/x11-fonts/font-misc-ethiopic \ - ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \ - ${X11BASE}/lib/X11/fonts/bitstream-vera/VeraIt.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ - -CONFLICTS= XFree86-fontScalable-* + ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \ + ${LOCALBASE}/lib/X11/fonts/bitstream-vera/VeraIt.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ do-install: # empty NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index 3fc860e3abeb..bf10b17a3a74 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -27,6 +27,6 @@ CONFLICTS= XFree86-fontScalable-* do-install: # empty NO_BUILD= # none -FONTDIR= ${X11BASE}/lib/X11/fonts +FONTDIR= ${LOCALBASE}/lib/X11/fonts .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile index eb3137a0bfa1..9640236c8fc2 100644 --- a/x11-fonts/xorg-fonts/Makefile +++ b/x11-fonts/xorg-fonts/Makefile @@ -7,6 +7,7 @@ PORTNAME= xorg-fonts PORTVERSION= 7.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none @@ -16,7 +17,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.org fonts meta-port USE_XORG= fontutil -PREFIX?= ${X11BASE} FONTSDIR= ${PREFIX}/lib/X11/fonts RUN_DEPENDS= ${FONTSDIR}/100dpi/courB08-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \ |