From chinsan@FreeBSD.org  Wed Oct 18 15:00:51 2006
Return-Path: <chinsan@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7FF4816A407
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Oct 2006 15:00:51 +0000 (UTC)
	(envelope-from chinsan@FreeBSD.org)
Received: from smtp2.bc.hgc.com.tw (smtp2.bc.hgc.com.tw [203.133.1.156])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 09C7443D53
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Oct 2006 15:00:50 +0000 (GMT)
	(envelope-from chinsan@FreeBSD.org)
Received: from smtp2.bc.hgc.com.tw (61-63-0-host123.kbtelecom.net.tw [61.63.0.123])
	by smtp2.bc.hgc.com.tw (Postfix) with SMTP id 17CC62E9DF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Oct 2006 23:00:51 +0800 (CST)
Received: by smtp2.bc.hgc.com.tw (sSMTP sendmail emulation); Wed, 18 Oct 2006 22:56:19 +0800
Message-Id: <20061018150052.17CC62E9DF@smtp2.bc.hgc.com.tw>
Date: Wed, 18 Oct 2006 22:56:19 +0800
From: chinsan <chinsan@FreeBSD.org>
Reply-To: chinsan <chinsan@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [UPDATE] chinese/fireflyttf: Add LGJ_FONT KNOB (Patch for Taiwanhorn) as default option, take maintainership
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         104539
>Category:       ports
>Synopsis:       [UPDATE] chinese/fireflyttf: Add LGJ_FONT KNOB (Patch for Taiwanhorn) as default option, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vanilla
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 18 15:10:18 GMT 2006
>Closed-Date:    Tue Oct 31 03:32:25 GMT 2006
>Last-Modified:  Tue Oct 31 03:40:15 GMT 2006
>Originator:     chinsan
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD BSD6.giga.hgc.com.tw 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #6: Thu Sep 14 09:46:10 CST 2006 root@BSD6.giga.hgc.com.tw:/usr/obj/usr/src/sys/GENERIC i386

>Description:
 - Add LGJ_FONT KNOB (Patch for Taiwanhorn) as default option
 - Take maintainership

>How-To-Repeat:
This patch includes:
http://blog.bs2.to/post/EdwardLee/6223

>Fix:

--- fireflyttf.diff begins here ---
diff -ruN fireflyttf.orig/Makefile fireflyttf/Makefile
--- fireflyttf.orig/Makefile	Tue Jul 26 05:58:05 2005
+++ fireflyttf/Makefile	Wed Oct 18 22:51:18 2006
@@ -7,25 +7,46 @@
 
 PORTNAME=	fireflyttf
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
-MASTER_SITES=	http://firefly.idv.tw/apt/firefly-font/ \
+MASTER_SITES?=	http://firefly.idv.tw/apt/firefly-font/ \
 		http://www.study-area.org/apt/firefly-font/
-DISTNAME=	fireflysung-${PORTVERSION}
+DISTNAME?=	fireflysung-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	Firefly TrueType Font is combine of two arphic sung fonts
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
+OPTIONS=	LGJ_FONT "Patch for Taiwan horn" on
 
 TTF=		fireflysung.ttf
 
+.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
 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
+
 do-install:
 	${MKDIR} ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${TTF} ${FONTSDIR}
@@ -34,6 +55,5 @@
 	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${X11BASE}/etc/fonts/local.conf
 .endif
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff -ruN fireflyttf.orig/distinfo fireflyttf/distinfo
--- fireflyttf.orig/distinfo	Fri Nov 25 07:01:42 2005
+++ fireflyttf/distinfo	Wed Oct 18 22:51:18 2006
@@ -1,3 +1,6 @@
 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
--- fireflyttf.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->chinsan 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Oct 18 15:10:51 UTC 2006 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104539 
Responsible-Changed-From-To: chinsan->vanilla 
Responsible-Changed-By: chinsan 
Responsible-Changed-When: Wed Oct 18 15:19:05 UTC 2006 
Responsible-Changed-Why:  
vanilla'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104539 
State-Changed-From-To: open->closed 
State-Changed-By: vanilla 
State-Changed-When: Tue Oct 31 03:32:24 UTC 2006 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104539 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104539: commit references a PR
Date: Tue, 31 Oct 2006 03:31:51 +0000 (UTC)

 vanilla     2006-10-31 03:31:46 UTC
 
   FreeBSD ports repository
 
   Modified files:
     chinese/fireflyttf   Makefile distinfo 
   Log:
   - Add LGJ_FONT KNOB (Patch for Taiwanhorn) as default option
   - Take maintainership
   
   PR:             ports/104539
   Submitted by:   chinsan@
   
   Revision  Changes    Path
   1.7       +24 -4     ports/chinese/fireflyttf/Makefile
   1.5       +3 -0      ports/chinese/fireflyttf/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
