diff options
| author | Yen-Ming Lee <leeym@FreeBSD.org> | 2014-07-18 18:41:53 +0000 |
|---|---|---|
| committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2014-07-18 18:41:53 +0000 |
| commit | 9e14d856159dd7ace21c6417e8f644e5ab84e823 (patch) | |
| tree | 3286d21a90f98f7098b29c0243537dcd55622a5a /chinese/fireflyttf | |
| parent | Forgot svn add of pkg-plist. (diff) | |
- disable X11 by default
- remove local.conf which is obsoleted
- properly stage
Notes
Notes:
svn path=/head/; revision=362223
Diffstat (limited to 'chinese/fireflyttf')
| -rw-r--r-- | chinese/fireflyttf/Makefile | 22 | ||||
| -rw-r--r-- | chinese/fireflyttf/pkg-plist | 3 |
2 files changed, 8 insertions, 17 deletions
diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile index 07222f1a5844..638bd58fc6fd 100644 --- a/chinese/fireflyttf/Makefile +++ b/chinese/fireflyttf/Makefile @@ -16,13 +16,17 @@ CONFLICTS= zh-opendesktop-fonts-* NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME} -OPTIONS_DEFINE= LGJ_FONT X11 -OPTIONS_DEFAULT= LGJ_FONT X11 -LGJ_FONT_DESC= Patch for Taiwan horn TTF= fireflysung.ttf +PLIST_FILES= ${FONTSDIR_REL}/local.conf-sung + +OPTIONS_DEFAULT+=LGJ_FONT .include <bsd.port.pre.mk> +.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" + +OPTIONS_DEFINE+=LGJ_FONT +LGJ_FONT_DESC= Patch for Taiwan horn .if ${PORT_OPTIONS:MLGJ_FONT} PKGNAMESUFFIX+= -LGJ @@ -30,12 +34,6 @@ MASTER_SITES= http://edt1023.sayya.org/fonts/ DISTNAME= fireflysung-1.3.0p1 .endif -.if ${PORT_OPTIONS:MX11} -PLIST_SUB+= X11="" -.else -PLIST_SUB+= X11="@comment " -.endif - post-extract: .if ${PORT_OPTIONS:MLGJ_FONT} @${TAR} -C ${WRKSRC} -zxf ${DISTDIR}/fireflysung-1.3.0p1.tar.gz \ @@ -47,12 +45,8 @@ post-extract: .endif do-install: - ${MKDIR} ${STAGEDIR}${FONTSDIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/${TTF} ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${STAGEDIR}${FONTSDIR} -.if ${PORT_OPTIONS:MX11} - ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${LOCALBASE}/etc/fonts/local.conf -.endif -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" .include <bsd.port.post.mk> diff --git a/chinese/fireflyttf/pkg-plist b/chinese/fireflyttf/pkg-plist deleted file mode 100644 index 7fa95af62ca7..000000000000 --- a/chinese/fireflyttf/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -%%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-sung; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi -%%FONTSDIR%%/local.conf-sung -%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-sung %%LOCALBASE%%/etc/fonts/local.conf |