6 files changed, 158 insertions, 88 deletions

diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile
index 0a697dd6f226..0fb10eef6397 100644
--- a/chinese/opendesktop-fonts/Makefile
+++ b/chinese/opendesktop-fonts/Makefile
@@ -1,36 +1,27 @@
-# New ports collection makefile for:	firefly TrueType Font
+# New ports collection makefile for:	OpenDesktop.Org.tw Font
 # Date created:		2 Sep 2004
 # Whom:			Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	fireflyttf
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTNAME=	opendesktop-fonts
+PORTVERSION=	1.4.2
 CATEGORIES=	chinese x11-fonts
-MASTER_SITES?=	http://firefly.idv.tw/apt/firefly-font/ \
-		http://www.study-area.org/apt/firefly-font/
-DISTNAME?=	fireflysung-${PORTVERSION}
+MASTER_SITES?=	ftp://ftp.opendesktop.org.tw/odp/ODOFonts/OpenFonts/ \
+		LOCAL/chinsan/fonts
 
 MAINTAINER=	chinsan@FreeBSD.org
-COMMENT=	Firefly TrueType Font is combine of two arphic sung fonts
+COMMENT=	Ming and Kai face of OpenDesktop fonts
 
+CONFLICTS=	zh-fireflyttf-*
+DIST_SUBDIR=	OpenFonts
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
-OPTIONS=	LGJ_FONT "Patch for Taiwan horn" on
 
-TTF=		fireflysung.ttf
+TTF=		odokai-ExtB.ttf odokai.ttf odosung-ExtB.ttf odosung.ttc
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_LGJ_FONT)
-.else
-PKGNAMESUFFIX+=	-LGJ
-MASTER_SITES=	http://edt1023.sayya.org/fonts/
-DISTNAME=	fireflysung-1.3.0p1
-.endif
-
 .if !defined(WITHOUT_X11)
 PLIST_SUB+=	X11=""
 .else
@@ -38,21 +29,22 @@ PLIST_SUB+=	X11="@comment "
 .endif
 
 post-extract:
-.if defined(WITHOUT_LGJ_FONT)
-	@${DO_NADA}
-.else
-	@${TAR} -C ${WRKSRC} -zxf ${DISTDIR}/fireflysung-1.3.0p1.tar.gz \
-		fireflysung-1.3.0p1/fireflysung.ttf
-	@${MV} ${WRKSRC}/fireflysung-1.3.0p1/fireflysung.ttf  ${WRKSRC}
-	@${RM} -rf ${WRKSRC}/fireflysung-1.3.0p1
-.endif
+	@${CHMOD} 0755 ${WRKSRC}/license
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},; s,opendesktop,,g' \
+		${WRKSRC}/FAPIcidfmap.zh_CN ${WRKSRC}/FAPIcidfmap.zh_TW \
+		${WRKSRC}/cidfmap.zh_CN ${WRKSRC}/cidfmap.zh_TW
+	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 do-install:
 	${MKDIR} ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${TTF} ${FONTSDIR}
-	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${FONTSDIR}
+.for i in ${TTF}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${FONTSDIR}
+.endfor
+	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${FONTSDIR}
 .if !defined(WITHOUT_X11)
-	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${X11BASE}/etc/fonts/local.conf
+	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${X11BASE}/etc/fonts/local.conf
 .endif
 
 .include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
