diff -urN /usr/ports/audio/etktab/Makefile audio/etktab/Makefile
--- /usr/ports/audio/etktab/Makefile	2011-02-27 04:58:52.000000000 +0900
+++ audio/etktab/Makefile	2011-07-22 00:46:36.000000000 +0900
@@ -7,34 +7,40 @@
 
 PORTNAME=	etktab
 PORTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio tcl tk
-MASTER_SITES=	SF/${PORTNAME}/eTktab/${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} canada_multi-3.2.etk \
-			dvorak-3.2.etk uk-3.2.etk us-3.2.etk
+MASTER_SITES=	SF/${PORTNAME}/eTktab/${PORTVERSION} \
+		SF/${PORTNAME}/keyboard%20layout%20support/${PORTVERSION}:keyboard
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT
+.if !defined(NOPORTDOCS)
+DISTFILES+=	canada_multi-3.2.etk:keyboard \
+		dvorak-3.2.etk:keyboard \
+		uk-3.2.etk:keyboard \
+		us-3.2.etk:keyboard
+.endif
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Guitar tablature editor
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/eTktab-${PORTVERSION}
 
+USE_TK_WRAPPER=	yes
+
 post-extract:
 .for FILE in canada_multi-3.2.etk dvorak-3.2.etk uk-3.2.etk us-3.2.etk
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${FILE} ${WRKSRC}
 .endfor
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/eTktab ${PREFIX}/bin/etktab
+	${INSTALL_SCRIPT} ${WRKSRC}/eTktab ${PREFIX}/bin/etktab
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in CHANGES.html LICENSE.html README.html eTktab-small.xpm eTktab.xpm \
 		canada_multi-3.2.etk dvorak-3.2.etk uk-3.2.etk us-3.2.etk
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 .endif
 
diff -urN /usr/ports/audio/etktab/files/patch-aa audio/etktab/files/patch-aa
--- /usr/ports/audio/etktab/files/patch-aa	2003-09-01 07:32:14.000000000 +0900
+++ audio/etktab/files/patch-aa	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- eTktab	Tue Jul 22 00:53:46 2003
-+++ eTktab	Mon Jul 28 23:44:45 2003
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # This line makes the next one a comment in Tcl \
--exec wish "$0" -- ${1+"$@"}
-+exec wish8.4 "$0" -- ${1+"$@"}
- 
- # eTKTab by Jason Sonnenschein jes_jm@yahoo.com
- # based on: