Index: audio/tagutil/Makefile
===================================================================
--- audio/tagutil/Makefile	(revision 346999)
+++ audio/tagutil/Makefile	(working copy)
@@ -1,26 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	tagutil
-PORTVERSION=	2.1
+PORTVERSION=	3.0
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://files.kaworu.ch/
+MASTER_SITES=	GH
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Tool to manage tags in music files
+MAINTAINER=	alex@kaworu.ch
+COMMENT=	Command line interface tool to manage tags in music files
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2014-03-10
+LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+USE_GITHUB=	yes
+GH_ACCOUNT=	kAworu
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	8e40bab
 
-USES=		pkgconfig
-NO_STAGE=	yes
-MAKE_ENV=	DESTDIR="${PREFIX}"
+USES=		pkgconfig cmake iconv
+PLIST_FILES=	bin/tagutil \
+				man/man1/tagutil.1.gz
 
-MAN1=		tagutil.1
-PLIST_FILES=	bin/tagutil
+CMAKE_ARGS=	-DMAN_PATH=${PREFIX}/man
+LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
 
-MANCOMPRESSED=	yes
+OPTIONS_DEFINE=	JSON
+OPTIONS_MULTI=	MEDIA
+OPTIONS_MULTI_MEDIA=	FLAC OGG TAGLIB
+OPTIONS_DEFAULT=	FLAC OGG TAGLIB
+TAGLIB_DESC=	Multiple file format but limited tags support
+JSON_DESC=	JSON output format support
 
+JSON_LIB_DEPENDS+=	libjansson.so:${PORTSDIR}/devel/jansson
+JSON_CMAKE_OFF+=	-DWITHOUT_JSON=yes
+FLAC_LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_CMAKE_OFF+=	-DWITHOUT_FLAC=yes
+OGG_LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+OGG_CMAKE_OFF+=	-DWITHOUT_OGGVORBIS=yes
+TAGLIB_LIB_DEPENDS+=	libtag_c.so:${PORTSDIR}/audio/taglib
+TAGLIB_CMAKE_OFF+=	-DWITHOUT_TAGLIB=yes
+
 .include <bsd.port.mk>
Index: audio/tagutil/distinfo
===================================================================
--- audio/tagutil/distinfo	(revision 346999)
+++ audio/tagutil/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (tagutil-2.1.tar.gz) = 47fd22e2454887b0c9aa832a59f569a08bf4ddbb3915a40b7218034917ddb61b
-SIZE (tagutil-2.1.tar.gz) = 18627
+SHA256 (tagutil-3.0.tar.gz) = 298ca121b8aa72bb95a70f433c69d8f83879f83ceae2b9f9145da1f94925f622
+SIZE (tagutil-3.0.tar.gz) = 52399
Index: audio/tagutil/pkg-descr
===================================================================
--- audio/tagutil/pkg-descr	(revision 346999)
+++ audio/tagutil/pkg-descr	(working copy)
@@ -1,4 +1,5 @@
-Tagutil is a pure C BSDL tool to manage tag information on music
-files. It can work with every format supported by taglib.
+Tagutil is a CLI tool to edit music file's tag. It aim to provide both an
+easy-to-script interface and ease of use interactively and fully support Vorbis
+Comments (unlimited set of tags).
 
-WWW: http://hg.kaworu.ch/tagutil/
+WWW: https://github.com/kAworu/tagutil