diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-02-02 17:06:25 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-02-02 17:06:25 +0000 |
| commit | 45a085ac121097053e07252c60df65b972d4d74c (patch) | |
| tree | 87327f81a78f2fa500bff3fc34f4495e37864806 /x11-fonts/webfonts | |
| parent | 620d4f39c35f41046c4023311f01f21e300539df (diff) | |
| download | ports-45a085ac121097053e07252c60df65b972d4d74c.tar.gz ports-45a085ac121097053e07252c60df65b972d4d74c.zip | |
Notes
Diffstat (limited to 'x11-fonts/webfonts')
| -rw-r--r-- | x11-fonts/webfonts/Makefile | 18 | ||||
| -rw-r--r-- | x11-fonts/webfonts/pkg-plist | 6 |
2 files changed, 4 insertions, 20 deletions
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile index d6cada700d5e..7f5d5554c94f 100644 --- a/x11-fonts/webfonts/Makefile +++ b/x11-fonts/webfonts/Makefile @@ -32,6 +32,8 @@ MAINTAINER= kkonstan@duth.gr COMMENT= TrueType core fonts for the Web EXTRACT_DEPENDS=cabextract:${PORTSDIR}/archivers/cabextract +BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig +RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig USE_X_PREFIX= yes @@ -60,17 +62,6 @@ FONTS_FILE= ${WRKDIR}/fonts.dir .include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} == xfree86-3 -RUN_DEPENDS= xfstt:${PORTSDIR}/x11-servers/Xfstt -PLIST_SUB+= FCACHE="@comment " \ - OLDXF86="" -.else -BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig -PLIST_SUB+= FCACHE="" \ - OLDXF86="@comment " -.endif - .SILENT: # @@ -113,18 +104,13 @@ do-install: ${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR} ${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR}/fonts.scale ${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE -.if ${X_WINDOW_SYSTEM:L} == xfree86-3 - ${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME} -.endif # # Post-install # post-install: -.if ${X_WINDOW_SYSTEM:L} != xfree86-3 ${ECHO_MSG} "===> Running fc-cache" -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR} -.endif ${ECHO_MSG} ${CAT} ${PKGMESSAGE} ${ECHO_MSG} diff --git a/x11-fonts/webfonts/pkg-plist b/x11-fonts/webfonts/pkg-plist index 1f703b8c0698..8db024244000 100644 --- a/x11-fonts/webfonts/pkg-plist +++ b/x11-fonts/webfonts/pkg-plist @@ -11,7 +11,7 @@ %%FONTSDIR%%/courbd.ttf %%FONTSDIR%%/courbi.ttf %%FONTSDIR%%/couri.ttf -%%FCACHE%%@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true +@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true %%FONTSDIR%%/fonts.dir %%FONTSDIR%%/fonts.scale %%FONTSDIR%%/georgia.ttf @@ -37,6 +37,4 @@ %%DOCSDIR%%/LICENSE @dirrm %%DOCSDIR%% @dirrm %%FONTSDIR%% -%%OLDXF86%%@exec ln -fs %D/%%FONTSDIR%% %D/%%TTFONTSDIR%%/%%FONTNAME%% -%%OLDXF86%%@unexec rm -f %D/%%TTFONTSDIR%%/%%FONTNAME%% -%%FCACHE%%@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true +@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true |