diff options
| author | Dryice Dong Liu <dryice@FreeBSD.org> | 2007-03-26 05:56:52 +0000 |
|---|---|---|
| committer | Dryice Dong Liu <dryice@FreeBSD.org> | 2007-03-26 05:56:52 +0000 |
| commit | e00d15cde4adcb5792fe85b4b9754cb5fbdb7f4a (patch) | |
| tree | 12e7f241c59196377d86a1d0a571eac1086d11c1 /x11-fonts | |
| parent | Add a patch to fix a harmless warning, which breaks this port under (diff) | |
- fix plist
- better fontconfig support
- optional alias
- bump PORTREVISION
Approved by: itetcu (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=188362
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/wqy/Makefile | 20 | ||||
| -rw-r--r-- | x11-fonts/wqy/pkg-plist | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile index 6bcf80fe9e23..b04258edc09a 100644 --- a/x11-fonts/wqy/Makefile +++ b/x11-fonts/wqy/Makefile @@ -7,6 +7,7 @@ PORTNAME= wqy PORTVERSION= 0.8.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -21,8 +22,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-bitmapfont NO_BUILD= yes USE_X_PREFIX= yes FONTSDIR= lib/X11/fonts/wqy +CONFDDIR= etc/fonts/conf.d +CONFAVAILDIR= etc/fonts/conf.avail -PLIST_SUB= FONTSDIR=${FONTSDIR} +PLIST_SUB= FONTSDIR=${FONTSDIR} \ + CONFDDIR=${CONFDDIR} \ + CONFAVAILDIR=${CONFAVAILDIR} BUILD_DEPENDS+= mkfontdir:${X_CLIENTS_PORT} BUILD_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig @@ -31,15 +36,28 @@ BUILD_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig PORTDOCS= AUTHORS ChangeLog COPYING INSTALL INSTALL.zh.gb2312 LOGO.png README .endif +OPTIONS= ALIAS "Install fonts.alias" off + +.if defined(WITH_ALIAS) +PLIST_SUB+= WITHALIAS="" +.else +PLIST_SUB+= WITHALIAS="@comment " +.endif + do-install: @${MKDIR} ${PREFIX}/${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/*.pcf ${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/85-wqy-bitmapsong.conf ${PREFIX}/${CONFAVAILDIR} + ${LN} -s ${PREFIX}/${CONFAVAILDIR}/85-wqy-bitmapsong.conf ${PREFIX}/${CONFDDIR}/85-wqy-bitmapsong.conf post-install: @${RM} ${PREFIX}/${FONTSDIR}/fonts* >/dev/null 2>&1 || true @command mkfontdir ${PREFIX}/${FONTSDIR} || true @${CP} ${PREFIX}/${FONTSDIR}/fonts.dir ${PREFIX}/${FONTSDIR}/fonts.scale || true @command fc-cache -v ${PREFIX}/${FONTSDIR} || true +.if defined(WITH_ALIAS) + ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${PREFIX}/${CONFAVAILDIR} +.endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff --git a/x11-fonts/wqy/pkg-plist b/x11-fonts/wqy/pkg-plist index 1492ea50ec2e..fc47e0b50055 100644 --- a/x11-fonts/wqy/pkg-plist +++ b/x11-fonts/wqy/pkg-plist @@ -1,4 +1,6 @@ -%%FONTSDIR%%/fonts.cache-1 +%%CONFAVAILDIR%%/85-wqy-bitmapsong.conf +%%CONFDDIR%%/85-wqy-bitmapsong.conf +%%WITHALIAS%%%%FONTSDIR%%/fonts.alias %%FONTSDIR%%/fonts.dir %%FONTSDIR%%/fonts.scale %%FONTSDIR%%/wenquanyi_10pt.pcf |