--- audio/solfege/Makefile	Sat Dec  2 13:38:12 2006
+++ audio/solfege/Makefile	Wed Dec 13 03:36:03 2006
@@ -7,7 +7,7 @@ 
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.6.3
+PORTVERSION=	3.6.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,18 +16,15 @@ 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free eartraining software
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		swig:${PORTSDIR}/devel/swig13 \
-		${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl
 
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix pygnomeextras
+USE_GNOME=	gnomehack gnomeprefix libxslt pygtk2
+WANT_GNOME=	yes
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 \
-		ac_cv_path_XML2PO=""
+CONFIGURE_ENV=	ac_cv_path_XML2PO=""
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
 		--disable-oss-sound \
 		--enable-docbook-stylesheet=${STYLESHEET}
@@ -37,6 +34,12 @@ 
 
 STYLESHEET=	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl
 
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mpygnomeextras}!=""
+USE_GNOME+=	pygnomeextras
+.endif
+
 .if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
 		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
@@ -58,4 +61,4 @@ 
 	@${REINPLACE_CMD} -e 's|(datadir)/locale|(prefix)/share/locale|g' \
 		${WRKSRC}/po/Makefile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- audio/solfege/distinfo	Sat Dec  2 13:38:12 2006
+++ audio/solfege/distinfo	Wed Dec 13 03:10:41 2006
@@ -1,3 +1,3 @@ 
-MD5 (solfege-3.6.3.tar.gz) = 25ea654db20eaedaefb834c591370df5
-SHA256 (solfege-3.6.3.tar.gz) = 32203bc9b8e75162f2a1098d05e8fe00607544903b13f94024008ab508fbc508
-SIZE (solfege-3.6.3.tar.gz) = 2137050
+MD5 (solfege-3.6.4.tar.gz) = 71401b22158410d95595c308c6fee714
+SHA256 (solfege-3.6.4.tar.gz) = 169d76f856a9efe0d247e6ff79a99ac89b0a61e5724a09a58263171a049b3aa1
+SIZE (solfege-3.6.4.tar.gz) = 2142795