svn commit: r321295 - in head/chinese: fireflyttf opendesktop-fonts

[Rong-En Fan]

Author: rafan
Date: Wed Jun 19 17:05:08 2013
New Revision: 321295
URL: http://svnweb.freebsd.org/changeset/ports/321295

Log:
  - Since chinese/ttfm/Makefile.ttf now handles fonts.{dir,alias} properly,
    revert plist workaround in slave ports

Modified:
  head/chinese/fireflyttf/Makefile
  head/chinese/fireflyttf/pkg-plist
  head/chinese/opendesktop-fonts/Makefile
  head/chinese/opendesktop-fonts/pkg-plist

Modified: head/chinese/fireflyttf/Makefile
==============================================================================
--- head/chinese/fireflyttf/Makefile	Wed Jun 19 17:00:05 2013	(r321294)
+++ head/chinese/fireflyttf/Makefile	Wed Jun 19 17:05:08 2013	(r321295)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fireflyttf
 PORTVERSION=	1.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES?=	http://firefly.idv.tw/apt/firefly-font/ \
 		http://www.study-area.org/apt/firefly-font/

Modified: head/chinese/fireflyttf/pkg-plist
==============================================================================
--- head/chinese/fireflyttf/pkg-plist	Wed Jun 19 17:00:05 2013	(r321294)
+++ head/chinese/fireflyttf/pkg-plist	Wed Jun 19 17:05:08 2013	(r321295)
@@ -1,5 +1,3 @@
-%%XFONTSDIR%%/fonts.dir
-%%XFONTSDIR%%/fonts.scale
 %%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

Modified: head/chinese/opendesktop-fonts/Makefile
==============================================================================
--- head/chinese/opendesktop-fonts/Makefile	Wed Jun 19 17:00:05 2013	(r321294)
+++ head/chinese/opendesktop-fonts/Makefile	Wed Jun 19 17:05:08 2013	(r321295)
@@ -7,7 +7,7 @@
 
 PORTNAME=	opendesktop-fonts
 PORTVERSION=	1.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES?=	ftp://ftp.opendesktop.org.tw/odp/ODOFonts/OpenFonts/ \
 		LOCAL/chinsan/fonts

Modified: head/chinese/opendesktop-fonts/pkg-plist
==============================================================================
--- head/chinese/opendesktop-fonts/pkg-plist	Wed Jun 19 17:00:05 2013	(r321294)
+++ head/chinese/opendesktop-fonts/pkg-plist	Wed Jun 19 17:05:08 2013	(r321295)
@@ -1,5 +1,3 @@
-%%XFONTSDIR%%/fonts.dir
-%%XFONTSDIR%%/fonts.scale
 %%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