7 files changed, 61 insertions, 12 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 2b8876592832..26ebd5e0823b 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -595,6 +595,7 @@
     SUBDIR += py-cddb
     SUBDIR += py-discogs-client
     SUBDIR += py-eyed3
+    SUBDIR += py-eyed3-06
     SUBDIR += py-fastaudio
     SUBDIR += py-id3
     SUBDIR += py-karaoke
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 85db974d28d5..a9bcafafd571 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	abcde
 PORTVERSION=	2.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	cd-discid:${PORTSDIR}/audio/cd-discid \
 		cdparanoia:${PORTSDIR}/audio/cdparanoia \
-		eyeD3:${PORTSDIR}/audio/py-eyed3 \
+		${PYTHON_PKGNAMEPREFIX}eyed3-06>0:${PORTSDIR}/audio/py-eyed3-06 \
 		lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		bash:${PORTSDIR}/shells/bash
diff --git a/audio/py-eyed3-06/Makefile b/audio/py-eyed3-06/Makefile
new file mode 100644
index 000000000000..f1796f1bd8dc
--- /dev/null
+++ b/audio/py-eyed3-06/Makefile
@@ -0,0 +1,36 @@
+# Created by: Hye-Shik Chang <perky@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	eyed3
+PORTVERSION=	0.6.18
+PORTREVISION=	1
+CATEGORIES=	audio python
+MASTER_SITES=	http://eyed3.nicfit.net/releases/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-06
+DISTNAME=	eyeD3-${PORTVERSION}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Python module for processing ID3 tags
+
+LICENSE=	GPLv2
+
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+USES=			gmake
+GNU_CONFIGURE=		yes
+
+CONFLICTS=	py*-eyed3-0.7.[0-9]*
+
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+PORTDOCS=	AUTHORS ChangeLog README
+PLIST_FILES+=	bin/eyeD3 man/man1/eyeD3.1.gz
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/eyeD3.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/eyeD3 ${STAGEDIR}${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/audio/py-eyed3-06/distinfo b/audio/py-eyed3-06/distinfo
new file mode 100644
index 000000000000..e30ca608439a
--- /dev/null
+++ b/audio/py-eyed3-06/distinfo
@@ -0,0 +1,2 @@
+SHA256 (eyeD3-0.6.18.tar.gz) = ad871e252473f1db81b2574ae3a7d3e14128e28de0b54998b4ce1d62dc207406
+SIZE (eyeD3-0.6.18.tar.gz) = 117002
diff --git a/audio/py-eyed3-06/pkg-descr b/audio/py-eyed3-06/pkg-descr
new file mode 100644
index 000000000000..2bc2ce052fda
--- /dev/null
+++ b/audio/py-eyed3-06/pkg-descr
@@ -0,0 +1,6 @@
+eyeD3 is a Python program/module for processing (reading and
+writing) ID3 tags. Information about mp3 files (i.e bit rate,
+sample frequency, play time, etc.) is also available. The formats
+supported are ID3 v1.0/v1.1 and v2.3/v2.4.
+
+WWW: http://eyed3.nicfit.net/
diff --git a/audio/py-eyed3/Makefile b/audio/py-eyed3/Makefile
index bb1073aef734..1eded50d4b1c 100644
--- a/audio/py-eyed3/Makefile
+++ b/audio/py-eyed3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eyed3
-PORTVERSION=	0.6.18
-PORTREVISION=	1
+PORTVERSION=	0.7.4
 CATEGORIES=	audio python
 MASTER_SITES=	http://eyed3.nicfit.net/releases/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,20 +13,25 @@ COMMENT=	Python module for processing ID3 tags
 
 LICENSE=	GPLv2
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}magic>0:${PORTSDIR}/devel/py-magic
+
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USES=			gmake
-GNU_CONFIGURE=		yes
+USES=			tar:tgz
+
+CONFLICTS=	py*-eyed3-06-[0-9]*
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-PORTDOCS=	AUTHORS ChangeLog README
-PLIST_FILES+=	bin/eyeD3 man/man1/eyeD3.1.gz
+PORTDOCS=	AUTHORS ChangeLog README.rst
+PORTEXAMPLES=	*
 
+post-patch:
+	${REINPLACE_CMD} -e 's/bash/sh/g' ${WRKSRC}/bin/eyeD3
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/eyeD3.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/eyeD3 ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/audio/py-eyed3/distinfo b/audio/py-eyed3/distinfo
index e30ca608439a..b3bc40e0db9d 100644
--- a/audio/py-eyed3/distinfo
+++ b/audio/py-eyed3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (eyeD3-0.6.18.tar.gz) = ad871e252473f1db81b2574ae3a7d3e14128e28de0b54998b4ce1d62dc207406
-SIZE (eyeD3-0.6.18.tar.gz) = 117002
+SHA256 (eyeD3-0.7.4.tgz) = a138e6e1fd5b8c2b7947a2d22868167ede16bb96e8e02a067951388bf1fb3000
+SIZE (eyeD3-0.7.4.tgz) = 207001