ports/181701: [patch] japanese/font-migu: fix multiple <test> value fontconfig warning

[Jan Beich]

>Number:         181701
>Category:       ports
>Synopsis:       [patch] japanese/font-migu: fix multiple <test> value fontconfig warning
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 31 11:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Jan Beich
>Release:        
>Organization:
>Environment:
started to appear after recent x11-fonts/fontconfig update
>Description:
http://cgit.freedesktop.org/fontconfig/commit/?id=2837c63

>How-To-Repeat:
$ fc-list >/dev/null
Fontconfig warning: "/usr/local/etc/fonts/conf.d/20-unhint-migu.conf", line 11: Having multiple values in <test> isn't supported and may not work as expected

>Fix:
long version

--- many_match.diff begins here ---
Index: japanese/font-migu/files/20-unhint-migu.conf
===================================================================
--- japanese/font-migu/files/20-unhint-migu.conf	(revision 325711)
+++ japanese/font-migu/files/20-unhint-migu.conf	(working copy)
@@ -5,8 +5,29 @@
 	<match target="font">
 		<test name="family">
 			<string>Migu 1C</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family">
 			<string>Migu 1P</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family">
 			<string>Migu 1M</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family">
 			<string>Migu 2M</string>
 		</test>
 		<edit name="autohint">
--- many_match.diff ends here ---

short version

--- test_or.diff begins here ---
Index: japanese/font-migu/files/20-unhint-migu.conf
===================================================================
--- japanese/font-migu/files/20-unhint-migu.conf	(revision 325711)
+++ japanese/font-migu/files/20-unhint-migu.conf	(working copy)
@@ -3,12 +3,20 @@
 <!-- $FreeBSD$ -->
 <fontconfig>
 	<match target="font">
+		<or>
 		<test name="family">
 			<string>Migu 1C</string>
+		</test>
+		<test name="family">
 			<string>Migu 1P</string>
+		</test>
+		<test name="family">
 			<string>Migu 1M</string>
+		</test>
+		<test name="family">
 			<string>Migu 2M</string>
 		</test>
+		</or>
 		<edit name="autohint">
 			<bool>false</bool>
 		</edit>
--- test_or.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: