Guest User

Untitled

a guest
Nov 10th, 2010
182
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. Index: x11-fonts/fontconfig/pkg-plist
  2. ===================================================================
  3. RCS file: /home/ncvs/ports/x11-fonts/fontconfig/pkg-plist,v
  4. retrieving revision 1.15
  5. diff -u -p -r1.15 pkg-plist
  6. --- x11-fonts/fontconfig/pkg-plist  28 Nov 2009 20:06:17 -0000  1.15
  7. +++ x11-fonts/fontconfig/pkg-plist  2 May 2010 16:42:58 -0000
  8. @@ -4,13 +4,19 @@ bin/fc-list
  9.  bin/fc-match
  10.  bin/fc-query
  11.  bin/fc-scan
  12. +etc/fonts/conf.avail/10-antialias.conf
  13.  etc/fonts/conf.avail/10-autohint.conf
  14. +etc/fonts/conf.avail/10-hinting-full.conf
  15. +etc/fonts/conf.avail/10-hinting-medium.conf
  16. +etc/fonts/conf.avail/10-hinting-slight.conf
  17. +etc/fonts/conf.avail/10-hinting.conf
  18.  etc/fonts/conf.avail/10-no-sub-pixel.conf
  19.  etc/fonts/conf.avail/10-sub-pixel-bgr.conf
  20.  etc/fonts/conf.avail/10-sub-pixel-rgb.conf
  21.  etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
  22.  etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
  23.  etc/fonts/conf.avail/10-unhinted.conf
  24. +etc/fonts/conf.avail/11-lcd-filter-lcddefault.conf
  25.  etc/fonts/conf.avail/20-fix-globaladvance.conf
  26.  etc/fonts/conf.avail/20-unhint-small-vera.conf
  27.  etc/fonts/conf.avail/25-unhint-nonlatin.conf
  28. @@ -21,6 +27,7 @@ etc/fonts/conf.avail/45-latin.conf
  29.  etc/fonts/conf.avail/49-sansserif.conf
  30.  etc/fonts/conf.avail/50-user.conf
  31.  etc/fonts/conf.avail/51-local.conf
  32. +etc/fonts/conf.avail/53-monospace-lcd-filter.conf
  33.  etc/fonts/conf.avail/60-latin.conf
  34.  etc/fonts/conf.avail/65-fonts-persian.conf
  35.  etc/fonts/conf.avail/65-khmer.conf
  36. @@ -30,6 +37,10 @@ etc/fonts/conf.avail/70-no-bitmaps.conf
  37.  etc/fonts/conf.avail/70-yes-bitmaps.conf
  38.  etc/fonts/conf.avail/80-delicious.conf
  39.  etc/fonts/conf.avail/90-synthetic.conf
  40. +etc/fonts/conf.d/10-antialias.conf
  41. +etc/fonts/conf.d/10-hinting-slight.conf
  42. +etc/fonts/conf.d/10-hinting.conf
  43. +etc/fonts/conf.d/11-lcd-filter-lcddefault.conf
  44.  etc/fonts/conf.d/20-fix-globaladvance.conf
  45.  etc/fonts/conf.d/20-unhint-small-vera.conf
  46.  etc/fonts/conf.d/30-metric-aliases.conf
  47. @@ -39,10 +50,12 @@ etc/fonts/conf.d/45-latin.conf
  48.  etc/fonts/conf.d/49-sansserif.conf
  49.  etc/fonts/conf.d/50-user.conf
  50.  etc/fonts/conf.d/51-local.conf
  51. +etc/fonts/conf.d/53-monospace-lcd-filter.conf
  52.  etc/fonts/conf.d/60-latin.conf
  53.  etc/fonts/conf.d/65-fonts-persian.conf
  54.  etc/fonts/conf.d/65-nonlatin.conf
  55.  etc/fonts/conf.d/69-unifont.conf
  56. +etc/fonts/conf.d/70-no-bitmaps.conf
  57.  etc/fonts/conf.d/80-delicious.conf
  58.  etc/fonts/conf.d/90-synthetic.conf
  59.  etc/fonts/conf.d/README
  60. Index: x11-fonts/fontconfig/files/patch-ubuntu-00-old_diff_gz
  61. ===================================================================
  62. RCS file: x11-fonts/fontconfig/files/patch-ubuntu-00-old_diff_gz
  63. diff -N x11-fonts/fontconfig/files/patch-ubuntu-00-old_diff_gz
  64. --- /dev/null   1 Jan 1970 00:00:00 -0000
  65. +++ x11-fonts/fontconfig/files/patch-ubuntu-00-old_diff_gz  20 Jan 2010 17:26:32 -0000
  66. @@ -0,0 +1,125 @@
  67. +--- conf.d/40-nonlatin.conf    2010-01-13 19:05:52.018482305 -0500
  68. ++++ conf.d/40-nonlatin.conf    2010-01-13 19:08:06.055494413 -0500
  69. +@@ -51,6 +51,7 @@
  70. +       <family>Baekmuk Dotum</family>
  71. +       <family>SimSun</family>
  72. +       <family>MgOpen Modata</family>
  73. ++      <family>MgOpen Moderna</family>
  74. +       <family>Sazanami Gothic</family>
  75. +       <family>AR PL ShanHeiSun Uni</family>
  76. +       <family>ZYSong18030</family>
  77. +--- conf.d/60-latin.conf   2010-01-13 19:05:52.014482215 -0500
  78. ++++ conf.d/60-latin.conf   2010-01-13 19:10:02.014483941 -0500
  79. +@@ -4,8 +4,8 @@
  80. +   <alias>
  81. +       <family>serif</family>
  82. +       <prefer>
  83. +-          <family>Bitstream Vera Serif</family>
  84. +           <family>DejaVu Serif</family>
  85. ++          <family>Bitstream Vera Serif</family>
  86. +           <family>Times New Roman</family>
  87. +           <family>Thorndale AMT</family>
  88. +           <family>Luxi Serif</family>
  89. +@@ -16,8 +16,8 @@
  90. +   <alias>
  91. +       <family>sans-serif</family>
  92. +       <prefer>
  93. +-          <family>Bitstream Vera Sans</family>
  94. +           <family>DejaVu Sans</family>
  95. ++          <family>Bitstream Vera Sans</family>
  96. +           <family>Verdana</family>
  97. +           <family>Arial</family>
  98. +           <family>Albany AMT</family>
  99. +@@ -32,8 +32,8 @@
  100. +   <alias>
  101. +       <family>monospace</family>
  102. +       <prefer>
  103. +-          <family>Bitstream Vera Sans Mono</family>
  104. +           <family>DejaVu Sans Mono</family>
  105. ++          <family>Bitstream Vera Sans Mono</family>
  106. +           <family>Inconsolata</family>
  107. +           <family>Andale Mono</family>
  108. +           <family>Courier New</family>
  109. +--- conf.d/Makefile.am 2010-01-13 19:05:52.010482545 -0500
  110. ++++ conf.d/Makefile.am 2010-01-13 19:08:06.055494413 -0500
  111. +@@ -25,7 +25,12 @@
  112. +   README
  113. +
  114. + CONF_FILES = \
  115. ++  10-antialias.conf \
  116. +   10-autohint.conf \
  117. ++  10-hinting.conf \
  118. ++  10-hinting-full.conf \
  119. ++  10-hinting-medium.conf \
  120. ++  10-hinting-slight.conf \
  121. +   10-no-sub-pixel.conf \
  122. +   10-sub-pixel-bgr.conf \
  123. +   10-sub-pixel-rgb.conf \
  124. +@@ -42,6 +47,8 @@
  125. +   49-sansserif.conf \
  126. +   50-user.conf \
  127. +   51-local.conf \
  128. ++  52-languageselector.conf \
  129. ++  53-monospace-lcd-filter.conf \
  130. +   60-latin.conf \
  131. +   65-fonts-persian.conf \
  132. +   65-khmer.conf \
  133. +@@ -53,6 +60,9 @@
  134. +   90-synthetic.conf
  135. +
  136. + CONF_LINKS = \
  137. ++  10-antialias.conf \
  138. ++  10-hinting.conf \
  139. ++  10-hinting-slight.conf \
  140. +   20-fix-globaladvance.conf \
  141. +   20-unhint-small-vera.conf \
  142. +   30-urw-aliases.conf \
  143. +@@ -62,6 +72,7 @@
  144. +   49-sansserif.conf \
  145. +   50-user.conf \
  146. +   51-local.conf \
  147. ++  53-monospace-lcd-filter.conf \
  148. +   60-latin.conf \
  149. +   65-fonts-persian.conf \
  150. +   65-nonlatin.conf \
  151. +--- conf.d/Makefile.in 2010-01-13 19:05:52.014482215 -0500
  152. ++++ conf.d/Makefile.in 2010-01-13 19:13:52.310959542 -0500
  153. +@@ -252,7 +252,12 @@
  154. +   README
  155. +
  156. + CONF_FILES = \
  157. ++  10-antialias.conf \
  158. +   10-autohint.conf \
  159. ++  10-hinting.conf \
  160. ++  10-hinting-full.conf \
  161. ++  10-hinting-medium.conf \
  162. ++  10-hinting-slight.conf \
  163. +   10-no-sub-pixel.conf \
  164. +   10-sub-pixel-bgr.conf \
  165. +   10-sub-pixel-rgb.conf \
  166. +@@ -269,6 +274,7 @@
  167. +   49-sansserif.conf \
  168. +   50-user.conf \
  169. +   51-local.conf \
  170. ++  53-monospace-lcd-filter.conf \
  171. +   60-latin.conf \
  172. +   65-fonts-persian.conf \
  173. +   65-khmer.conf \
  174. +@@ -280,6 +286,9 @@
  175. +   90-synthetic.conf
  176. +
  177. + CONF_LINKS = \
  178. ++  10-antialias.conf \
  179. ++  10-hinting.conf \
  180. ++  10-hinting-slight.conf \
  181. +   20-fix-globaladvance.conf \
  182. +   20-unhint-small-vera.conf \
  183. +   30-urw-aliases.conf \
  184. +@@ -289,6 +298,7 @@
  185. +   49-sansserif.conf \
  186. +   50-user.conf \
  187. +   51-local.conf \
  188. ++  53-monospace-lcd-filter.conf \
  189. +   60-latin.conf \
  190. +   65-fonts-persian.conf \
  191. +   65-nonlatin.conf \
  192. Index: x11-fonts/fontconfig/files/patch-ubuntu-04-monospace_lcd_filter_conf
  193. ===================================================================
  194. RCS file: x11-fonts/fontconfig/files/patch-ubuntu-04-monospace_lcd_filter_conf
  195. diff -N x11-fonts/fontconfig/files/patch-ubuntu-04-monospace_lcd_filter_conf
  196. --- /dev/null   1 Jan 1970 00:00:00 -0000
  197. +++ x11-fonts/fontconfig/files/patch-ubuntu-04-monospace_lcd_filter_conf    20 Jan 2010 17:26:32 -0000
  198. @@ -0,0 +1,25 @@
  199. +--- /dev/null  2007-09-19 15:17:56.000000000 +0100
  200. ++++ conf.d/53-monospace-lcd-filter.conf    2007-09-20 22:19:05.000000000 +0100
  201. +@@ -0,0 +1,22 @@
  202. ++<?xml version="1.0"?>
  203. ++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  204. ++<!-- conf.d/monospace-lcd-filter.conf -->
  205. ++<fontconfig>
  206. ++<!--  Use legacy LCD filter on smaller Monospace fonts -->
  207. ++  <match target="font">
  208. ++    <test name="family">
  209. ++      <string>DejaVu Sans Mono</string>
  210. ++      <string>Bitstream Vera Sans Mono</string>
  211. ++    </test>
  212. ++    <test name="pixelsize" compare="less_eq">
  213. ++      <double>12.0</double>
  214. ++    </test>
  215. ++
  216. ++    <edit name="lcd_filter" mode="assign">
  217. ++      <const>lcdlegacy</const>
  218. ++    </edit>
  219. ++    <edit name="hintstyle" mode="assign">
  220. ++      <const>hintfull</const>
  221. ++    </edit>
  222. ++  </match>
  223. ++</fontconfig>
  224. Index: x11-fonts/fontconfig/files/patch-ubuntu-05-add_hinting_and_antialiasing_confs
  225. ===================================================================
  226. RCS file: x11-fonts/fontconfig/files/patch-ubuntu-05-add_hinting_and_antialiasing_confs
  227. diff -N x11-fonts/fontconfig/files/patch-ubuntu-05-add_hinting_and_antialiasing_confs
  228. --- /dev/null   1 Jan 1970 00:00:00 -0000
  229. +++ x11-fonts/fontconfig/files/patch-ubuntu-05-add_hinting_and_antialiasing_confs   20 Jan 2010 17:26:32 -0000
  230. @@ -0,0 +1,55 @@
  231. +--- conf.d/10-antialias.conf   1970-01-01 08:00:00.000000000 +0800
  232. ++++ conf.d/10-antialias.conf   2008-02-28 04:22:09.000000000 +0800
  233. +@@ -0,0 +1,8 @@
  234. ++<?xml version="1.0"?>
  235. ++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  236. ++<fontconfig>
  237. ++<!--  Use the Antialiasing -->
  238. ++  <match target="font">
  239. ++    <edit name="antialias" mode="assign"><bool>true</bool></edit>
  240. ++  </match>
  241. ++</fontconfig>
  242. +--- conf.d/10-hinting.conf 1970-01-01 08:00:00.000000000 +0800
  243. ++++ conf.d/10-hinting.conf 2008-02-28 04:22:33.000000000 +0800
  244. +@@ -0,0 +1,8 @@
  245. ++<?xml version="1.0"?>
  246. ++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  247. ++<fontconfig>
  248. ++<!--  Use Hinting -->
  249. ++  <match target="font">
  250. ++    <edit name="hinting" mode="assign"><bool>true</bool></edit>
  251. ++  </match>
  252. ++</fontconfig>
  253. +--- conf.d/10-hinting-full.conf    1970-01-01 08:00:00.000000000 +0800
  254. ++++ conf.d/10-hinting-full.conf    2008-02-28 04:24:01.000000000 +0800
  255. +@@ -0,0 +1,8 @@
  256. ++<?xml version="1.0"?>
  257. ++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  258. ++<fontconfig>
  259. ++<!--  Use Full Hinting -->
  260. ++  <match target="font">
  261. ++    <edit name="hintstyle" mode="assign"><const>hintfull</const></edit>
  262. ++  </match>
  263. ++</fontconfig>
  264. +--- conf.d/10-hinting-medium.conf  1970-01-01 08:00:00.000000000 +0800
  265. ++++ conf.d/10-hinting-medium.conf  2008-02-28 04:23:23.000000000 +0800
  266. +@@ -0,0 +1,8 @@
  267. ++<?xml version="1.0"?>
  268. ++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  269. ++<fontconfig>
  270. ++<!--  Use Medium Hinting -->
  271. ++  <match target="font">
  272. ++    <edit name="hintstyle" mode="assign"><const>hintmedium</const></edit>
  273. ++  </match>
  274. ++</fontconfig>
  275. +--- conf.d/10-hinting-slight.conf  1970-01-01 08:00:00.000000000 +0800
  276. ++++ conf.d/10-hinting-slight.conf  2008-02-28 04:24:26.000000000 +0800
  277. +@@ -0,0 +1,8 @@
  278. ++<?xml version="1.0"?>
  279. ++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  280. ++<fontconfig>
  281. ++<!--  Use Slight Hinting -->
  282. ++  <match target="font">
  283. ++    <edit name="hintstyle" mode="assign"><const>hintslight</const></edit>
  284. ++  </match>
  285. ++</fontconfig>
  286. Index: x11-fonts/fontconfig/files/patch-ubuntu-05-lcdfilterlegacy
  287. ===================================================================
  288. RCS file: x11-fonts/fontconfig/files/patch-ubuntu-05-lcdfilterlegacy
  289. diff -N x11-fonts/fontconfig/files/patch-ubuntu-05-lcdfilterlegacy
  290. --- /dev/null   1 Jan 1970 00:00:00 -0000
  291. +++ x11-fonts/fontconfig/files/patch-ubuntu-05-lcdfilterlegacy  20 Jan 2010 17:26:32 -0000
  292. @@ -0,0 +1,9 @@
  293. +--- src/fcname.c.orig  2008-09-12 17:27:25.000000000 +0000
  294. ++++ src/fcname.c   2008-09-12 17:31:54.000000000 +0000
  295. +@@ -441,5 +441,6 @@
  296. +     { (FcChar8 *) "lcddefault",       "lcdfilter",    FC_LCD_DEFAULT },
  297. +     { (FcChar8 *) "lcdlight",     "lcdfilter",    FC_LCD_LIGHT },
  298. +     { (FcChar8 *) "lcdlegacy",        "lcdfilter",    FC_LCD_LEGACY },
  299. ++    { (FcChar8 *) "lcdfilterlegacy",      "lcdfilter",    FC_LCD_LEGACY },
  300. + };
  301. +
  302. Index: x11-fonts/fontconfig/files/patch-ubuntu-06-lcddefault
  303. ===================================================================
  304. RCS file: x11-fonts/fontconfig/files/patch-ubuntu-06-lcddefault
  305. diff -N x11-fonts/fontconfig/files/patch-ubuntu-06-lcddefault
  306. --- /dev/null   1 Jan 1970 00:00:00 -0000
  307. +++ x11-fonts/fontconfig/files/patch-ubuntu-06-lcddefault   20 Jan 2010 17:26:32 -0000
  308. @@ -0,0 +1,50 @@
  309. +--- conf.d/11-lcd-filter-lcddefault.conf   1969-12-31 19:00:00.000000000 -0500
  310. ++++ conf.d/11-lcd-filter-lcddefault.conf   2010-01-13 19:16:57.691482777 -0500
  311. +@@ -0,0 +1,11 @@
  312. ++<?xml version="1.0"?>
  313. ++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  314. ++<!-- conf.d/lcd-filter-lcddefault.conf -->
  315. ++<fontconfig>
  316. ++<!--  Use lcddefault as default for LCD filter -->
  317. ++  <match target="font">
  318. ++    <edit mode="assign" name="lcdfilter">
  319. ++      <const>lcddefault</const>
  320. ++    </edit>
  321. ++  </match>
  322. ++</fontconfig>
  323. +--- conf.d/Makefile.am 2010-01-13 19:16:56.662484262 -0500
  324. ++++ conf.d/Makefile.am 2010-01-13 19:16:57.691482777 -0500
  325. +@@ -37,6 +37,7 @@
  326. +   10-sub-pixel-vbgr.conf \
  327. +   10-sub-pixel-vrgb.conf \
  328. +   10-unhinted.conf \
  329. ++  11-lcd-filter-lcddefault.conf \
  330. +   20-fix-globaladvance.conf \
  331. +   20-unhint-small-vera.conf \
  332. +   25-unhint-nonlatin.conf \
  333. +@@ -63,6 +64,7 @@
  334. +   10-antialias.conf \
  335. +   10-hinting.conf \
  336. +   10-hinting-slight.conf \
  337. ++  11-lcd-filter-lcddefault.conf \
  338. +   20-fix-globaladvance.conf \
  339. +   20-unhint-small-vera.conf \
  340. +   30-urw-aliases.conf \
  341. +--- conf.d/Makefile.in 2010-01-13 19:16:56.662484262 -0500
  342. ++++ conf.d/Makefile.in 2010-01-13 19:16:57.691482777 -0500
  343. +@@ -264,6 +264,7 @@
  344. +   10-sub-pixel-vbgr.conf \
  345. +   10-sub-pixel-vrgb.conf \
  346. +   10-unhinted.conf \
  347. ++  11-lcd-filter-lcddefault.conf \
  348. +   20-fix-globaladvance.conf \
  349. +   20-unhint-small-vera.conf \
  350. +   25-unhint-nonlatin.conf \
  351. +@@ -289,6 +290,7 @@
  352. +   10-antialias.conf \
  353. +   10-hinting.conf \
  354. +   10-hinting-slight.conf \
  355. ++  11-lcd-filter-lcddefault.conf \
  356. +   20-fix-globaladvance.conf \
  357. +   20-unhint-small-vera.conf \
  358. +   30-urw-aliases.conf \
  359. Index: x11-fonts/fontconfig/files/patch-ubuntu-07-no_bitmaps
  360. ===================================================================
  361. RCS file: x11-fonts/fontconfig/files/patch-ubuntu-07-no_bitmaps
  362. diff -N x11-fonts/fontconfig/files/patch-ubuntu-07-no_bitmaps
  363. --- /dev/null   1 Jan 1970 00:00:00 -0000
  364. +++ x11-fonts/fontconfig/files/patch-ubuntu-07-no_bitmaps   20 Jan 2010 17:26:32 -0000
  365. @@ -0,0 +1,20 @@
  366. +--- conf.d/Makefile.am 2010-01-13 19:21:19.379494731 -0500
  367. ++++ conf.d/Makefile.am 2010-01-13 19:21:20.331482412 -0500
  368. +@@ -79,6 +79,7 @@
  369. +   65-fonts-persian.conf \
  370. +   65-nonlatin.conf \
  371. +   69-unifont.conf \
  372. ++  70-no-bitmaps.conf \
  373. +   80-delicious.conf \
  374. +   90-synthetic.conf
  375. +
  376. +--- conf.d/Makefile.in 2010-01-13 19:21:19.383482947 -0500
  377. ++++ conf.d/Makefile.in 2010-01-13 19:22:25.718516776 -0500
  378. +@@ -305,6 +305,7 @@
  379. +   65-fonts-persian.conf \
  380. +   65-nonlatin.conf \
  381. +   69-unifont.conf \
  382. ++  70-no-bitmaps.conf \
  383. +   80-delicious.conf \
  384. +   90-synthetic.conf
  385. +
RAW Paste Data