diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2014-03-24 12:30:51 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2014-03-24 12:30:51 +0000 |
| commit | 8dadbfee1c10d89f5c10b8a9ad98410d92a7f80f (patch) | |
| tree | 3408573db4a940b5ed6c9c84997cd2e1119e16b9 /x11-fonts | |
| parent | - Pet stage-qa: (diff) | |
- Fix fonts.dir and fonts.scale
- Fix pkg-message
- Bump PORTREVISION for package change
- While I'm here, use USES=tar:bzip2
Submitted by: J.R. Oldroyd <jr@opal.com>
Notes
Notes:
svn path=/head/; revision=348959
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/dejavu/Makefile | 10 | ||||
| -rw-r--r-- | x11-fonts/dejavu/files/pkg-message.in | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile index ac1fd80fc1ed..3e2df6208541 100644 --- a/x11-fonts/dejavu/Makefile +++ b/x11-fonts/dejavu/Makefile @@ -3,7 +3,7 @@ PORTNAME= dejavu PORTVERSION= 2.34 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts MASTER_SITES= SF DISTNAME= ${PORTNAME}-fonts-ttf-${PORTVERSION} @@ -19,7 +19,7 @@ OPTIONS_DEFAULT=LINKS OPTIONS_SUB= yes LINKS_DESC= Install links of configuration files in conf.d -USE_BZIP2= yes +USES= tar:bzip2 PLIST_SUB= FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS} FONTSDIR=${FONTSDIR} PORTDOCS= README langcover.txt status.txt unicover.txt @@ -31,14 +31,14 @@ FCDIR_LINKS= ${FCDIR:S|conf.avail|conf.d|} FONTSDIR?= lib/X11/fonts/${PORTNAME} do-build: - @cd ${WRKSRC}/ && ${LOCALBASE}/bin/mkfontscale - @cd ${WRKSRC}/ && ${LOCALBASE}/bin/mkfontdir + @cd ${WRKSRC}/ttf/ && ${LOCALBASE}/bin/mkfontscale + @cd ${WRKSRC}/ttf/ && ${LOCALBASE}/bin/mkfontdir do-install: cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${FONTSDIR}/ ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${STAGEDIR}${PREFIX}/${FCDIR}/ cd ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ && ${LN} -fs ../conf.avail/*dejavu*.conf . - ${INSTALL_DATA} ${WRKSRC}/fonts.* ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/ttf/fonts.* ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ diff --git a/x11-fonts/dejavu/files/pkg-message.in b/x11-fonts/dejavu/files/pkg-message.in index f2c54fcf0dc6..51d37a3d15af 100644 --- a/x11-fonts/dejavu/files/pkg-message.in +++ b/x11-fonts/dejavu/files/pkg-message.in @@ -5,7 +5,7 @@ line to the "Modules" section of your X Windows configuration file: Add the following line to the "Files" section of X Windows configuration file: - FontPath "%%FONTSDIR%%/" + FontPath "%%PREFIX%%/%%FONTSDIR%%/" Note: your X Windows configuration file is typically /etc/X11/XF86Config if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org. |