diff -uNr ports.orig/print/freetype2/Makefile ports/print/freetype2/Makefile --- ports.orig/print/freetype2/Makefile Tue Mar 15 23:53:41 2005 +++ ports/print/freetype2/Makefile Wed Mar 16 00:13:02 2005 @@ -35,10 +35,12 @@ CFLAGS+= -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER .endif -#.if defined(WITH_CJK) -#PATCH_SITES+= http://bsdchat.com/dist/firefly-cjk-patchset/ -#PATCHFILES+= cjk-patch-freetype2-20041115.diff.gz -#.endif +.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-freetype-2.1.9-20050315.patch.gz +PATCH_DIST_STRIP+= -p1 +.endif pre-everything:: .if !defined(WITHOUT_TTF_BYTECODE_ENABLED) diff -uNr ports.orig/print/freetype2/distinfo ports/print/freetype2/distinfo --- ports.orig/print/freetype2/distinfo Tue Mar 15 23:53:41 2005 +++ ports/print/freetype2/distinfo Tue Mar 15 23:56:03 2005 @@ -1,4 +1,4 @@ MD5 (freetype-2.1.9.tar.bz2) = ec1b903e4be5f073caa72458ea58c29c SIZE (freetype-2.1.9.tar.bz2) = 992394 -MD5 (cjk-patch-freetype2-20041115.diff.gz) = c1e52458b877a78636a4cdbb97badb11 -SIZE (cjk-patch-freetype2-20041115.diff.gz) = 16052 +MD5 (cjk-freetype-2.1.9-20050315.patch.gz) = 6939b67cb81e1ffe9b9758cce20f3bc7 +SIZE (cjk-freetype-2.1.9-20050315.patch.gz) = 17437 diff -uNr ports.orig/x11-fonts/fontconfig/Makefile ports/x11-fonts/fontconfig/Makefile --- ports.orig/x11-fonts/fontconfig/Makefile Tue Mar 15 23:53:41 2005 +++ ports/x11-fonts/fontconfig/Makefile Wed Mar 16 00:12:33 2005 @@ -160,13 +160,10 @@ .include .if defined(WITH_CJK) -PATCH_SITES+= http://firefly.idv.tw/setfont-xft/patches/fontconfig/2.2.3/ \ - http://download.linuxsir.org/fontconfig/ \ +PATCH_SITES+= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \ http://bsdchat.com/dist/firefly-cjk-patchset/ -PATCHFILES+= fontconfig-2.2.3-default_config-20041114.patch \ - fontconfig-2.2.3-include_CJK_charmaps-20041114.patch \ - cjk-patch-fontconfig-20041115.diff.gz -PATCH_DIST_STRIP+= -p1:CJK_charmaps +PATCHFILES+= cjk-fontconfig-2.2.3-20050315.patch.gz +PATCH_DIST_STRIP+= -p1 .endif .if defined(NOPORTDOCS) diff -uNr ports.orig/x11-fonts/fontconfig/distinfo ports/x11-fonts/fontconfig/distinfo --- ports.orig/x11-fonts/fontconfig/distinfo Tue Mar 15 23:53:41 2005 +++ ports/x11-fonts/fontconfig/distinfo Wed Mar 16 00:30:54 2005 @@ -1,8 +1,4 @@ MD5 (fontconfig-2.2.3.tar.gz) = 2466a797d645cda5eb466080fdaec416 SIZE (fontconfig-2.2.3.tar.gz) = 750035 -MD5 (fontconfig-2.2.3-default_config-20041114.patch) = cca41e4e98b212c5a510fb606f250475 -SIZE (fontconfig-2.2.3-default_config-20041114.patch) = 2490 -MD5 (fontconfig-2.2.3-include_CJK_charmaps-20041114.patch) = 6e45ff7b7ae0b1eb86b6930ff3d3f015 -SIZE (fontconfig-2.2.3-include_CJK_charmaps-20041114.patch) = 1635485 -MD5 (cjk-patch-fontconfig-20041115.diff.gz) = 802d0ee4a44e772e2f885a5417afa5b0 -SIZE (cjk-patch-fontconfig-20041115.diff.gz) = 4983 +MD5 (cjk-fontconfig-2.2.3-20050315.patch.gz) = f796ba6ba54c3a211a218bb686e993d4 +SIZE (cjk-fontconfig-2.2.3-20050315.patch.gz) = 307843 diff -uNr ports.orig/x11-fonts/libXft/Makefile ports/x11-fonts/libXft/Makefile --- ports.orig/x11-fonts/libXft/Makefile Tue Mar 15 23:53:41 2005 +++ ports/x11-fonts/libXft/Makefile Wed Mar 16 00:11:13 2005 @@ -33,7 +33,8 @@ .endif .if defined(WITH_CJK) -PATCH_SITES= http://bsdchat.com/dist/firefly-cjk-patchset/ +PATCH_SITES= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \ + http://bsdchat.com/dist/firefly-cjk-patchset/ PATCHFILES+= cjk-patch-libXft-20041115.diff.gz .endif