diff -urN /usr/ports/audio/gtkguitune/Makefile audio/gtkguitune/Makefile
--- /usr/ports/audio/gtkguitune/Makefile	2008-08-07 15:10:23.000000000 +0900
+++ audio/gtkguitune/Makefile	2009-10-13 02:01:27.000000000 +0900
@@ -6,18 +6,30 @@
 #
 
 PORTNAME=	gtkguitune
-PORTVERSION=	0.7
-PORTREVISION=	3
+PORTVERSION=	0.8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/harpin_floh/mysoft/
+DISTNAME=	${PORTNAME}-gtk2-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A guitar (and other instruments) tuner for GTK
 
-LIB_DEPENDS=	gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12
+LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+
+PLIST_FILES=	bin/${PORTNAME} \
+		share/icons/hicolor/scalable/apps/guitune_logo.svg
 
-PLIST_FILES=	bin/gtkguitune
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|VERSION=0.7|VERSION=${PORTVERSION}|g' ${WRKSRC}/configure
+.for file in guitune.cc main.cc
+	@${REINPLACE_CMD} -e \
+		's|<linux/soundcard.h>|<sys/soundcard.h>|' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff -urN /usr/ports/audio/gtkguitune/distinfo audio/gtkguitune/distinfo
--- /usr/ports/audio/gtkguitune/distinfo	2006-01-22 17:12:45.000000000 +0900
+++ audio/gtkguitune/distinfo	2009-10-13 01:31:12.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (gtkguitune-0.7.tar.gz) = 1fa82bf4034b45750c831902a1a96bdf
-SHA256 (gtkguitune-0.7.tar.gz) = a2816ab63d85c86d2e352ec2c2d3b4cb6d607f7593798533da0993bfb2db5bf3
-SIZE (gtkguitune-0.7.tar.gz) = 54992
+MD5 (gtkguitune-gtk2-0.8.tar.gz) = aeed6895e76af1fd0bce500fbe3e492a
+SHA256 (gtkguitune-gtk2-0.8.tar.gz) = be0e8a8b8085498201d3674a1a719d4841a4f79cd7bcff3e14fec83512c30849
+SIZE (gtkguitune-gtk2-0.8.tar.gz) = 660808
diff -urN /usr/ports/audio/gtkguitune/files/patch-guitune.cc audio/gtkguitune/files/patch-guitune.cc
--- /usr/ports/audio/gtkguitune/files/patch-guitune.cc	2005-02-13 08:25:03.000000000 +0900
+++ audio/gtkguitune/files/patch-guitune.cc	1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
---- guitune.cc.orig	Sat Feb 12 11:14:56 2005
-+++ guitune.cc	Sat Feb 12 11:15:02 2005
-@@ -24,7 +24,11 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#ifdef __linux__
- #include <linux/soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#endif
- 
- #include <gtk--/main.h>
- #include <gtk--/box.h>
diff -urN /usr/ports/audio/gtkguitune/files/patch-main.cc audio/gtkguitune/files/patch-main.cc
--- /usr/ports/audio/gtkguitune/files/patch-main.cc	2005-02-13 08:25:03.000000000 +0900
+++ audio/gtkguitune/files/patch-main.cc	1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
---- main.cc.orig	Sat May 31 16:31:12 2003
-+++ main.cc	Sat Feb 12 11:22:19 2005
-@@ -24,7 +24,11 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
-+#ifdef __linux__
- #include <linux/soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#endif
- 
- #include <gtk/gtk.h>
- #include <gtk--/window.h>