PR: 14641

Submitted by:	clive@CirX.org
Reviewed by:	the maintainer
Add *-bold-i-* to fonts.alias by default.

2 files changed, 43 insertions, 18 deletions

diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile
index 254db874e580..0cd899c24b28 100644
--- a/chinese/arphicttf/Makefile
+++ b/chinese/arphicttf/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	Arphic Chinese TrueType fonts
 # Version required:	1.0
 # Date created:		13 Oct 1999
-# Whom:			Keith Jang <jtjang@gcn.net.tw>
+# Whom:			Keith Jang <keith@freebsd.sinica.edu.tw>
 #
 # $FreeBSD$
 #
@@ -10,7 +10,7 @@ DISTNAME=	zh-arphicttf-1.0
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/
 
-MAINTAINER=	jtjang@gcn.net.tw
+MAINTAINER=	keith@freebsd.sinica.edu.tw
 
 LIB_DEPENDS=	font.1:${PORTSDIR}/x11-servers/XttXF86srv-common
 
diff --git a/chinese/arphicttf/pkg-install b/chinese/arphicttf/pkg-install
index f56fd8ce3a18..ac515976baf4 100644
--- a/chinese/arphicttf/pkg-install
+++ b/chinese/arphicttf/pkg-install
@@ -49,6 +49,7 @@ echo ab=y:ai=0.3:bkai00mp.ttf -ar-kai-bold-i-normal--0-0-0-0-c-0-gb2312.1980-0 >
 
 
 # Update fonts.alias, font size ranges from 8 to 128.
+# Medium/Bold & Roman/Italic variations are also added.
 touch fonts.alias
 sed -e '/^-ar-/d' -e '/^-arphic-/d' fonts.alias > fonts.alias.tmp
 mv -f fonts.alias.tmp fonts.alias
@@ -57,32 +58,56 @@ mv -f fonts.alias.tmp fonts.alias
 
 # bkai00mp.ttf (Big5)
 SIZE=8
-while [ ${SIZE} -le 128 ]
+for WEIGHT in medium bold
 do
-  echo -arphic-kai-medium-r-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-big5-0 -ar-kai-medium-r-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-big5-0 >> fonts.alias;
-  SIZE=`expr ${SIZE} + 1`;
-done
+  (for SLANT in r i
+   do
+     (while [ ${SIZE} -le 128 ]
+      do
+        echo -arphic-kai-${WEIGHT}-${SLANT}-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-big5-0 -ar-kai-${WEIGHT}-${SLANT}-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-big5-0 >> fonts.alias;
+        SIZE=`expr ${SIZE} + 1`;
+      done)   # SIZE
+   done)   # SLANT
+done   # WEIGHT
 
 # bsmi00lp.ttf (Big5)
 SIZE=8
-while [ ${SIZE} -le 128 ]
+for WEIGHT in medium bold
 do
-  echo -arphic-ming-medium-r-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-big5-0 -ar-ming-medium-r-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-big5-0 >> fonts.alias;
-  SIZE=`expr ${SIZE} + 1`;
-done
+  (for SLANT in r i
+   do
+     (while [ ${SIZE} -le 128 ]
+      do
+        echo -arphic-ming-${WEIGHT}-${SLANT}-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-big5-0 -ar-ming-${WEIGHT}-${SLANT}-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-big5-0 >> fonts.alias;
+      SIZE=`expr ${SIZE} + 1`;
+      done)   # SIZE
+   done)   # SLANT
+done   # WEIGHT
 
 # gbsn00lp.ttf (GB)
 SIZE=8
-while [ ${SIZE} -le 128 ]
+for WEIGHT in medium bold
 do
-  echo -arphic-sung-medium-r-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-gb2312.1980-0 -ar-sung-medium-r-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-gb2312.1980-0 >> fonts.alias;
-  SIZE=`expr ${SIZE} + 1`;
-done
+  (for SLANT in r i
+   do
+     (while [ ${SIZE} -le 128 ]
+      do
+        echo -arphic-sung-${WEIGHT}-${SLANT}-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-gb2312.1980-0 -ar-sung-${WEIGHT}-${SLANT}-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-gb2312.1980-0 >> fonts.alias;
+        SIZE=`expr ${SIZE} + 1`;
+      done)   # SIZE
+   done)   # SLANT
+done   # WEIGHT
 
 # gkai00mp.ttf (GB)
 SIZE=8
-while [ ${SIZE} -le 128 ]
+for WEIGHT in medium bold
 do
-  echo -arphic-kai-medium-r-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-gb2312.1980-0 -ar-kai-medium-r-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-gb2312.1980-0 >> fonts.alias;
-  SIZE=`expr ${SIZE} + 1`;
-done
+  (for SLANT in r i
+   do
+     (while [ ${SIZE} -le 128 ]
+      do
+        echo -arphic-kai-${WEIGHT}-${SLANT}-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-gb2312.1980-0 -ar-kai-${WEIGHT}-${SLANT}-normal--${SIZE}-`expr ${SIZE} \* 10`-0-0-c-`expr ${SIZE} \* 10`-gb2312.1980-0 >> fonts.alias;
+        SIZE=`expr ${SIZE} + 1`;
+      done)   # SIZE
+   done)   # SLANT
+done   # WEIGHT