- Update to version 2.0, licensed under GPLv3 now :-(

- Remove no longer applicable local patching
- Dependency on ticables2 is no longer optional, so remove OPTIONS
- Remove ABI version from LIB_DEPENDS to pacify portlint(1)
- Explain why dependency on GNU make is still required
- Update port description to match current state of affairs
- Relinquish to the pool due to lack of time

4 files changed, 91 insertions, 112 deletions

diff --git a/emulators/tilem/Makefile b/emulators/tilem/Makefile
index 619b7e9ac305..fe78ee619c4a 100644
--- a/emulators/tilem/Makefile
+++ b/emulators/tilem/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	TilEm
+# New ports collection makefile for:	TilEm (TI Linux Emulator)
 # Date created:				5 Sep 2006
 # Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
 #
@@ -6,43 +6,20 @@
 #
 
 PORTNAME=	tilem
-PORTVERSION=	0.973
-PORTREVISION=	7
+PORTVERSION=	2.0
 CATEGORIES=	emulators
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
+MASTER_SITES=	SF
 
-MAINTAINER=	danfe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An emulator for the Z80 series of Texas Instruments calculators
 
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	ticalcs2:${PORTSDIR}/comms/libticalcs2
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GMAKE=	yes	# parallel builds (-jX) are broken with BSD make(1)
 USE_GNOME=	gtk20
 
-OPTIONS=	TICABLES "Use ticables2 library for external linking" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_TICABLES)
-LIB_DEPENDS+=	ticables2.1:${PORTSDIR}/comms/libticables2
-.else
-CONFIGURE_ARGS+=	--without-ticables
-.endif
-
-post-extract:
-# Set more sane permissions for main executable
-	@${REINPLACE_CMD} -e 's,711,555,' \
-		${WRKSRC}/src/tilem/Makefile.in
-# Honor CFLAGS
-	@${REINPLACE_CMD} -e 's,CPPFLAGS) -O.,CPPFLAGS),' \
-		${WRKSRC}/src/tilem/Makefile.in
-	@${REINPLACE_CMD} -e 's,-Wall,${CFLAGS},' \
-		${WRKSRC}/src/utils/Makefile.in
-# Remove conflicting prototype
-	@${REINPLACE_CMD} '5,13d' ${WRKSRC}/src/tilem/core/dep/link.h
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/neosign ${WRKSRC}/bin/tcc \
-		${PREFIX}/bin
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/tilem/distinfo b/emulators/tilem/distinfo
index d64fe5ac846b..b4af6576cc57 100644
--- a/emulators/tilem/distinfo
+++ b/emulators/tilem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilem-0.973.tar.bz2) = e3b8efca3877260a6f81eb4be9d625c9596f9621ddfa01437d00f65e8c251029
-SIZE (tilem-0.973.tar.bz2) = 417554
+SHA256 (tilem-2.0.tar.bz2) = fc27235a402dfbee35a15a5aa7c9603211ffa5a1f8b1716310ce8f0b7f4743ad
+SIZE (tilem-2.0.tar.bz2) = 2445757
diff --git a/emulators/tilem/pkg-descr b/emulators/tilem/pkg-descr
index 1f60e493f3ae..3bb28fc64fc5 100644
--- a/emulators/tilem/pkg-descr
+++ b/emulators/tilem/pkg-descr
@@ -1,13 +1,14 @@
-TilEm is an emulator for the Z80 series of Texas Instruments graphing
-calculators.  It currently features:
+TilEm is Gtk+ based emulator for the Z80 series of Texas Instruments graphing
+calculators.  It currently features and supports:
 
-    * All Z80 TI calculators (73, 82, 83, 83+, 83+ SE, 84+, 84+ SE, 85,
-      and 86) except the TI-81, and all known ROM/OS versions
-    * Automatic certificate patching for dumped 73/83+/84+ ROMs
-    * Flash writing and erasing
-    * Application and OS loading
-    * Built-in debugger
-    * Flexible keyboard handling
-    * Much more!
+  - All Z80 TI calculators (73, 76, 81, 82, 83/+/+SE, 84/+/+SE, 85, and 86)
+    with all known ROM/OS versions, and attempts to reproduce the behavior
+    of the original calculator hardware as faithfully as possible
+  - Grabbing screenshots and recording GIFs (w/animations)
+  - Built-in fully featured debugger
+  - Virtual linking (through libticables)
+  - Flash writing and erasing
+  - Application and OS loading
+  - Scripting using macros
 
 WWW: http://lpg.ticalc.org/prj_tilem/
diff --git a/emulators/tilem/pkg-plist b/emulators/tilem/pkg-plist
index 8015e67fa5f3..81a71000b271 100644
--- a/emulators/tilem/pkg-plist
+++ b/emulators/tilem/pkg-plist
@@ -1,67 +1,68 @@
-bin/neosign
-bin/tcc
-bin/tilem
-%%DATADIR%%/data/x2syms
-%%DATADIR%%/data/x3keys
-%%DATADIR%%/data/x3syms
-%%DATADIR%%/data/x5syms
-%%DATADIR%%/data/x6keys
-%%DATADIR%%/data/x6syms
-%%DATADIR%%/data/x7keys
-%%DATADIR%%/data/x7syms
-%%DATADIR%%/data/xpsyms
-@dirrm %%DATADIR%%/data
-%%DATADIR%%/pixmaps/bpx.xpm
-%%DATADIR%%/pixmaps/clear.xpm
-%%DATADIR%%/pixmaps/norm.xpm
-%%DATADIR%%/pixmaps/pc.xpm
-%%DATADIR%%/pixmaps/pc_ignored.xpm
-%%DATADIR%%/pixmaps/pc_taken.xpm
-%%DATADIR%%/pixmaps/pcbpx.xpm
-%%DATADIR%%/pixmaps/pcx_i.xpm
-%%DATADIR%%/pixmaps/pcx_t.xpm
-%%DATADIR%%/pixmaps/run.xpm
-%%DATADIR%%/pixmaps/setbpx.xpm
-%%DATADIR%%/pixmaps/step.xpm
-%%DATADIR%%/pixmaps/stepovr.xpm
-%%DATADIR%%/pixmaps/tilem.bin
-%%DATADIR%%/pixmaps/tracebk.xpm
-%%DATADIR%%/pixmaps/tracefwd.xpm
-%%DATADIR%%/pixmaps/x2_bot.jpg
-%%DATADIR%%/pixmaps/x2_left.jpg
-%%DATADIR%%/pixmaps/x2_right.jpg
-%%DATADIR%%/pixmaps/x2_top.jpg
-%%DATADIR%%/pixmaps/x3_bot.jpg
-%%DATADIR%%/pixmaps/x3_left.jpg
-%%DATADIR%%/pixmaps/x3_right.jpg
-%%DATADIR%%/pixmaps/x3_top.jpg
-%%DATADIR%%/pixmaps/x4_bot.jpg
-%%DATADIR%%/pixmaps/x4_left.jpg
-%%DATADIR%%/pixmaps/x4_right.jpg
-%%DATADIR%%/pixmaps/x4_top.jpg
-%%DATADIR%%/pixmaps/x5_bot.jpg
-%%DATADIR%%/pixmaps/x5_left.jpg
-%%DATADIR%%/pixmaps/x5_right.jpg
-%%DATADIR%%/pixmaps/x5_top.jpg
-%%DATADIR%%/pixmaps/x6_bot.jpg
-%%DATADIR%%/pixmaps/x6_left.jpg
-%%DATADIR%%/pixmaps/x6_right.jpg
-%%DATADIR%%/pixmaps/x6_top.jpg
-%%DATADIR%%/pixmaps/x7_bot.jpg
-%%DATADIR%%/pixmaps/x7_left.jpg
-%%DATADIR%%/pixmaps/x7_right.jpg
-%%DATADIR%%/pixmaps/x7_top.jpg
-%%DATADIR%%/pixmaps/xp_bot.jpg
-%%DATADIR%%/pixmaps/xp_left.jpg
-%%DATADIR%%/pixmaps/xp_right.jpg
-%%DATADIR%%/pixmaps/xp_top.jpg
-%%DATADIR%%/pixmaps/xs_bot.jpg
-%%DATADIR%%/pixmaps/xs_left.jpg
-%%DATADIR%%/pixmaps/xs_right.jpg
-%%DATADIR%%/pixmaps/xs_top.jpg
-%%DATADIR%%/pixmaps/xz_bot.jpg
-%%DATADIR%%/pixmaps/xz_left.jpg
-%%DATADIR%%/pixmaps/xz_right.jpg
-%%DATADIR%%/pixmaps/xz_top.jpg
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%
+bin/tilem2
+share/applications/tilem2.desktop
+share/icons/hicolor/16x16/apps/tilem.png
+share/icons/hicolor/22x22/apps/tilem.png
+share/icons/hicolor/24x24/apps/tilem.png
+share/icons/hicolor/32x32/apps/tilem.png
+share/icons/hicolor/48x48/apps/tilem.png
+share/mime/application/x-ti73-app.xml
+share/mime/application/x-ti73-backup.xml
+share/mime/application/x-ti73-os.xml
+share/mime/application/x-ti73-program.xml
+share/mime/application/x-ti73-variables.xml
+share/mime/application/x-ti81-program.xml
+share/mime/application/x-ti82-backup.xml
+share/mime/application/x-ti82-program.xml
+share/mime/application/x-ti82-variables.xml
+share/mime/application/x-ti83-backup.xml
+share/mime/application/x-ti83-program.xml
+share/mime/application/x-ti83-variables.xml
+share/mime/application/x-ti83plus-app.xml
+share/mime/application/x-ti83plus-os.xml
+share/mime/application/x-ti83plus-program.xml
+share/mime/application/x-ti83plus-variables.xml
+share/mime/application/x-ti85-backup.xml
+share/mime/application/x-ti85-program.xml
+share/mime/application/x-ti85-variables.xml
+share/mime/application/x-ti86-backup.xml
+share/mime/application/x-ti86-program.xml
+share/mime/application/x-ti86-variables.xml
+share/mime/application/x-tigroup.xml
+share/mime/packages/tilem2.xml
+share/tilem2/icons/hicolor/16x16/actions/tilem-db-finish.png
+share/tilem2/icons/hicolor/16x16/actions/tilem-db-step-over.png
+share/tilem2/icons/hicolor/16x16/actions/tilem-db-step.png
+share/tilem2/icons/hicolor/16x16/status/tilem-disasm-break-pc.png
+share/tilem2/icons/hicolor/16x16/status/tilem-disasm-break.png
+share/tilem2/icons/hicolor/16x16/status/tilem-disasm-pc.png
+share/tilem2/icons/hicolor/24x24/actions/tilem-db-finish.png
+share/tilem2/icons/hicolor/24x24/actions/tilem-db-step-over.png
+share/tilem2/icons/hicolor/24x24/actions/tilem-db-step.png
+share/tilem2/icons/hicolor/index.theme
+share/tilem2/keybindings.ini
+share/tilem2/skins/ti76.skn
+share/tilem2/skins/ti81.skn
+share/tilem2/skins/ti82.skn
+share/tilem2/skins/ti82stats.skn
+share/tilem2/skins/ti83.skn
+share/tilem2/skins/ti83p.skn
+share/tilem2/skins/ti83pfr.skn
+share/tilem2/skins/ti84p.skn
+share/tilem2/skins/ti84p2.skn
+share/tilem2/skins/ti86.skn
+share/tilem2/symbols/ti82.sym
+share/tilem2/symbols/ti83.sym
+share/tilem2/symbols/ti83p.sym
+share/tilem2/symbols/ti85.sym
+share/tilem2/symbols/ti86.sym
+@dirrm share/tilem2/symbols
+@dirrm share/tilem2/skins
+@dirrm share/tilem2/icons/hicolor/24x24/actions
+@dirrm share/tilem2/icons/hicolor/24x24
+@dirrm share/tilem2/icons/hicolor/16x16/status
+@dirrm share/tilem2/icons/hicolor/16x16/actions
+@dirrm share/tilem2/icons/hicolor/16x16
+@dirrm share/tilem2/icons/hicolor
+@dirrm share/tilem2/icons
+@dirrm share/tilem2
+@dirrmtry share/applications