- Update russian patches to 1.2.11

PR:		ports/119187
Submitted by:	Ulrich Spoerlein <uspoerlein@gmail.com>
Approved by:	maintainer timeout (2 weeks)

4 files changed, 104 insertions, 11 deletions

diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index b0d0820016ff..507a82cc7302 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmms
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES+=	multimedia audio ipv6
 MASTER_SITES=	http://www.xmms.org/files/1.2.x/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -17,14 +18,15 @@ COMMENT?=	X Multimedia System -- An audio player with Winamp GUI
 USE_BZIP2=	yes
 USE_GL=		gl
 USE_GNOME=	gtk12 gnomehack
-WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	aclocal:19 automake:19 autoheader:261 autoconf:261 libtool:15
+ACLOCAL_ARGS=	--force
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		INPUT_PLUGINS="${INPUT_PLUGINS}" \
 		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
 		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
@@ -42,6 +44,16 @@ PLIST_SUB=	DATADIR="share"
 
 CONFIGURE_ARGS+=	--enable-ipv6
 
+.if defined(WITH_RUSXMMS_PATCHES)
+ENC_PATCHLEVEL=	41
+DISTFILES+=	RusXMMS2-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
+MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
+MASTER_SITE_SUBDIR+=	rusxmms/:enc
+
+LIB_DEPENDS+=	rcc.2:${PORTSDIR}/devel/librcc
+LIB_DEPENDS+=	rcd.1:${PORTSDIR}/devel/librcd
+.endif
+
 .if defined(WITH_EXTENDED_VORBIS_FILEINFO)
 CFLAGS+=	-DALL_VORBIS_TAGS
 .endif
@@ -92,8 +104,12 @@ post-extract:
 .endif
 
 pre-extract:
-.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || ( !defined(WITHOUT_SIMD) ) || ${HAVE_GNOME:Mesound}!=""
+.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || !defined(WITHOUT_SIMD) \
+  || ${HAVE_GNOME:Mesound}!="" || !defined(WITH_RUSXMMS_PATCHES)
 	@${ECHO_MSG}
+.if !defined(WITH_RUSXMMS_PATCHES)
+	@${ECHO_MSG} "You can enable support for ID3v2 tags and CP1251 encoding by defining WITH_RUSXMMS_PATCHES."
+.endif
 .if !defined(WITHOUT_MIKMOD)
 	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
 .endif
