From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 17 01:40:04 2005 Return-Path: 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5452C16A41F for ; Sat, 17 Dec 2005 01:40:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 454FD43D5C for ; Sat, 17 Dec 2005 01:40:03 +0000 (GMT) (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 jBH1e2CL006803 for ; Sat, 17 Dec 2005 01:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id jBH1e2C0006802; Sat, 17 Dec 2005 01:40:02 GMT (envelope-from gnats) Resent-Date: Sat, 17 Dec 2005 01:40:02 GMT Resent-Message-Id: <200512170140.jBH1e2C0006802@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, lwj Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AA6C16A41F for ; Sat, 17 Dec 2005 01:33:40 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA8E643D53 for ; Sat, 17 Dec 2005 01:33:39 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id jBH1XdZ2026051 for ; Sat, 17 Dec 2005 01:33:39 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id jBH1Xd4M026050; Sat, 17 Dec 2005 01:33:39 GMT (envelope-from nobody) Message-Id: <200512170133.jBH1Xd4M026050@www.freebsd.org> Date: Sat, 17 Dec 2005 01:33:39 GMT From: lwj To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/90523: x11-fonts/fontconfig & x11-fonts/libXft: restore WITH_CJK knob X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Dec 2005 01:40:04 -0000 >Number: 90523 >Category: ports >Synopsis: x11-fonts/fontconfig & x11-fonts/libXft: restore WITH_CJK knob >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: Sat Dec 17 01:40:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: lwj >Release: FreeBSD 6.0-STABLE i386 >Organization: foxsemicon intergrated tech. Inc. >Environment: FreeBSD freebsd.my.home 6.0-STABLE FreeBSD 6.0-STABLE #2: Sun Dec 11 13:32:08 CST 2005 root@freebsd.my.home:/usr/obj/usr/src/sys/KERNEL i386 >Description: The patching and building problems with WITH_CJK knob for x11-fonts/fontconfig and x11-fonts/libXft are solved now. >How-To-Repeat: >Fix: --- fontconfig.diff begins here --- diff -ruN fontconfig.orig/Makefile fontconfig/Makefile --- fontconfig.orig/Makefile Sat Nov 5 12:53:44 2005 +++ fontconfig/Makefile Sat Dec 17 09:05:56 2005 @@ -165,12 +165,11 @@ .include -#.if defined(WITH_CJK) -#PATCH_SITES+= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \ -# http://bsdchat.com/dist/firefly-cjk-patchset/ -#PATCHFILES+= cjk-fontconfig-2.2.3-20050315.patch.gz -#PATCH_DIST_STRIP+= -p1 -#.endif +.if defined(WITH_CJK) +PATCH_SITES+= http://lwj-hinet.myweb.hinet.net/ +PATCHFILES+= cjk-fontconfig-2.3.2-20051217.patch.gz +PATCH_DIST_STRIP+= -p1 +.endif .if defined(NOPORTDOCS) post-patch: diff -ruN fontconfig.orig/distinfo fontconfig/distinfo --- fontconfig.orig/distinfo Thu Nov 24 06:40:59 2005 +++ fontconfig/distinfo Sat Dec 17 09:05:56 2005 @@ -1,3 +1,6 @@ MD5 (fontconfig-2.3.2.tar.gz) = 7354f9f125ea78a8f2851cb9c31d4866 SHA256 (fontconfig-2.3.2.tar.gz) = 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227 SIZE (fontconfig-2.3.2.tar.gz) = 964045 +MD5 (cjk-fontconfig-2.3.2-20051217.patch.gz) = fa45698ab83100bd9d93faecf02d1e22 +SHA256 (cjk-fontconfig-2.3.2-20051217.patch.gz) = 07d8bb8999c500271b20778a3a49febb63b6993bb6f71cf7b29732af46fdb98b +SIZE (cjk-fontconfig-2.3.2-20051217.patch.gz) = 307675 =========================================================================== --- libXft.diff begins here --- diff -ruN libXft.orig/Makefile libXft/Makefile --- libXft.orig/Makefile Sat Dec 17 08:48:25 2005 +++ libXft/Makefile Sat Dec 17 08:50:56 2005 @@ -26,6 +26,13 @@ MAN3= Xft.3 +.if defined(WITH_CJK) +PATCH_SITES= http://bsdchat.com/dist/firefly-cjk-patchset/ \ + http://bbs.ilc.edu.tw/~chinsan/ \ + ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ +PATCHFILES+= cjk-patch-libXft-20050716.diff.gz +.endif + .include .if ${X_WINDOW_SYSTEM:L} == xfree86-3 diff -ruN libXft.orig/distinfo libXft/distinfo --- libXft.orig/distinfo Sat Dec 17 08:48:25 2005 +++ libXft/distinfo Sat Dec 17 08:54:03 2005 @@ -1,3 +1,6 @@ MD5 (libXft-2.1.7.tar.bz2) = 3e311b4095283d59488b95c8bd772521 SHA256 (libXft-2.1.7.tar.bz2) = 6c917395ecd3b39ea0e15a0ab1c89ec862a429d1e5f92de9651522bdae8abf56 SIZE (libXft-2.1.7.tar.bz2) = 237056 +MD5 (cjk-patch-libXft-20050716.diff.gz) = 55d3b9b312643a3da07fd8ed8ecefd76 +SHA256 (cjk-patch-libXft-20050716.diff.gz) = 33b81a7df12c8c37538091482b4fd9537b1ac111e1519717bc8ad5fd6bbe4eff +SIZE (cjk-patch-libXft-20050716.diff.gz) = 3488 >Release-Note: >Audit-Trail: >Unformatted: