From owner-svn-ports-head@freebsd.org  Thu Nov  2 06:07:07 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B3D4E509A9;
 Thu,  2 Nov 2017 06:07:07 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 081CC6EC28;
 Thu,  2 Nov 2017 06:07:06 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA2676KC046121;
 Thu, 2 Nov 2017 06:07:06 GMT (envelope-from dinoex@FreeBSD.org)
Received: (from dinoex@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA2676FB046120;
 Thu, 2 Nov 2017 06:07:06 GMT (envelope-from dinoex@FreeBSD.org)
Message-Id: <201711020607.vA2676FB046120@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dinoex set sender to
 dinoex@FreeBSD.org using -f
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 2 Nov 2017 06:07:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r453337 - in head/emulators/frodo: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: dinoex
X-SVN-Commit-Paths: in head/emulators/frodo: . files
X-SVN-Commit-Revision: 453337
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Nov 2017 06:07:07 -0000

Author: dinoex
Date: Thu Nov  2 06:07:06 2017
New Revision: 453337
URL: https://svnweb.freebsd.org/changeset/ports/453337

Log:
  - migration to tk86

Deleted:
  head/emulators/frodo/files/patch-C64_x.i
  head/emulators/frodo/files/patch-TkGui.tcl
Modified:
  head/emulators/frodo/Makefile

Modified: head/emulators/frodo/Makefile
==============================================================================
--- head/emulators/frodo/Makefile	Thu Nov  2 05:29:33 2017	(r453336)
+++ head/emulators/frodo/Makefile	Thu Nov  2 06:07:06 2017	(r453337)
@@ -2,7 +2,7 @@
 
 PORTNAME=	frodo
 PORTVERSION=	4.1b
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	emulators tk
 MASTER_SITES=	http://frodo.cebix.net/downloads/
 DISTNAME=	FrodoV4_1b.Src
@@ -10,16 +10,13 @@ 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
 
@@ -32,9 +29,9 @@ OPTIONS_DEFAULT=SDL
 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' \