Index: head/audio/timidity/Makefile
===================================================================
--- head/audio/timidity/Makefile	(revision 425204)
+++ head/audio/timidity/Makefile	(revision 425205)
@@ -1,57 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	timidity
 PORTVERSION=	0.2i
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES+=	http://www.onicos.com/staff/iz/timidity/dist/:timidity
 DISTFILES+=	${DISTNAME}.tar.gz:timidity
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIDI to PCM software synthesizer
 
-CONFLICTS=	timidity++-2.*
-
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+CONFLICTS_INSTALL=	timidity++-2.*
+
 USES=		alias ncurses
-TIINS=		goemon.tgz
 INSTALL_TARGET=	install.all
 
-OPTIONS_DEFINE=	GUSPAT
-GUSPAT_DESC=	Use audio/guspat instead of included sound fonts (goemon)
+OPTIONS_SINGLE=	FONTS
+OPTIONS_SINGLE_FONTS=	GOEMON GUSPAT
+OPTIONS_DEFAULT=GOEMON
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+FONTS_DESC=		Default sound fonts
 
-# Set up sound fonts from audio/guspat.
-.if ${PORT_OPTIONS:MGUSPAT}
-RUN_DEPENDS+=	${LOCALBASE}/share/guspat/power.cfg:audio/guspat
-TDIR=		${LOCALBASE}/share/timidity
-TCONFIG=	timidity.cfg-guspat
-PLIST_SUB+=	GOEMON="@comment "
-.else
-# Set up default sound fonts (goemon).
-MASTER_SITES+=	http://www.anime.net/~goemon/timidity/:tiins
-DISTFILES+=	${TIINS}:tiins
-TDIR=		${PREFIX}/lib/timidity
-TCONFIG=	goemon.cfg
-PLIST_SUB+=	GOEMON=""
-.endif
+GUSPAT_DESC=		Use from audio/guspat port
+GUSPAT_RUN_DEPENDS=	${LOCALBASE}/share/guspat/power.cfg:audio/guspat
+GUSPAT_VARS=		TDIR="${LOCALBASE}/share/timidity" \
+			TCONFIG=timidity.cfg-guspat
 
+GOEMON_DESC=		Bundle from Goemon's patchkit #'
+GOEMON_MASTER_SITES=	http://www.anime.net/~goemon/timidity/:tiins
+GOEMON_DISTFILES=	goemon.tgz:tiins
+GOEMON_VARS=		TDIR="${PREFIX}/lib/timidity" \
+			TCONFIG=goemon.cfg
+
 post-patch:
 	${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \
 		${WRKSRC}/linux_a.c
 	${REINPLACE_CMD} -e 's|%%TDIR%%|${TDIR}| ; s|%%TCONFIG%%|${TCONFIG}|' \
 		${WRKSRC}/timidity.cfg
 
-post-install:
-.if ! ${PORT_OPTIONS:MGUSPAT}
-	cd ${STAGEDIR}${PREFIX}/lib/timidity && \
-	${TAR} --no-same-owner --no-same-permissions -zxf ${DISTDIR}/${TIINS} && \
-	${REINPLACE_CMD} -i "" -e 's,dir goemon,dir ${PREFIX}/lib/timidity/goemon,' \
-		goemon.cfg
-.endif
+post-patch-GOEMON-on:
+	${REINPLACE_CMD} -i '' -e '/^dir/s,goemon,${TDIR}/&,' \
+		${WRKDIR}/${TCONFIG}
+
+post-install-GOEMON-on:
+	(cd ${WRKDIR} && ${COPYTREE_SHARE} "goemon*" ${STAGEDIR}${TDIR})
 
 .include <bsd.port.mk>