diff -ruN gmm-0.9.12/Makefile gmm/Makefile
--- gmm-0.9.12/Makefile	2008-06-28 16:52:52.000000000 +0200
+++ gmm/Makefile	2008-08-14 14:10:31.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmm
-PORTVERSION=	0.9.12
+PORTVERSION=	0.9.15
 CATEGORIES=	audio
 MASTER_SITES=	http://gogglesmm.googlecode.com/files/
 DISTNAME=	musicmanager-${PORTVERSION}
@@ -23,10 +23,11 @@
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
+WANT_GNOME=	yes
 
 PORTDOCS=	README AUTHORS
 PLIST_FILES=	bin/gmm                         \
-		share/pixmaps/gmm.png
+		share/icons/hicolor/48x48/apps/gmm.png
 
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 CONFIGURE_ENV=	OPT_CFLAGS=" "
@@ -37,15 +38,27 @@
 CONFIGURE_ARGS+=--without-new-remote
 .endif
 
-.if defined(WITH_DBUS)
+.if !defined(WITHOUT_DBUS)
 CONFIGURE_ARGS+=--with-dbus
 LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
 .endif
 
+.if !defined(WITHOUT_TRAYICON)
+USE_XLIB=	yes
+USE_GNOME=	gtk20
+PLIST_FILES+=	bin/gmm-tray \
+		share/icons/hicolor/24x24/apps/gmm-tray.png \
+		share/icons/hicolor/48x48/apps/gmm-tray.png
+.endif
+
 post-extract:
 	${REINPLACE_CMD} -i '' -e "s|/bin/bash|${PREFIX}/bin/bash|" \
 		${WRKSRC}/configure
 
+post-configure:
+	${REINPLACE_CMD} -i '' -e 's|-D -m|-m|' \
+		${WRKSRC}/Makefile
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -53,6 +66,5 @@
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 . endfor
 .endif
-	${INSTALL_DATA} ${WRKSRC}/extra/gmm.png ${PREFIX}/share/pixmaps
 
 .include <bsd.port.post.mk>
diff -ruN gmm-0.9.12/distinfo gmm/distinfo
--- gmm-0.9.12/distinfo	2008-06-28 16:52:52.000000000 +0200
+++ gmm/distinfo	2008-08-14 13:08:31.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (musicmanager-0.9.12.tar.bz2) = 3500a9f59f26fea753d8f03721448c37
-SHA256 (musicmanager-0.9.12.tar.bz2) = b472243e8298abfda2c4e5ee10de315a13e6b5e634c5c39489378219d9c38c73
-SIZE (musicmanager-0.9.12.tar.bz2) = 268334
+MD5 (musicmanager-0.9.15.tar.bz2) = 8dabda9acc1e45859081d66ab032ed19
+SHA256 (musicmanager-0.9.15.tar.bz2) = e6deccad4d28652c119814367d9facecd253eff02f489669e010f11da2973b86
+SIZE (musicmanager-0.9.15.tar.bz2) = 282202