diff -uNr --exclude=CVS ../audio/tagtool/Makefile tagtool/Makefile
--- ../audio/tagtool/Makefile	Fri Apr 13 00:24:30 2007
+++ tagtool/Makefile	Tue May 29 09:14:25 2007
@@ -2,14 +2,14 @@
 
 COMMENT=	"Ogg Vorbis and MP3 files tagger"
 
-DISTNAME=	tagtool-0.12.2
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	tagtool-0.12.3
 CATEGORIES=	audio
 HOMEPAGE=	http://pwp.netcabo.pt/paol/tagtool/
 
 MAINTAINER=	Vlad Glagolev <stelzy@gmail.com>
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tagtool/}
+EXTRACT_SUFX=	.tar.bz2
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,9 +17,10 @@
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	X11 Xau Xdmcp Xrender atk-1.0 c m z stdc++ ogg fontconfig \
+WANTLIB=	X11 Xau Xdmcp Xrender Xcursor Xext Xfixes Xi Xinerama Xrandr \
+		atk-1.0 c m z stdc++ ogg fontconfig cairo xml2 \
 		freetype expat glib-2.0 gmodule-2.0 glitz png \
-		gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 cairo
+		gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
 
 MODULES=	devel/gettext
 
@@ -27,10 +28,9 @@
 
 LIB_DEPENDS=	id3.>=3.8::audio/id3lib \
 		vorbis.>=5.0::audio/libvorbis \
-		gtk-x11-2.0.>=0.14,gdk-x11-2.0.>=0.14,gdk_pixbuf-2.0.>=0.14::x11/gtk+2 \
+		gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0:gtk+2->=2.10:x11/gtk+2 \
 		glade-2.0.>=0.3::devel/libglade2 \
-		vorbisfile.>=4::audio/libvorbis \
-		xml2.>=9::textproc/libxml
+		vorbisfile.>=4::audio/libvorbis
 
 CONFIGURE_STYLE=gnu
 
@@ -41,3 +41,4 @@
 USE_X11=	Yes
 
 .include <bsd.port.mk>
+
diff -uNr --exclude=CVS ../audio/tagtool/distinfo tagtool/distinfo
--- ../audio/tagtool/distinfo	Thu Apr  5 19:37:44 2007
+++ tagtool/distinfo	Tue May 29 08:22:29 2007
@@ -1,5 +1,5 @@
-MD5 (tagtool-0.12.2.tar.gz) = TWiNu+fNigip+frvTRxbJw==
-RMD160 (tagtool-0.12.2.tar.gz) = ggySKDXixIUlbWT7yoDYzZd47WI=
-SHA1 (tagtool-0.12.2.tar.gz) = KPUCNWAK3RQLKOvyoaxU5KZ/r8k=
-SHA256 (tagtool-0.12.2.tar.gz) = xrOe2ObQsBmdNCI0XmhFoc7/od3VTMsUnxgT+fZC/z8=
-SIZE (tagtool-0.12.2.tar.gz) = 368758
+MD5 (tagtool-0.12.3.tar.bz2) = RHs6UF/uaKgvJdzak3e2dg==
+RMD160 (tagtool-0.12.3.tar.bz2) = n1riI1gJSMQDzUTYLs7w0DBA/wk=
+SHA1 (tagtool-0.12.3.tar.bz2) = 5+1Ov4+Ygc84sjQLGOlZR/ZYMI4=
+SHA256 (tagtool-0.12.3.tar.bz2) = Jz9BAx3SrYDAnRhl/ccdkFKDGlzpzYxTcFzFGKnT1BE=
+SIZE (tagtool-0.12.3.tar.bz2) = 303743
diff -uNr --exclude=CVS ../audio/tagtool/patches/patch-src_Makefile_in tagtool/patches/patch-src_Makefile_in
--- ../audio/tagtool/patches/patch-src_Makefile_in	Thu Jan  1 03:00:00 1970
+++ tagtool/patches/patch-src_Makefile_in	Tue May 29 09:23:50 2007
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Tue Feb 27 23:34:13 2007
++++ src/Makefile.in	Tue May 29 09:23:00 2007
+@@ -189,7 +189,7 @@
+ @ENABLE_VORBIS_FALSE@vorbis_cflags = 
+ @ENABLE_VORBIS_TRUE@vorbis_cflags = -DENABLE_VORBIS
+ 
+-tagtool_CFLAGS = -Wall -Wno-pointer-sign $(GTK_CFLAGS) ${mp3_cflags} 	\
++tagtool_CFLAGS = -Wall $(GTK_CFLAGS) ${mp3_cflags} 	\
+ 	${vorbis_cflags} -DDATADIR='"$(datadir)/${PACKAGE_NAME}"'
+ 
+ 
diff -uNr --exclude=CVS ../audio/tagtool/pkg/PLIST tagtool/pkg/PLIST
--- ../audio/tagtool/pkg/PLIST	Mon Dec 11 00:55:11 2006
+++ tagtool/pkg/PLIST	Tue May 29 08:44:12 2007
@@ -2,6 +2,14 @@
 bin/tagtool
 share/applications/
 share/applications/tagtool.desktop
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/TagTool.png
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/TagTool.svg
 share/locale/bg/LC_MESSAGES/tagtool.mo
 share/locale/cs/LC_MESSAGES/tagtool.mo
 share/locale/de/LC_MESSAGES/tagtool.mo
@@ -14,13 +22,15 @@
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/tagtool.mo
+share/locale/nl/LC_MESSAGES/tagtool.mo
+share/locale/pl/LC_MESSAGES/tagtool.mo
 share/locale/pt/LC_MESSAGES/tagtool.mo
+share/locale/pt_BR/LC_MESSAGES/tagtool.mo
 share/locale/ru/LC_MESSAGES/tagtool.mo
+share/locale/sv/LC_MESSAGES/tagtool.mo
 share/locale/ua/
 share/locale/ua/LC_MESSAGES/
 share/locale/ua/LC_MESSAGES/tagtool.mo
-share/pixmaps/
-share/pixmaps/TagTool.png
 share/tagtool/
 share/tagtool/TagTool.png
 share/tagtool/edit.png