Add ability to recode mp3 tags using iconv library. This is useful for koi8

users, because russian tags usually coded in cp1251 encoding.

Submitted by:	Alexey V. Neyman <avn@any.ru>
		Gleb Smirnoff <glebius@tak.estra.ru>

3 files changed, 31 insertions, 9 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index f2fe4a4b612f..7e7537d89ae7 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpg123
 PORTVERSION=	0.59r
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.mpg123.de/mpg123/ \
 		http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
@@ -16,8 +16,10 @@ MASTER_SITES=	http://www.mpg123.de/mpg123/ \
 DISTFILES=	mpg123-0.59r-pl1.tar.gz
 
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/ \
-		http://www.unix-ag.org/Linux-Alpha/Packages/
+		http://www.unix-ag.org/Linux-Alpha/Packages/ \
+		${MASTER_SITE_LOCAL:S/%SUBDIR%/sobomax/}
 PATCHFILES=	mpg123-059r-v6-20000713b.diff.gz \
+		mpg123-059r-recode-20010410.diff.gz \
 		l3.diff.gz
 PATCH_DIST_STRIP=	-p1
 
@@ -25,6 +27,14 @@ MAINTAINER=	sobomax@freebsd.org
 
 WANT_ESOUND=	yes
 
+.if defined(WITH_ICONV)
+MAKE_ARGS+=	WITH_ICONV=yes
+.if defined(DEFAULT_RECODE)
+MAKE_ARGS+=	DEFAULT_RECODE=${DEFAULT_RECODE}
+.endif
+LIB_DEPENDS+=	iconv.2:${PORTSDIR}/converters/iconv
+.endif
+
 .if defined(WITH_NAS)
 HAVE_NAS=	yes
 LIB_DEPENDS=	audio.1:${PORTSDIR}/audio/nas
@@ -56,6 +66,13 @@ pre-fetch:
 	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_NAS=yes\""
 	@${ECHO_MSG}
 .endif
+.if !defined(WITH_ICONV)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want to enable ID3 tags charset recoding,"
+	@${ECHO_MSG} "hit Ctrl-C and use \"make WITH_ICONV=yes\"; you can"
+	@${ECHO_MSG} "also specify DEFAULT_RECODE in 'from:to' format"
+	@${ECHO_MSG}
+.endif
 .if ${MACHINE_ARCH} == "i386"
 .if ${OSVERSION} >= 500018
 .if ${MACHINE_CPU:M3dnow}
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 1f554827759b..fba29aea6080 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,3 +1,4 @@
 MD5 (mpg123-0.59r-pl1.tar.gz) = 2648708fac9203ef58292adf5e54e4ba
 MD5 (mpg123-059r-v6-20000713b.diff.gz) = b830cefc8805c8ad827f73985c03d27f
 MD5 (l3.diff.gz) = b8749f4709ed1a9df8a00d51c4a02dd5
+MD5 (mpg123-059r-recode-20010410.diff.gz) = 8f9e18cf27f9e048c5369cf3b78b6b11
diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
index 3c742412f8bc..b0374222e627 100644
--- a/audio/mpg123/files/patch-aa
+++ b/audio/mpg123/files/patch-aa
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.orig	Sat Mar 10 11:50:58 2001
-+++ Makefile	Sat Mar 10 12:02:21 2001
+--- Makefile	2001/04/10 11:50:14	1.1
++++ Makefile	2001/04/10 11:51:38
 @@ -4,13 +4,15 @@
  
  # Where to install binary and manpage on "make install":
@@ -21,13 +18,20 @@ $FreeBSD$
  # Additional LIBDIR and libraries if exist
  IPV6LIBDIR=
  IPV6LIB=
-@@ -300,35 +302,65 @@
+@@ -300,6 +302,9 @@
  #CFLAGS='$(CFLAGS) -DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
  #CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
  
 +CC ?= cc
 +LDFLAGS =
 +
+ .if defined(WITH_ICONV)
+ CFLAGS+=-DWITH_ICONV -I${LOCALBASE}/include
+ LDFLAGS+=-L${LOCALBASE}/lib -liconv
+@@ -308,35 +313,62 @@
+ .endif
+ .endif
+ 
 +.if ${MACHINE_ARCH} == "i386"
 +ARCHOPT= -funroll-all-loops -ffast-math -fomit-frame-pointer \
 +	 -DROT_I386 -DI386_ASSEM -DREAL_IS_FLOAT 
@@ -108,7 +112,7 @@ $FreeBSD$
  		$(FRONTEND)
   
  
-@@ -567,7 +599,7 @@
+@@ -575,7 +607,7 @@
  	@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123
  
  mpg123-make: