5 files changed, 21 insertions, 41 deletions

diff --git a/audio/mp3butler/Makefile b/audio/mp3butler/Makefile
index cb3ba22bbd5c..e50e55dc5e0d 100644
--- a/audio/mp3butler/Makefile
+++ b/audio/mp3butler/Makefile
@@ -6,31 +6,25 @@
 #
 
 PORTNAME=	mp3butler
-PORTVERSION=	1.0.2
+PORTVERSION=	2.30
 CATEGORIES=	audio
-MASTER_SITES=	#
+MASTER_SITES=	http://iainlea.dyndns.org/software/${PORTNAME}/
 
-DEPRECATED=	"master site disappeared"
-EXPIRATION_DATE=2005-07-31
+MAINTAINER=	az@inec.ru
+COMMENT=	A program for renaming mp3 files and looking ID3 tags for it
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program for renaming mp3 files
+RUN_DEPENDS=	${SITE_PERL}/CDDB.pm:${PORTSDIR}/audio/p5-CDDB \
+		${SITE_PERL}/MP3/Tag.pm:${PORTSDIR}/audio/p5-MP3-Tag \
+	${SITE_PERL}/${PERL_ARCH}/MusicBrainz/Client.pm:${PORTSDIR}/audio/p5-MusicBrainz-Client
 
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
 USE_PERL5=	yes
 
-MAN1=		mp3butler.1
-
-do-build:
-	(cd ${WRKSRC} && ${SH} ./mkdocs)
+PLIST_FILES=	bin/mp3butler.pl bin/id3butler.pl
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mp3butler.pl ${PREFIX}/bin/mp3butler
-	${INSTALL_MAN} ${WRKSRC}/mp3butler.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-.for I in COPYING ChangeLog INSTALL RANT README
-	${MKDIR} ${PREFIX}/share/doc/mp3butler
-	${INSTALL_DATA} ${WRKSRC}/$I ${PREFIX}/share/doc/mp3butler
-.endfor
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/mp3butler.pl ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/id3butler.pl ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/audio/mp3butler/distinfo b/audio/mp3butler/distinfo
index dfc54b3425cb..f1f14f1a429e 100644
--- a/audio/mp3butler/distinfo
+++ b/audio/mp3butler/distinfo
@@ -1,2 +1,2 @@
-MD5 (mp3butler-1.0.2.tar.gz) = 8bcb260cb342b26e3557f5cadfe5a75f
-SIZE (mp3butler-1.0.2.tar.gz) = 13451
+MD5 (mp3butler-2.30.tar.gz) = 5d38ef9366d1c779b2a6597b6793d7ee
+SIZE (mp3butler-2.30.tar.gz) = 13571
diff --git a/audio/mp3butler/files/patch-aa b/audio/mp3butler/files/patch-aa
deleted file mode 100644
index 94f0d0e7f2ab..000000000000
--- a/audio/mp3butler/files/patch-aa
+++ /dev/null
@@ -1,8 +0,0 @@
---- mkdocs.orig	Mon Apr 30 15:10:33 2001
-+++ mkdocs	Mon Apr 30 15:10:39 2001
-@@ -4,5 +4,4 @@
- pod2text mp3butler.pl > mp3butler-manpage.txt
- echo creating mp3butler manual page: mp3butler.1.gz
- pod2man mp3butler.pl --center='BabblicaSoft Documentation' > mp3butler.1
--gzip mp3butler.1
- 
diff --git a/audio/mp3butler/pkg-descr b/audio/mp3butler/pkg-descr
index 98aa8d208470..4e5bc9a39555 100644
--- a/audio/mp3butler/pkg-descr
+++ b/audio/mp3butler/pkg-descr
@@ -1,9 +1,10 @@
-Mp3butler is a program written in perl for renaming your mp3's.
-
-	o It will remove all characters that require shell escapes from filenames
-	o It will remove capitalization from filenames
-	o It can create ID3 tags using the filename
-	o It can reorganize your mp3's into an organizational hierarchy 
+Mp3butler is a set of programs written in perl for renaming your mp3's.
 
+o It will remove all characters that require shell escapes from filenames
+o It will remove capitalization from filenames
+o It can create ID3 tags using the filename
+o It can reorganize your mp3's into an organizational hierarchy 
+o id3butler can also lookup tags for mp3 via MusicBrainz and FreeDB databases
+	
 - Christopher Preston
 rbg@gayteenresource.org
diff --git a/audio/mp3butler/pkg-plist b/audio/mp3butler/pkg-plist
deleted file mode 100644
index 2a9350b8829f..000000000000
--- a/audio/mp3butler/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/mp3butler
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/RANT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%