Index: head/emulators/frodo/Makefile
===================================================================
--- head/emulators/frodo/Makefile	(revision 453336)
+++ head/emulators/frodo/Makefile	(revision 453337)
@@ -1,60 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	frodo
 PORTVERSION=	4.1b
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	emulators tk
 MASTER_SITES=	http://frodo.cebix.net/downloads/
 DISTNAME=	FrodoV4_1b.Src
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Emulates a Commodore 64
 
-DEPRECATED=		Tcl/Tk 8.4 is no longer maintained, please use 8.5+
-EXPIRATION_DATE=	2017-11-20
-
-RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
-
+USES=		shebangfix tk:run
 USE_XORG=	x11 xt xext sm ice
 ALL_TARGET=	Frodo
 INSTALL_WRKSRC=	${WRKDIR}/Frodo-4.1b
 WRKSRC=		${INSTALL_WRKSRC}/Src
 GNU_CONFIGURE=	yes
+SHEBANG_FILES=	../TkGui.tcl
 
 ROM=		1541 Basic Char Kernal
 
 OPTIONS_DEFINE=	SDL DOCS
 OPTIONS_DEFAULT=SDL
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		${INSTALL_WRKSRC}/TkGui.tcl
+pre-configure:
+	${REINPLACE_CMD} -e 's|wish|wish${TK_VER}|' \
+		${WRKSRC}/C64_x.i
 
 do-install:
 	${SED} -e 's=\$${PREFIX}=${PREFIX}=g' \
 		 < ${FILESDIR}/frodo > ${WRKDIR}/frodo
 	${INSTALL_SCRIPT} ${WRKDIR}/frodo ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/frodo
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/Frodo ${STAGEDIR}${PREFIX}/libexec/frodo/
 .for i in ${ROM}
 	${INSTALL_DATA} "${INSTALL_WRKSRC}/${i} ROM" ${STAGEDIR}${PREFIX}/libexec/frodo/
 .endfor
 	${INSTALL_DATA} "${INSTALL_WRKSRC}/Frodo Logo" ${STAGEDIR}${PREFIX}/libexec/frodo/
 	${INSTALL_SCRIPT} "${INSTALL_WRKSRC}/TkGui.tcl" ${STAGEDIR}${PREFIX}/libexec/frodo/
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/frodo/64prgs
 	${TAR} -C ${INSTALL_WRKSRC}/64prgs -cf - . | \
 		${TAR} -C ${STAGEDIR}${PREFIX}/libexec/frodo/64prgs -xf -
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}/
 	${TAR} -C ${INSTALL_WRKSRC}/Docs -cf - . | \
 		${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -
 
 .include <bsd.port.mk>
Index: head/emulators/frodo/files/patch-TkGui.tcl
===================================================================
--- head/emulators/frodo/files/patch-TkGui.tcl	(revision 453336)
+++ head/emulators/frodo/files/patch-TkGui.tcl	(nonexistent)
@@ -1,8 +0,0 @@
---- ../TkGui.tcl.orig	2001-05-30 17:03:47 UTC
-+++ ../TkGui.tcl
-@@ -1,4 +1,4 @@
--#!/usr/bin/wish
-+#!%%LOCALBASE%%/bin/wish8.4 -f
- 
- # Frodo Tk GUI by Lutz Vieweg <lkv@mania.robin.de>
- # requires Tk >= 4.1

Property changes on: head/emulators/frodo/files/patch-TkGui.tcl
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/emulators/frodo/files/patch-C64_x.i
===================================================================
--- head/emulators/frodo/files/patch-C64_x.i	(revision 453336)
+++ head/emulators/frodo/files/patch-C64_x.i	(nonexistent)
@@ -1,11 +0,0 @@
---- C64_x.i.orig	2002-01-02 21:16:45 UTC
-+++ C64_x.i
-@@ -100,7 +100,7 @@ void C64::c64_ctor1(void)
- 	gui = 0;
- #else
- 	// try to start up Tk gui.
--	gui = new CmdPipe("wish", "TkGui.tcl");
-+	gui = new CmdPipe("wish8.4", "TkGui.tcl");
- 	if (gui) {
- 		if (gui->fail) {
- 			delete gui; gui = 0;

Property changes on: head/emulators/frodo/files/patch-C64_x.i
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property