ports/58575: Fix chinese/xmms patch

[Cheng-Lung Sung]

>Number:         58575
>Category:       ports
>Synopsis:       Fix chinese/xmms patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 26 09:20:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Cheng-Lung Sung
>Release:        FreeBSD 4.8-RELEASE-p13 i386
>Organization:
FreeBSD @ Taiwan
>Environment:
System: FreeBSD sungsung.csie.nctu.edu.tw 4.8-RELEASE-p13 FreeBSD 4.8-RELEASE-p13 #3: Wed Oct 8 07:32:16 CST 2003 root at sungsung.csie.nctu.edu.tw:/usr/obj/usr/src/sys/SUNGSUNG i386

>Description:
fix make patch error.
>How-To-Repeat:
% make patch
===>  Extracting for zh-xmms-esound-1.2.8_1
>Fix:

diff -ruN /usr/ports/chinese/xmms/files/extra-patch-xmms-1.2.x-xfont xmms/files/extra-patch-xmms-1.2.x-xfont
--- /usr/ports/chinese/xmms/files/extra-patch-xmms-1.2.x-xfont	Tue Jan 22 22:29:23 2002
+++ xmms/files/extra-patch-xmms-1.2.x-xfont	Mon Oct 27 01:14:34 2003
@@ -1,6 +1,6 @@
---- xmms/main.c.orig	Fri Dec 28 20:32:28 2001
-+++ xmms/main.c	Tue Jan 22 16:43:25 2002
-@@ -331,8 +331,8 @@
+--- xmms/main.c.orig	Tue Sep  2 21:01:40 2003
++++ xmms/main.c	Mon Oct 27 01:13:14 2003
+@@ -332,8 +332,8 @@
  	cfg.sticky = FALSE;
  	cfg.always_show_cb = TRUE;
  	cfg.convert_underscore = TRUE;
@@ -17,11 +17,11 @@
  	cfg.random_skin_on_play = FALSE;
 -	cfg.mainwin_use_xfont = FALSE;
 +	cfg.mainwin_use_xfont = TRUE;
-+    cfg.use_fontsets = TRUE;
- 	cfg.read_pl_metadata = TRUE;
++	cfg.use_fontsets = TRUE;
+ 	cfg.use_pl_metadata = TRUE;
  
  	cfg.playlist_x = 295;
-@@ -492,9 +493,9 @@
+@@ -490,9 +491,9 @@
  		cfg.mainwin_font = NULL;
  	}
  	if (cfg.playlist_font == NULL)

>Release-Note:
>Audit-Trail:
>Unformatted:
 >> Checksum OK for xmms-1.2.8.tar.bz2.
 
 You can disable support for mikmod by defining WITHOUT_MIKMOD.
 You can disable support for vorbis by defining WITHOUT_VORBIS.
 You can disable 3DNow! optimized decoding routines by defining WITHOUT_3DNOW.
 You can disable support for esound by defining WITHOUT_GNOME=esound.
 
 ===>  Patching for zh-xmms-esound-1.2.8_1
 ===>  Applying extra patch /usr/ports/chinese/xmms/files/extra-patch-xmms-1.2.x-xfont
 1 out of 3 hunks failed--saving rejects to xmms/main.c.rej
 *** Error code 1