xmms recode patch

[Andrey V. Elsukov]

Hi!
I have make a patch to multimedia/xmms with new version of csa recode patch.
-- 
WBR, Andrey V. Elsukov

-------------- next part --------------
diff -burN xmms.orig/Makefile xmms/Makefile
--- xmms.orig/Makefile	Thu Apr 21 20:13:54 2005
+++ xmms/Makefile	Sat Jul 23 17:35:47 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms
 PORTVERSION=	1.2.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES+=	multimedia audio ipv6
 MASTER_SITES=	http://www.xmms.org/files/1.2.x/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/
@@ -45,7 +45,7 @@
 CONFIGURE_ARGS+=	--enable-ipv6
 
 .if defined(WITH_ENCODING_PATCH) || defined(WITH_ID3V2_PATCH)
-ENC_PATCHLEVEL=	27.4
+ENC_PATCHLEVEL=	28
 DISTFILES+=	${PORTNAME}-${PORTVERSION}-recode-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
 MASTER_SITE_SUBDIR+=	rusxmms/:enc
@@ -129,7 +129,7 @@
 	@${ECHO_MSG}
 .endif
 
-post-patch:
+post-extract:
 .if defined(WITH_ID3V2_PATCH)
 	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/recode.3rdparty/id3v2.patch
 .endif
diff -burN xmms.orig/distinfo xmms/distinfo
--- xmms.orig/distinfo	Tue Nov  2 19:28:29 2004
+++ xmms/distinfo	Sat Jul 23 12:07:48 2005
@@ -1,8 +1,4 @@
-SHA1 (xmms-1.2.10.tar.bz2) = a3c3d3756d5263183c27b3c50a7f5404cba8bfaf
-RMD160 (xmms-1.2.10.tar.bz2) = 0360cbb8c326b3325bd8ebb3343c69a9788d7084
 MD5 (xmms-1.2.10.tar.bz2) = 03a85cfc5e1877a2e1f7be4fa1d3f63c
 SIZE (xmms-1.2.10.tar.bz2) = 2418265
-SHA1 (xmms-1.2.10-recode-csa27.4.tar.bz2) = 342448386ebad1f1700df8816411acb739845203
-RMD160 (xmms-1.2.10-recode-csa27.4.tar.bz2) = 40cf6b8fae111ff11e390760bdeb7e4a6f57b8a4
-MD5 (xmms-1.2.10-recode-csa27.4.tar.bz2) = f782cd4251fb36c23519b3b6d2552156
-SIZE (xmms-1.2.10-recode-csa27.4.tar.bz2) = 281388
+MD5 (xmms-1.2.10-recode-csa28.tar.bz2) = aa1f14162ff219f5088e4869b1f7b5e7
+SIZE (xmms-1.2.10-recode-csa28.tar.bz2) = 281682
diff -burN xmms.orig/files/patch-strnlen xmms/files/patch-strnlen
--- xmms.orig/files/patch-strnlen	Thu Jan  1 03:00:00 1970
+++ xmms/files/patch-strnlen	Sat Jul 23 18:26:42 2005
@@ -0,0 +1,54 @@
+--- libxmms/strnlen.h	Sat Jul 23 17:41:41 2005
++++ libxmms/strnlen.h	Sat Jul 23 17:41:35 2005
+@@ -0,0 +1,10 @@
++#ifdef __FreeBSD__
++#include <unistd.h>
++
++size_t strnlen(const char* s, size_t n)
++{
++	size_t i = 0;
++	while(i < n && s[i] != 0)i++;
++	return i;
++}
++#endif
+--- libxmms/charset.c.orig	Sat Jul 23 17:43:00 2005
++++ libxmms/charset.c	Sat Jul 23 17:43:22 2005
+@@ -18,6 +18,7 @@
+ #endif
+ */
+ 
++#include "strnlen.h"
+ #include "charset.h"
+ #include "charset_config.h"
+ 
+--- libxmms/Makefile.am.orig	Sat Jul 23 18:23:44 2005
++++ libxmms/Makefile.am	Sat Jul 23 18:24:19 2005
+@@ -15,8 +15,8 @@
+ formatter.c formatter.h \
+ titlestring.c titlestring.h \
+ xentry.c xentry.h \
+-xconvert.c xconvert.h \
++xconvert.c xconvert.h strnlen.h \
+ charset.c charset.h charset_auto_russian.h charset_config.h russian_table.h
+ 
+-xmmsinclude_HEADERS = configfile.h xmmsctrl.h dirbrowser.h util.h formatter.h titlestring.h charset.h charset_auto_russian.h russian_table.h
++xmmsinclude_HEADERS = configfile.h xmmsctrl.h dirbrowser.h util.h formatter.h titlestring.h charset.h charset_auto_russian.h russian_table.h strnlen.h
+ 
+--- libxmms/Makefile.in.orig	Sat Jul 23 18:23:52 2005
++++ libxmms/Makefile.in	Sat Jul 23 18:25:09 2005
+@@ -145,13 +145,13 @@
+ formatter.c formatter.h \
+ titlestring.c titlestring.h \
+ xentry.c xentry.h \
+-xconvert.c xconvert.h \
++xconvert.c xconvert.h strnlen.h \
+ charset.c charset.h charset_auto_russian.h charset_config.h russian_table.h
+ 
+ 
+ 
+ xmmsinclude_HEADERS = configfile.h xmmsctrl.h dirbrowser.h util.h formatter.h titlestring.h \
+-charset.h charset_auto_russian.h charset_config.h russian_table.h
++charset.h charset_auto_russian.h charset_config.h russian_table.h strnlen.h
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
diff -burN xmms.orig/pkg-plist xmms/pkg-plist
--- xmms.orig/pkg-plist	Tue Nov  2 19:28:29 2004
+++ xmms/pkg-plist	Sat Jul 23 18:27:22 2005
@@ -1,6 +1,7 @@
 bin/wmxmms
 bin/xmms
 bin/xmms-config
+%%ENCODING%%include/xmms/strnlen.h
 %%ENCODING%%include/xmms/charset.h
 %%ENCODING%%include/xmms/charset_auto_russian.h
 %%ENCODING%%include/xmms/charset_config.h