From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 8 09:20:05 2007
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
X-Original-To: freebsd-ports-bugs@hub.freebsd.org
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 6BCD816A405
for <freebsd-ports-bugs@hub.freebsd.org>;
Thu, 8 Mar 2007 09:20:05 +0000 (UTC)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40])
by mx1.freebsd.org (Postfix) with ESMTP id 4CF3713C491
for <freebsd-ports-bugs@hub.freebsd.org>;
Thu, 8 Mar 2007 09:20:05 +0000 (UTC)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l289K5tk089366
for <freebsd-ports-bugs@freefall.freebsd.org>;
Thu, 8 Mar 2007 09:20:05 GMT
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l289K5Mq089365;
Thu, 8 Mar 2007 09:20:05 GMT (envelope-from gnats)
Resent-Date: Thu, 8 Mar 2007 09:20:05 GMT
Resent-Message-Id: <200703080920.l289K5Mq089365@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
chinsan <chinsan@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id D213F16A402;
Thu, 8 Mar 2007 09:13:32 +0000 (UTC)
(envelope-from chinsan@chinsan.twbbs.org)
Received: from chinsan.twbbs.org (220-132-119-51.HINET-IP.hinet.net
[220.132.119.51])
by mx1.freebsd.org (Postfix) with ESMTP id DAB0E13C441;
Thu, 8 Mar 2007 09:13:31 +0000 (UTC)
(envelope-from chinsan@chinsan.twbbs.org)
Received: by chinsan.twbbs.org (Postfix, from userid 1001)
id 7A7B411461; Thu, 8 Mar 2007 17:13:49 +0800 (CST)
Message-Id: <20070308091349.7A7B411461@chinsan.twbbs.org>
Date: Thu, 8 Mar 2007 17:13:49 +0800 (CST)
From: chinsan <chinsan@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Cc: chinsan@FreeBSD.org, rafan@FreeBSD.org
Subject: ports/110069: [MAINTAINER] chinese/fireflyttf: Update to 1.4.2 and
repo copy(chinese/fireflyttf -> chinese/opendesktop-fonts)
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: chinsan <chinsan@FreeBSD.org>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Mar 2007 09:20:05 -0000
>Number: 110069
>Category: ports
>Synopsis: [MAINTAINER] chinese/fireflyttf: Update to 1.4.2 and repo copy(chinese/fireflyttf -> chinese/opendesktop-fonts)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 08 09:20:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 6.2-STABLE i386
>Organization:
Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 6.2-STABLE FreeBSD 6.2-STABLE #6: Mon Feb 5 23:22:25 CST 2007 root@chinsan.twbbs.org:/usr/obj/usr/src/sys/MYSMP i386
>Description:
- Update to 1.4.2
- repo copy(chinese/fireflyttf -> chinese/opendesktop-fonts)
Thanks.
>How-To-Repeat:
>Fix:
--- opendesktop-fonts.diff begins here ---
diff -ruN chinese/fireflyttf/Makefile chinese/opendesktop-fonts/Makefile
--- chinese/fireflyttf/Makefile Tue Oct 31 18:54:27 2006
+++ chinese/opendesktop-fonts/Makefile Thu Mar 8 17:09:39 2007
@@ -1,36 +1,26 @@
-# 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: ports/chinese/fireflyttf/Makefile,v 1.7 2006/10/31 03:31:46 vanilla Exp $
#
-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
MAINTAINER= chinsan@FreeBSD.org
-COMMENT= Firefly TrueType Font is combine of two arphic sung fonts
+COMMENT= Ming and Kai Face(including Simplified, Traditional Chinese, and Japanese)
+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,22 +28,19 @@
.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}
-.if !defined(WITHOUT_X11)
- ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${X11BASE}/etc/fonts/local.conf
-.endif
+.for i in ${TTF}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${FONTSDIR}
+.endfor
.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
.include <bsd.port.post.mk>
diff -ruN chinese/fireflyttf/distinfo chinese/opendesktop-fonts/distinfo
--- chinese/fireflyttf/distinfo Tue Oct 31 11:31:46 2006
+++ chinese/opendesktop-fonts/distinfo Thu Mar 8 17:09:39 2007
@@ -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 -ruN chinese/fireflyttf/files/local.conf-sung chinese/opendesktop-fonts/files/local.conf-sung
--- chinese/fireflyttf/files/local.conf-sung Fri Sep 3 23:53:09 2004
+++ chinese/opendesktop-fonts/files/local.conf-sung Thu Jan 1 08:00:00 1970
@@ -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 -ruN chinese/fireflyttf/pkg-descr chinese/opendesktop-fonts/pkg-descr
--- chinese/fireflyttf/pkg-descr Fri Sep 3 23:53:09 2004
+++ chinese/opendesktop-fonts/pkg-descr Thu Mar 8 17:09:39 2007
@@ -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 -ruN chinese/fireflyttf/pkg-plist chinese/opendesktop-fonts/pkg-plist
--- chinese/fireflyttf/pkg-plist Sat Feb 19 21:51:48 2005
+++ chinese/opendesktop-fonts/pkg-plist Thu Jan 1 08:00:00 1970
@@ -1,3 +0,0 @@
-%%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
--- opendesktop-fonts.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: