5 files changed, 45 insertions, 20 deletions

diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index d7a02960e723..55343d8eca87 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -6,23 +6,42 @@
 #
 
 PORTNAME=	mp3info
-PORTVERSION=	0.2.16
+PORTVERSION=	0.8.4
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		ftp://bimbo.hive.no/pub/mp3info/
-MASTER_SITE_SUBDIR=	apps/sound/editors
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	apps/sound/mp3-utils/mp3info
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	petef@databits.net
 
-GNU_CONFIGURE=	yes
+WANT_GTK=	yes
 
 MAN1=		mp3info.1
 
-post-install:
+.include <bsd.port.pre.mk>
+
+ALL_TARGET=	doc mp3info
+
+.if defined(HAVE_GTK)
+ALL_TARGET+=	gmp3info
+PLIST_SUB+=	WITH_GTK=""
+.else
+PLIST_SUB+=	WITH_GTK="@comment "
+.endif
+
+MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}"
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/mp3info ${PREFIX}/bin
+.if defined(HAVE_GTK)
+	${INSTALL_PROGRAM} ${WRKSRC}/gmp3info ${PREFIX}/bin
+.endif
+	${INSTALL_MAN} ${WRKSRC}/mp3info.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/mp3info
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/mp3info
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mp3info
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/mp3info.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/mp3info/distinfo b/audio/mp3info/distinfo
index 67b68aa2b132..08095e0a675a 100644
--- a/audio/mp3info/distinfo
+++ b/audio/mp3info/distinfo
@@ -1 +1 @@
-MD5 (mp3info-0.2.16.tar.gz) = d67b0225a197e91da87e94707121bb21
+MD5 (mp3info-0.8.4.tgz) = 879d0ced8ede5ec9fbaff4813851ea3f
diff --git a/audio/mp3info/pkg-comment b/audio/mp3info/pkg-comment
index e8874952edb3..d569d2590080 100644
--- a/audio/mp3info/pkg-comment
+++ b/audio/mp3info/pkg-comment
@@ -1 +1 @@
-MP3 information tool
+Tool to manipulate ID3 tags for MP3 files
diff --git a/audio/mp3info/pkg-descr b/audio/mp3info/pkg-descr
index 3013efe235ed..00ec9397a19c 100644
--- a/audio/mp3info/pkg-descr
+++ b/audio/mp3info/pkg-descr
@@ -1,8 +1,12 @@
-A small utility to read and write TAG info, as well as retrieve the MP3
-Header info and print it all out in a nice format.
+A small utility to read and write ID3 tags, as well as retrieve and display
+the MP3 header information.
 
-Features:
- - Get, Set and Wipe MP3 TAG Info.
- - Get MPEG Audio Version 1, 2 and 2.5 Header info.
- - User-definable output formatting (rather advanced).
- - Can rename files according to user-defined scheme.
+Some features include:
+* Get, set and wipe ID3 tags
+* User-definable output formatting
+* Rename files according to a user-defined scheme
+
+WWW: http://ibiblio.org/mp3info/
+
+- Pete
+petef@databits.net
diff --git a/audio/mp3info/pkg-plist b/audio/mp3info/pkg-plist
index 4a79cd46840a..0f92b1e7637f 100644
--- a/audio/mp3info/pkg-plist
+++ b/audio/mp3info/pkg-plist
@@ -1,4 +1,6 @@
 bin/mp3info
+%%WITH_GTK%%bin/gmp3info
 %%PORTDOCS%%share/doc/mp3info/ChangeLog
 %%PORTDOCS%%share/doc/mp3info/README
+%%PORTDOCS%%share/doc/mp3info/mp3info.txt
 %%PORTDOCS%%@dirrm share/doc/mp3info