summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-11-21 22:03:48 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-11-21 22:03:48 +0000
commit5cc3a06e8976d635e650ab49deebb33ba97999ad (patch)
tree436c076f5b96d15579ee1969ae8def54b1851b89
parentUpgrade to 1.0-RC3. (diff)
Add the Firefly font patchset. This patchset is mainly used to make
CJK TrueType fonts look prettier. Various enhancements like bold, italic, readability, and embedded bitmap font help a CJK X desktop a great deal. To enable this patchset, define WITH_CJK while building these ports (pango, fontconfig, libXft, and freetype2). PR: 73083 Submitted by: clive Obtained from: Hamigua <hamigua at cuc.cn> (I think)
Notes
Notes: svn path=/head/; revision=122105
-rw-r--r--print/freetype2/Makefile5
-rw-r--r--print/freetype2/distinfo2
-rw-r--r--x11-fonts/fontconfig/Makefile10
-rw-r--r--x11-fonts/fontconfig/distinfo6
-rw-r--r--x11-fonts/libXft/Makefile5
-rw-r--r--x11-fonts/libXft/distinfo2
-rw-r--r--x11-toolkits/pango/Makefile5
-rw-r--r--x11-toolkits/pango/distinfo2
8 files changed, 37 insertions, 0 deletions
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index edbc2c3ebe18..994cf66d23b5 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -36,6 +36,11 @@ CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix
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
+
pre-everything::
.if !defined(WITHOUT_TTF_BYTECODE_ENABLED)
@${ECHO_MSG}
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index 2b46b988300b..4acbc1f6dc09 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1,2 +1,4 @@
MD5 (freetype-2.1.7.tar.bz2) = d71723948d7c0e44c401b5733c50857e
SIZE (freetype-2.1.7.tar.bz2) = 930766
+MD5 (cjk-patch-freetype2-20041115.diff.gz) = c1e52458b877a78636a4cdbb97badb11
+SIZE (cjk-patch-freetype2-20041115.diff.gz) = 16052
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 9f4c12000012..588f5f991a03 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -157,6 +157,16 @@ MAN5= fonts-conf.5
.include <bsd.port.pre.mk>
+.if defined(WITH_CJK)
+PATCH_SITES= http://firefly.idv.tw/setfont-xft/patches/fontconfig/2.2.3/ \
+ http://download.linuxsir.org/fontconfig/ \
+ 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
+.endif
+
.if ${X_WINDOW_SYSTEM:L} == xfree86-3
MTREE_FILE= /etc/mtree/BSD.x11.dist
.else
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index c1ec68301227..848cf3357517 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,2 +1,8 @@
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
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 1a26bff8d63e..20ddaac3aeff 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -31,4 +31,9 @@ MAN3= Xft.3
IGNORE= Xft requires Render extension headers/library to build.
.endif
+.if defined(WITH_CJK)
+PATCH_SITES= http://bsdchat.com/dist/firefly-cjk-patchset/
+PATCHFILES+= cjk-patch-libXft-20041115.diff.gz
+.endif
+
.include <bsd.port.post.mk>
diff --git a/x11-fonts/libXft/distinfo b/x11-fonts/libXft/distinfo
index 304108d7020b..7992569046ce 100644
--- a/x11-fonts/libXft/distinfo
+++ b/x11-fonts/libXft/distinfo
@@ -1,2 +1,4 @@
MD5 (libXft-2.1.6.tar.gz) = 1ba6d9b1aec9a237b508663c46d8a979
SIZE (libXft-2.1.6.tar.gz) = 334803
+MD5 (cjk-patch-libXft-20041115.diff.gz) = a642c3e2cd08ac738a1be0aa4ba4e38d
+SIZE (cjk-patch-libXft-20041115.diff.gz) = 3261
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 0e6f18b3d510..1005ad867179 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -59,4 +59,9 @@ post-install:
@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
+.if defined(WITH_CJK)
+PATCH_SITES+= http://bsdchat.com/dist/firefly-cjk-patchset/
+PATCHFILES+= cjk-patch-pango-20041115.diff.gz
+.endif
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index f588247d893d..8f3ef561d1b3 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,2 +1,4 @@
MD5 (gnome2/pango-1.6.0.tar.bz2) = 6c732bbc5fba5a0f1f8086e8aa4f490d
SIZE (gnome2/pango-1.6.0.tar.bz2) = 951911
+MD5 (gnome2/cjk-patch-pango-20041115.diff.gz) = 76e545d0bda595aced674ecf397eab63
+SIZE (gnome2/cjk-patch-pango-20041115.diff.gz) = 1930