diff options
author | leeym <leeym@FreeBSD.org> | 2014-07-19 02:41:53 +0800 |
---|---|---|
committer | leeym <leeym@FreeBSD.org> | 2014-07-19 02:41:53 +0800 |
commit | ebb7504f750da95060dfa172af051c52f10a6dff (patch) | |
tree | 3286d21a90f98f7098b29c0243537dcd55622a5a /chinese/opendesktop-fonts | |
parent | 2b952ce4e966844e8af0f9448cacae67d8ff977a (diff) | |
download | freebsd-ports-gnome-ebb7504f750da95060dfa172af051c52f10a6dff.tar.gz freebsd-ports-gnome-ebb7504f750da95060dfa172af051c52f10a6dff.tar.zst freebsd-ports-gnome-ebb7504f750da95060dfa172af051c52f10a6dff.zip |
- disable X11 by default
- remove local.conf which is obsoleted
- properly stage
Diffstat (limited to 'chinese/opendesktop-fonts')
-rw-r--r-- | chinese/opendesktop-fonts/Makefile | 15 | ||||
-rw-r--r-- | chinese/opendesktop-fonts/pkg-plist | 5 |
2 files changed, 3 insertions, 17 deletions
diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile index 7cde21459ba4..ba0de62955bb 100644 --- a/chinese/opendesktop-fonts/Makefile +++ b/chinese/opendesktop-fonts/Makefile @@ -16,14 +16,10 @@ DIST_SUBDIR= OpenFonts NO_BUILD= yes TTF= odokai-ExtB.ttf odokai.ttf odosung-ExtB.ttf odosung.ttc +PLIST_FILES= ${FONTSDIR_REL}/local.conf-odo .include <bsd.port.pre.mk> - -.if !defined(WITHOUT_X11) -PLIST_SUB+= X11="" -.else -PLIST_SUB+= X11="@comment " -.endif +.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" post-extract: @${CHMOD} 0755 ${WRKSRC}/license @@ -35,15 +31,10 @@ post-patch: @${FIND} ${WRKSRC} -name "*.bak" -delete do-install: - ${MKDIR} ${STAGEDIR}${FONTSDIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} .for i in ${TTF} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${FONTSDIR} .endfor ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${FONTSDIR} -.if !defined(WITHOUT_X11) - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts - ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${PREFIX}/etc/fonts/local.conf -.endif -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" .include <bsd.port.post.mk> diff --git a/chinese/opendesktop-fonts/pkg-plist b/chinese/opendesktop-fonts/pkg-plist deleted file mode 100644 index 9fc256177cc7..000000000000 --- a/chinese/opendesktop-fonts/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -etc/fonts/local.conf -%%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi -%%FONTSDIR%%/local.conf-odo -%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%LOCALBASE%%/etc/fonts/local.conf -@dirrmtry etc/fonts |