@@ -110,14 +126,45 @@ pre-extract:
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		 's|\(datadir\)/aclocal|(prefix)/share/aclocal|g'
-	@${REINPLACE_CMD} -e 's|{datadir}/locale|{prefix}/share/locale|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/objformat/s|echo aout|echo elf|' \
-		${WRKSRC}/configure ${WRKSRC}/libxmms/configure
+.if defined(WITH_RUSXMMS_PATCHES)
+.  for src in source/rcc.c source/rcc.h source/rcc_langs.h
+	@${INSTALL_DATA} ${WRKDIR}/RusXMMS2/${src} ${WRKSRC}/libxmms
+.  endfor
+	@${CAT} ${WRKDIR}/RusXMMS2/3rdparty/mpg123/*.patch | ${PATCH} -s -p1 -d ${WRKSRC}
+.  for diff in xmms-ds-rusxmms.patch xmms-ds-rusxmms-charset.patch \
+       xmms-ds-playlist.patch xmms-ds-shade.patch xmms-ds-textbox.patch
+	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/RusXMMS2/patches/${diff}
+.  endfor
+.  for diff in xmms-ds-mpg123.patch xmms-ds-mpg123-editor.patch \
+       xmms-ds-mpg123-editor-keys.patch xmms-ds-vorbis-editor.patch \
+       xmms-ds-vorbis-editor-keys.patch
+	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/RusXMMS2/patches/plugins/${diff}
+.  endfor
+.endif
+# If there is no esound installed, the autotools won't find a required macro
+.if !${HAVE_GNOME:Mesound}!=""
+	${REINPLACE_CMD} -e '/AM_PATH_ESD/,/have_esd=no/d' ${WRKSRC}/configure.in
+.endif
+
+# There are patches to configure.in and Makefile.in, recreate configure
+# scripts
+run-autotools:
+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
+		${ACLOCAL_ARGS})
+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
+		${AUTOHEADER_ARGS})
+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
+		${AUTOCONF_ARGS})
+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
+		${AUTOMAKE_ARGS})
+	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
+		${ACLOCAL_ARGS})
+	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
+		${AUTOHEADER_ARGS})
+	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
+		${AUTOCONF_ARGS})
+	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
+		${AUTOMAKE_ARGS})
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/xmms/Skins
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index 3f899cab8c3a..96c30ee1f3ae 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1,3 +1,6 @@
 MD5 (xmms-1.2.11.tar.bz2) = f3e6dbaf0b3f571a532ab575656be506
 SHA256 (xmms-1.2.11.tar.bz2) = 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
 SIZE (xmms-1.2.11.tar.bz2) = 2581032
+MD5 (RusXMMS2-csa41.tar.bz2) = 7d89f35c80849dae89b81cbb57026e57
+SHA256 (RusXMMS2-csa41.tar.bz2) = e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
+SIZE (RusXMMS2-csa41.tar.bz2) = 96642
diff --git a/multimedia/xmms/files/patch-configure.in b/multimedia/xmms/files/patch-configure.in
new file mode 100644
index 000000000000..df5cba0e8ecd
--- /dev/null
+++ b/multimedia/xmms/files/patch-configure.in
@@ -0,0 +1,33 @@
+--- configure.in.orig	2007-11-16 22:52:30.000000000 +0100
++++ configure.in	2007-12-29 18:08:33.603961280 +0100
+@@ -115,7 +115,14 @@
+ dnl ***
+ dnl *** Check pthread linking
+ dnl ***
++AC_MSG_CHECKING([for PTHREAD_LIBS])
++if test "x$PTHREAD_LIBS" = "x"; then
+ PTHREAD_LIBS=error
++else
++AC_MSG_RESULT([$PTHREAD_LIBS])
++fi
++
++if test "x$PTHREAD_LIBS" = "xerror"; then
+ AC_MSG_CHECKING([for old style FreeBSD -pthread flag])
+ AC_EGREP_CPP([yes],
+ 	[#if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) || defined(__OpenBSD__)
+@@ -124,6 +131,7 @@
+ 	], AC_MSG_RESULT([yes])
+ 	CFLAGS="$CFLAGS -D_THREAD_SAFE" PTHREAD_LIBS="-pthread",
+ 	AC_MSG_RESULT([no]))
++fi
+ if test "x$PTHREAD_LIBS" = "xerror"; then
+ 	AC_CHECK_LIB([pthread], [pthread_attr_init],
+ 		PTHREAD_LIBS="-lpthread")
+@@ -423,7 +431,6 @@
+ LIBS_save=$LIBS
+ CFLAGS_save=$CFLAGS
+ LDFLAGS_save=$LDFLAGS
+-AM_PATH_ALSA([0.9.0], [have_alsa=yes], [have_alsa=no])
+ AM_CONDITIONAL([HAVE_ALSA], [test "x${have_alsa}" = "xyes"])
+ LIBS=$LIBS_save
+ CFLAGS=$CFLAGS_save
diff --git a/multimedia/xmms/files/patch-po-Makefile.in.in b/multimedia/xmms/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..134078c01554
--- /dev/null
+++ b/multimedia/xmms/files/patch-po-Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	2007-12-28 18:06:27.340155988 +0100
++++ po/Makefile.in.in	2007-12-28 18:06:52.250680503 +0100
+@@ -30,6 +30,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++install_sh = @install_sh@
+ mkinstalldirs = $(SHELL) @install_sh@ -d
+ mkdir_p = @mkdir_p@
+