diff --git a/chinese/opendesktop-fonts/distinfo b/chinese/opendesktop-fonts/distinfo
index 30807c527e23..a8658e545ca5 100644
--- a/chinese/opendesktop-fonts/distinfo
+++ b/chinese/opendesktop-fonts/distinfo
@@ -1,6 +1,3 @@
-MD5 (fireflysung-1.3.0.tar.gz) = 99721b834ed2e84400325815deead878
-SHA256 (fireflysung-1.3.0.tar.gz) = 46e1cb4a5a7710463b2451bffb83521d94886071e817074f7b56aeaf62a660da
-SIZE (fireflysung-1.3.0.tar.gz) = 7116218
-MD5 (fireflysung-1.3.0p1.tar.gz) = 231870e411d5df7e3badda0005c489e8
-SHA256 (fireflysung-1.3.0p1.tar.gz) = 93404a373d535e990385119cf2e207215525153907b52e2c1d4ca8e9b92be96c
-SIZE (fireflysung-1.3.0p1.tar.gz) = 7072268
+MD5 (OpenFonts/opendesktop-fonts-1.4.2.tar.gz) = c33e83d27ac3401bc51a2b8a88705c78
+SHA256 (OpenFonts/opendesktop-fonts-1.4.2.tar.gz) = 0a629afe54a3a365ea0270ae0c0db0a76840cdd97f1d6837063f06602ca3a316
+SIZE (OpenFonts/opendesktop-fonts-1.4.2.tar.gz) = 22242516
diff --git a/chinese/opendesktop-fonts/files/local.conf-odo b/chinese/opendesktop-fonts/files/local.conf-odo
new file mode 100644
index 000000000000..3a43a345d772
--- /dev/null
+++ b/chinese/opendesktop-fonts/files/local.conf-odo
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <!-- OpenDesktop Truetype Font -->
+    <alias>
+      <family>MingLiU</family>
+      <accept><family>AR PL New Sung Mono</family></accept>
+    </alias>
+    <alias>
+      <family>PMingLiU</family>
+      <accept><family>AR PL New Sung Mono</family></accept>
+    </alias>
+    <alias>
+      <family>SimSun</family>
+      <accept><family>AR PL New Sung Mono</family></accept>
+    </alias>
+
+<!--
+        <match target="font">
+                <test name="family">
+                  <string>AR PL New Sung</string>
+                </test>
+                <edit name="antialias"><bool>true</bool></edit>
+                <edit name="hinting"><bool>true</bool></edit>
+                <edit name="autohint"><bool>false</bool></edit>
+        </match>
+
+        <match target="font">
+                <test name="family">
+                  <string>AR PL New Sung</string>
+                  <string>AR PL New Sung Mono</string>
+                </test>
+                <test name="size" compare="less_eq"><int>16</int></test>
+                <test name="size" compare="more_eq"><int>12</int></test>
+                <edit name="antialias" mode="assign"><bool>false</bool></edit>
+                <edit name="hinting" mode="assign"><bool>true</bool></edit>
+                <edit mode="assign" name="embolden"><bool>false</bool></edit>
+        </match>
+
+        <match target="font">
+                <test name="family">
+                  <string>AR PL New Sung</string>
+                  <string>AR PL New Sung Mono</string>
+                </test>
+                <test name="size" compare="less_eq"><int>12</int></test>
+                <edit name="antialias" mode="assign"><bool>false</bool></edit>
+                <edit name="hinting" mode="assign"><bool>true</bool></edit>
+                <edit mode="assign" name="embolden"><bool>true</bool></edit>
+        </match>
+-->
+        <match target="font" >
+                <test name="family" compare="contains" >
+                        <string>Song</string>
+                        <string>Sun</string>
+                        <string>Kai</string>
+                        <string>Ming</string>
+                </test> 
+                <!-- check to see if the font is just regular -->
+                <test name="weight" compare="less_eq">
+                        <int>100</int>
+                </test>
+                <test compare="more_eq" target="pattern" name="weight" >
+                        <int>180</int>
+                </test>
+                <edit mode="assign" name="embolden" >
+                        <bool>true</bool>
+                </edit>
+        </match>
+
+  <match target="font" >
+    <test name="family" compare="contains" >
+      <string>Song</string>
+      <string>Sung</string>
+      <string>Ming</string>
+    </test> 
+    <edit name="globaladvance"><bool>false</bool></edit>
+    <edit name="spacing"><int>0</int></edit>
+    <edit name="hinting"><bool>true</bool></edit>
+    <edit name="autohint"><bool>false</bool></edit>
+<!--    <edit name="antialias" mode="assign"><bool>true</bool></edit> -->
+    <test name="size" compare="less_eq"><int>16</int></test>
+    <edit name="antialias" mode="assign"><bool>false</bool></edit>
+    
+  </match>
+  
+  <match target="font">
+    <test name="family"><string>AR PL New Sung</string></test>
+    <edit name="globaladvance"><bool>false</bool></edit>
+  </match>
+  <!-- end OpenDesktop Truetype Font -->
+
+
+  <!-- x11-fonts/bitstream-vera -->
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Bitstream Vera Serif</family>
+      <family>AR PL New Sung</family>
+      <family>AR PL New Kai</family>
+    </prefer>
+  </alias>
+  
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Bitstream Vera Sans</family>
+      <family>AR PL New Sung</family>
+      <family>AR PL New Kai</family>
+    </prefer>
+  </alias>
+  
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Bitstream Vera Sans Mono</family>
+      <family>AR PL New Sung Mono</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/chinese/opendesktop-fonts/files/local.conf-sung b/chinese/opendesktop-fonts/files/local.conf-sung
deleted file mode 100644
index 38597782af3f..000000000000
--- a/chinese/opendesktop-fonts/files/local.conf-sung
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<!-- Firefly Truetype Font -->
-        <match target="font">
-                <test name="family"><string>AR PL New Sung</string></test>
-                <edit name="antialias"><bool>true</bool></edit>
-                <edit name="hinting"><bool>true</bool></edit>
-                <edit name="autohint"><bool>false</bool></edit>
-        </match>
-
-        <match target="font">
-                <test name="family"><string>AR PL New Sung</string></test>
-                <test name="size" compare="less_eq"><int>16</int></test>
-                <edit name="antialias" mode="assign"><bool>false</bool></edit>
-                <edit name="hinting" mode="assign"><bool>true</bool></edit>
-        </match>
-
-	<match target="font">
-		<test name="family"><string>AR PL New Sung</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-	<!-- end Firefly Truetype Font -->
-
-	<!-- x11-fonts/bitstream-vera -->
-        <alias>
-                <family>serif</family>
-                <prefer>
-                        <family>Bitstream Vera Serif</family>
-			<family>AR PL New Sung</family>
-                </prefer>
-        </alias>
-        <alias>
-                <family>sans-serif</family>
-                <prefer>
-                        <family>Bitstream Vera Sans</family>
-			<family>AR PL New Sung</family>
-                </prefer>
-        </alias>
-        <alias>
-                <family>monospace</family>
-                <prefer>
-                        <family>Bitstream Vera Sans Mono</family>
-			<family>AR PL New Sung</family>
-                </prefer>
-        </alias>
-</fontconfig>
diff --git a/chinese/opendesktop-fonts/pkg-descr b/chinese/opendesktop-fonts/pkg-descr
index f0724d3fd20b..6ffd8c26aa5c 100644
--- a/chinese/opendesktop-fonts/pkg-descr
+++ b/chinese/opendesktop-fonts/pkg-descr
@@ -1,4 +1,13 @@
-Firefly Truetype Font is combine of two arphic sung font and is embed
-9pt, 10pt, 11pt bitmaps.
+OpenDesktop Font is combine of two arphic Ming and Kai font with 
+12-pixel(9-point),  13-pixel(10-point), 14-pixel(10.5-point), 
+15-pixel(11-point), 16-pixel(12-point) embedded bitmap fonts
 
-WWW: http://www.study-area.org/apt/firefly-font/
+NOTICE: This Truetype font contains embedded bitmap fonts made
+        by firefly and is released as a whole
+        under the ARPHIC PUBLIC LICENSE.
+        There are also seperate bitmap fonts made by Firefly and
+        released under the GENERAL PUBLIC LICENSE (GPL):
+        ftp://ftp.opendesktop.org.tw/odp/ODOFonts/Bitmaps/
+
+
+WWW: http://opendesktop.org.tw
diff --git a/chinese/opendesktop-fonts/pkg-plist b/chinese/opendesktop-fonts/pkg-plist
index 51ad1ebac38c..a965e9459c9a 100644
--- a/chinese/opendesktop-fonts/pkg-plist
+++ b/chinese/opendesktop-fonts/pkg-plist
@@ -1,3 +1,3 @@
-%%X11%%@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-sung; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi
-%%FONTSDIR%%/local.conf-sung
-%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-sung %%X11BASE%%/etc/fonts/local.conf
+%%X11%%@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi
+%%FONTSDIR%%/local.conf-odo
+%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%X11BASE%%/etc/fonts/local.conf