6 files changed, 158 insertions, 133 deletions

diff --git a/games/scid/Makefile b/games/scid/Makefile
index 69720c6d9a70..19abdabbc48f 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	scid
-PORTVERSION=	4.6.4
-PORTREVISION=	1
+PORTVERSION=	4.7.0
+DISTVERSIONPREFIX=	code-
 CATEGORIES=	games databases
-MASTER_SITES=	SF/${PORTNAME}/Scid/Scid%204.6/
+MASTER_SITES=	SF/${PORTNAME}/Scid/Scid%204.7/
 
 MAINTAINER=	bsd@volki.at
 COMMENT=	Free chess database application
@@ -13,33 +13,30 @@ COMMENT=	Free chess database application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-HAS_CONFIGURE=	yes
 USES=		gmake python shebangfix tk zip
-SHEBANG_FILES=	tcl/lang/checklangs.tcl \
-		tcl/lang/propagatelang.tcl \
-		tcl/lang/removetoken.tcl \
-		scripts/eco2pgn.py \
-		scripts/pgnfix.py \
-		scripts/twic2scid.py
+SHEBANG_FILES=	scripts/eco2pgn.py scripts/pgnfix.py scripts/twic2scid.py \
+		tcl/lang/checklangs.tcl tcl/lang/propagatelang.tcl \
+		tcl/lang/removetoken.tcl
 
 TCL_LIBRARY=	-L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER}
 
+HAS_CONFIGURE=	yes
 CONFIGURE_CMD=	${TCLSH} ${CONFIGURE_SCRIPT}
-CONFIGURE_ARGS=	\
-    BINDIR="${PREFIX}/bin" \
-    SHAREDIR="${PREFIX}/share/scid" \
-    THREADS="-pthread" \
-    TCL_VERSION="${TCL_VER}" \
-    TCL_INCLUDE="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" \
-    TCL_LIBRARY="${TCL_LIBRARY}" \
-    TK_LIBRARY="${TCL_LIBRARY} -ltk${TK_SHLIB_VER} -lX11" \
-    OPTIMIZE="${CXXFLAGS} -fno-rtti -fno-exceptions" \
-    WARNINGS=""
+CONFIGURE_ARGS=	BINDIR="${PREFIX}/bin" \
+		OPTIMIZE="${CXXFLAGS} -fno-rtti -fno-exceptions" \
+		SHAREDIR="${PREFIX}/share/scid" \
+		TCL_INCLUDE="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" \
+		TCL_LIBRARY="${TCL_LIBRARY}" \
+		TCL_VERSION="${TCL_VER}" \
+		THREADS="-pthread" \
+		TK_LIBRARY="${TCL_LIBRARY} -ltk${TK_SHLIB_VER} -lX11" \
+		WARNINGS=""
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|g++|${CXX}|g; s|gcc|${CC}|g' \
 		${WRKSRC}/Makefile \
-		${WRKSRC}/engines/phalanx-scid/makefile \
-		${WRKSRC}/engines/togaII1.2.1a/src/Makefile
+		${WRKSRC}/engines/phalanx-scid/makefile
 
 .include <bsd.port.mk>
diff --git a/games/scid/distinfo b/games/scid/distinfo
index 23a886c82415..49144bcf10b8 100644
--- a/games/scid/distinfo
+++ b/games/scid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480141166
-SHA256 (scid-4.6.4.zip) = 4fde535051786c0f8b13e6a2a20b306e7ba29e7af7394f5e510aae4f87e223e6
-SIZE (scid-4.6.4.zip) = 12248886
+TIMESTAMP = 1575285869
+SHA256 (scid-code-4.7.0.zip) = 2ed25781ec3c82d60fcee85259c19fd8934feae2547f9464304cdb01960f86da
+SIZE (scid-code-4.7.0.zip) = 15782104
diff --git a/games/scid/files/patch-Makefile.conf b/games/scid/files/patch-Makefile.conf
index 247dfdb90f3b..545b5ad545d1 100644
--- a/games/scid/files/patch-Makefile.conf
+++ b/games/scid/files/patch-Makefile.conf
@@ -25,9 +25,6 @@
  	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
 -	install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
 +	install -s ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
- 	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
--	install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
-+	install -s ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
- 
+
  install_mac: all
  	install -m 755 -d dist/Scid.app/Contents/MacOS
diff --git a/games/scid/files/patch-src_fastgame.h b/games/scid/files/patch-src_fastgame.h
deleted file mode 100644
index 2791c00b4d57..000000000000
--- a/games/scid/files/patch-src_fastgame.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/fastgame.h.orig	2019-11-21 14:15:35 UTC
-+++ src/fastgame.h
-@@ -433,7 +433,7 @@ class FastGame { (private)
- 
- 	static inline squareT decodeKing (squareT from, byte val) {
- 		ASSERT (val <= 8);
--		static const char sqdiff[] = { 0, -9, -8, -7, -1, 1, 7, 8, 9};
-+		static const signed char sqdiff[] = { 0, -9, -8, -7, -1, 1, 7, 8, 9};
- 		return 0x3F & (from + sqdiff[val]);
- 	}
- 	static inline squareT decodeQueen2byte (byte val) {
-@@ -447,7 +447,7 @@ class FastGame { (private)
- 	}
- 	static inline squareT decodeKnight (squareT from, byte val) {
- 		ASSERT (val <= 16);
--		static const char sqdiff[] = { 0, -17, -15, -10, -6, 6, 10, 15, 17, 0, 0, 0, 0, 0, 0, 0 };
-+		static const signed char sqdiff[] = { 0, -17, -15, -10, -6, 6, 10, 15, 17, 0, 0, 0, 0, 0, 0, 0 };
- 		return 0x3F & (from + sqdiff[val]);
- 	}
- 	static inline squareT decodeRook (squareT from, byte val) {
diff --git a/games/scid/files/patch-src_tkscid.cpp b/games/scid/files/patch-src_tkscid.cpp
new file mode 100644
index 000000000000..0c6ee56ff335
--- /dev/null
+++ b/games/scid/files/patch-src_tkscid.cpp
@@ -0,0 +1,20 @@
+--- src/tkscid.cpp.orig	2019-12-02 11:36:00 UTC
++++ src/tkscid.cpp
+@@ -4510,7 +4510,7 @@ sc_game_tags_set (ClientData, Tcl_Interp * ti, int arg
+                     int largc;
+                     const char ** largv;
+                     if (Tcl_SplitList (ti, value, &largc,
+-                                       (CONST84 char ***) &largv) != TCL_OK) {
++                                       (const char ***) &largv) != TCL_OK) {
+                         // Error from Tcl_SplitList!
+                         return errorResult (ti, "Error parsing extra tags.");
+                     }
+@@ -9330,7 +9330,7 @@ sc_search_header (ClientData, Tcl_Interp * ti, scidBas
+ 
+         case OPT_PGN:
+             if (Tcl_SplitList (ti, (char *)value, &pgnTextCount,
+-                               (CONST84 char ***) &sPgnText) != TCL_OK) {
++                               (const char ***) &sPgnText) != TCL_OK) {
+                 delete[] wTitles;
+                 delete[] bTitles;
+                 return TCL_ERROR;
diff --git a/games/scid/pkg-plist b/games/scid/pkg-plist
index 012163ea5fb0..f2eaf345a7c3 100644
--- a/games/scid/pkg-plist
+++ b/games/scid/pkg-plist
@@ -15,7 +15,6 @@ bin/tkscid
 %%DATADIR%%/books/readme.txt
 %%DATADIR%%/books/varied.bin
 %%DATADIR%%/engines/phalanx-scid/phalanx-scid
-%%DATADIR%%/engines/togaII1.2.1a/togaII
 %%DATADIR%%/html/bitmaps/bb.gif
 %%DATADIR%%/html/bitmaps/bk.gif
 %%DATADIR%%/html/bitmaps/bn.gif
@@ -129,94 +128,94 @@ bin/tkscid
 %%DATADIR%%/img/buttons/tb_CC_yourmove.gif
 %%DATADIR%%/img/buttons/tb_Layout.gif
 %%DATADIR%%/img/buttons/tb_Stats.gif
-%%DATADIR%%/img/buttons/tb_addallvars.gif
-%%DATADIR%%/img/buttons/tb_addmove.gif
-%%DATADIR%%/img/buttons/tb_addvar.gif
-%%DATADIR%%/img/buttons/tb_annotate.gif
-%%DATADIR%%/img/buttons/tb_autoplay_off.gif
-%%DATADIR%%/img/buttons/tb_autoplay_on.gif
-%%DATADIR%%/img/buttons/tb_backward.gif
+%%DATADIR%%/img/buttons/tb_addallvars.png
+%%DATADIR%%/img/buttons/tb_addmove.png
+%%DATADIR%%/img/buttons/tb_addvar.png
+%%DATADIR%%/img/buttons/tb_annotate_on.png
+%%DATADIR%%/img/buttons/tb_annotate.png
 %%DATADIR%%/img/buttons/tb_bargraph.gif
-%%DATADIR%%/img/buttons/tb_bibliography.png
-%%DATADIR%%/img/buttons/tb_bkm.gif
+%%DATADIR%%/img/buttons/tb_bkm.png
 %%DATADIR%%/img/buttons/tb_black.gif
+%%DATADIR%%/img/buttons/tb_boardsearch.png
 %%DATADIR%%/img/buttons/tb_bsearch.gif
 %%DATADIR%%/img/buttons/tb_calendar.gif
-%%DATADIR%%/img/buttons/tb_close.gif
 %%DATADIR%%/img/buttons/tb_close_hover.gif
-%%DATADIR%%/img/buttons/tb_closedgroup.gif
-%%DATADIR%%/img/buttons/tb_comment_avail.gif
-%%DATADIR%%/img/buttons/tb_comment_unavail.gif
-%%DATADIR%%/img/buttons/tb_coords.gif
-%%DATADIR%%/img/buttons/tb_copy.gif
-%%DATADIR%%/img/buttons/tb_cpu.gif
-%%DATADIR%%/img/buttons/tb_cross.gif
+%%DATADIR%%/img/buttons/tb_close.gif
+%%DATADIR%%/img/buttons/tb_closedb.png
+%%DATADIR%%/img/buttons/tb_config.png
+%%DATADIR%%/img/buttons/tb_coords.png
+%%DATADIR%%/img/buttons/tb_copy.png
+%%DATADIR%%/img/buttons/tb_cpu_hi.png
+%%DATADIR%%/img/buttons/tb_cpu.png
+%%DATADIR%%/img/buttons/tb_cross.png
 %%DATADIR%%/img/buttons/tb_crosst.gif
-%%DATADIR%%/img/buttons/tb_cut.gif
+%%DATADIR%%/img/buttons/tb_crosstab.png
+%%DATADIR%%/img/buttons/tb_cut.png
 %%DATADIR%%/img/buttons/tb_down.gif
 %%DATADIR%%/img/buttons/tb_down.png
-%%DATADIR%%/img/buttons/tb_eco.gif
+%%DATADIR%%/img/buttons/tb_eco.png
 %%DATADIR%%/img/buttons/tb_empty.gif
 %%DATADIR%%/img/buttons/tb_end.gif
 %%DATADIR%%/img/buttons/tb_eng_connecting.png
 %%DATADIR%%/img/buttons/tb_eng_dgt.gif
 %%DATADIR%%/img/buttons/tb_eng_disconnected.png
 %%DATADIR%%/img/buttons/tb_eng_error.png
+%%DATADIR%%/img/buttons/tb_eng_off.png
 %%DATADIR%%/img/buttons/tb_eng_ok.png
 %%DATADIR%%/img/buttons/tb_eng_on.png
 %%DATADIR%%/img/buttons/tb_eng_query.png
-%%DATADIR%%/img/buttons/tb_engine.gif
-%%DATADIR%%/img/buttons/tb_engineinfo.gif
-%%DATADIR%%/img/buttons/tb_finder.gif
-%%DATADIR%%/img/buttons/tb_finish_off.gif
-%%DATADIR%%/img/buttons/tb_finish_on.gif
+%%DATADIR%%/img/buttons/tb_engine.png
+%%DATADIR%%/img/buttons/tb_engineinfo.png
+%%DATADIR%%/img/buttons/tb_finder.png
+%%DATADIR%%/img/buttons/tb_finish_off.png
+%%DATADIR%%/img/buttons/tb_finish_on.png
 %%DATADIR%%/img/buttons/tb_flip.png
-%%DATADIR%%/img/buttons/tb_forward.gif
-%%DATADIR%%/img/buttons/tb_glist.gif
-%%DATADIR%%/img/buttons/tb_gnext.gif
-%%DATADIR%%/img/buttons/tb_gprev.gif
-%%DATADIR%%/img/buttons/tb_graph.gif
-%%DATADIR%%/img/buttons/tb_help.gif
+%%DATADIR%%/img/buttons/tb_glist.png
+%%DATADIR%%/img/buttons/tb_gnext.png
+%%DATADIR%%/img/buttons/tb_gprev.png
+%%DATADIR%%/img/buttons/tb_headersearch.png
+%%DATADIR%%/img/buttons/tb_help_small.png
+%%DATADIR%%/img/buttons/tb_help.png
 %%DATADIR%%/img/buttons/tb_hsearch.gif
 %%DATADIR%%/img/buttons/tb_iconSave.png
 %%DATADIR%%/img/buttons/tb_invar.gif
 %%DATADIR%%/img/buttons/tb_invar.png
-%%DATADIR%%/img/buttons/tb_lightbulb.gif
 %%DATADIR%%/img/buttons/tb_list.gif
-%%DATADIR%%/img/buttons/tb_lockengine.gif
+%%DATADIR%%/img/buttons/tb_lockengine.png
 %%DATADIR%%/img/buttons/tb_mainline.gif
-%%DATADIR%%/img/buttons/tb_maint.gif
+%%DATADIR%%/img/buttons/tb_maint.png
+%%DATADIR%%/img/buttons/tb_materialsearch.png
 %%DATADIR%%/img/buttons/tb_menu.gif
 %%DATADIR%%/img/buttons/tb_msearch.gif
 %%DATADIR%%/img/buttons/tb_new.gif
+%%DATADIR%%/img/buttons/tb_newdb.png
+%%DATADIR%%/img/buttons/tb_newgame.png
 %%DATADIR%%/img/buttons/tb_next.gif
-%%DATADIR%%/img/buttons/tb_open.gif
-%%DATADIR%%/img/buttons/tb_opengroup.gif
+%%DATADIR%%/img/buttons/tb_open.png
 %%DATADIR%%/img/buttons/tb_outvar.png
-%%DATADIR%%/img/buttons/tb_paste.gif
-%%DATADIR%%/img/buttons/tb_pause.gif
-%%DATADIR%%/img/buttons/tb_pgn.gif
+%%DATADIR%%/img/buttons/tb_paste.png
+%%DATADIR%%/img/buttons/tb_pgn.png
 %%DATADIR%%/img/buttons/tb_play.gif
 %%DATADIR%%/img/buttons/tb_prev.gif
 %%DATADIR%%/img/buttons/tb_rfilter.gif
-%%DATADIR%%/img/buttons/tb_save.gif
+%%DATADIR%%/img/buttons/tb_save_small.png
+%%DATADIR%%/img/buttons/tb_save.png
 %%DATADIR%%/img/buttons/tb_search16.png
 %%DATADIR%%/img/buttons/tb_search_off.png
 %%DATADIR%%/img/buttons/tb_search_on.png
 %%DATADIR%%/img/buttons/tb_start.gif
-%%DATADIR%%/img/buttons/tb_stm.gif
 %%DATADIR%%/img/buttons/tb_stop.gif
-%%DATADIR%%/img/buttons/tb_switcher.gif
-%%DATADIR%%/img/buttons/tb_tick.gif
-%%DATADIR%%/img/buttons/tb_tmt.gif
-%%DATADIR%%/img/buttons/tb_training.gif
-%%DATADIR%%/img/buttons/tb_tree.gif
+%%DATADIR%%/img/buttons/tb_switcher.png
+%%DATADIR%%/img/buttons/tb_tabmenu.gif
+%%DATADIR%%/img/buttons/tb_tick.png
+%%DATADIR%%/img/buttons/tb_tmt.png
+%%DATADIR%%/img/buttons/tb_training.png
+%%DATADIR%%/img/buttons/tb_tree.png
 %%DATADIR%%/img/buttons/tb_trial.gif
 %%DATADIR%%/img/buttons/tb_trial_on.gif
-%%DATADIR%%/img/buttons/tb_uciEngine.gif
 %%DATADIR%%/img/buttons/tb_up.png
-%%DATADIR%%/img/buttons/tb_update.gif
-%%DATADIR%%/img/buttons/tb_updir.gif
+%%DATADIR%%/img/buttons/tb_update.png
+%%DATADIR%%/img/buttons/tb_updir.png
 %%DATADIR%%/img/buttons/tb_white.gif
 %%DATADIR%%/img/flags/copyright
 %%DATADIR%%/img/flags/flag_afg.gif
@@ -439,6 +438,12 @@ bin/tkscid
 %%DATADIR%%/img/pieces/Blindfold/Blindfold_70.gif
 %%DATADIR%%/img/pieces/Blindfold/Blindfold_75.gif
 %%DATADIR%%/img/pieces/Blindfold/Blindfold_80.gif
+%%DATADIR%%/img/pieces/Blindfold/Blindfold_85.gif
+%%DATADIR%%/img/pieces/Blindfold/Blindfold_90.gif
+%%DATADIR%%/img/pieces/Blindfold/Blindfold_95.gif
+%%DATADIR%%/img/pieces/Blindfold/Blindfold_100.gif
+%%DATADIR%%/img/pieces/Blindfold/Blindfold_105.gif
+%%DATADIR%%/img/pieces/Blindfold/Blindfold_110.gif
 %%DATADIR%%/img/pieces/Cburnett/cburnett_100.png
 %%DATADIR%%/img/pieces/Cburnett/cburnett_105.png
 %%DATADIR%%/img/pieces/Cburnett/cburnett_110.png
@@ -462,28 +467,45 @@ bin/tkscid
 %%DATADIR%%/img/pieces/Cburnett/cburnett_85.png
 %%DATADIR%%/img/pieces/Cburnett/cburnett_90.png
 %%DATADIR%%/img/pieces/Cburnett/cburnett_95.png
-%%DATADIR%%/img/pieces/Eboard/Eboard_25.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_30.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_35.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_40.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_45.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_50.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_55.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_60.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_65.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_70.gif
-%%DATADIR%%/img/pieces/Eboard/Eboard_80.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_25.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_30.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_35.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_40.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_45.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_50.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_55.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_60.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_65.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_70.gif
-%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_80.gif
+%%DATADIR%%/img/pieces/Eboard/Eboard_25.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_30.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_35.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_40.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_45.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_50.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_55.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_60.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_65.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_70.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_75.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_80.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_85.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_90.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_95.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_100.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_105.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_110.png
+%%DATADIR%%/img/pieces/Eboard/Eboard_120.png
+%%DATADIR%%/img/pieces/Fantasy2/copyright
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_25.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_30.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_35.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_40.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_45.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_50.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_55.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_60.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_65.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_70.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_75.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_80.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_85.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_90.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_95.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_100.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_105.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_110.png
+%%DATADIR%%/img/pieces/Fantasy2/fantasy2_200.png
 %%DATADIR%%/img/pieces/Good Companion/good_companion_100.png
 %%DATADIR%%/img/pieces/Good Companion/good_companion_105.png
 %%DATADIR%%/img/pieces/Good Companion/good_companion_110.png
@@ -519,17 +541,25 @@ bin/tkscid
 %%DATADIR%%/img/pieces/Kingdom/Kingdom_70.gif
 %%DATADIR%%/img/pieces/Kingdom/Kingdom_75.gif
 %%DATADIR%%/img/pieces/Kingdom/Kingdom_80.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_25.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_30.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_35.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_40.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_45.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_50.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_55.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_60.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_65.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_70.gif
-%%DATADIR%%/img/pieces/Leipzig/Leipzig_80.gif
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_100.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_105.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_110.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_200.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_25.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_30.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_35.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_40.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_45.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_50.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_55.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_60.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_65.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_70.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_75.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_80.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_85.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_90.png
+%%DATADIR%%/img/pieces/Leipzig/Leibzig_95.png
 %%DATADIR%%/img/pieces/Leipzig/copyright
 %%DATADIR%%/img/pieces/Merida/copyright
 %%DATADIR%%/img/pieces/Merida/merida2_100.png
@@ -573,6 +603,7 @@ bin/tkscid
 %%DATADIR%%/img/pieces/ReadMe.txt
 %%DATADIR%%/img/scid.gif
 %%DATADIR%%/scid.eco
+%%DATADIR%%/tcl/appearance.tcl
 %%DATADIR%%/tcl/board.tcl
 %%DATADIR%%/tcl/contrib/ezsmtp/ChangeLog
 %%DATADIR%%/tcl/contrib/ezsmtp/README.txt
@@ -592,7 +623,6 @@ bin/tkscid
 %%DATADIR%%/tcl/file/recent.tcl
 %%DATADIR%%/tcl/file/spellchk.tcl
 %%DATADIR%%/tcl/file.tcl
-%%DATADIR%%/tcl/game/browser.tcl
 %%DATADIR%%/tcl/game.tcl
 %%DATADIR%%/tcl/help/help.tcl
 %%DATADIR%%/tcl/help/tips.tcl
@@ -622,7 +652,7 @@ bin/tkscid
 %%DATADIR%%/tcl/language.tcl
 %%DATADIR%%/tcl/main.tcl
 %%DATADIR%%/tcl/menus.tcl
-%%DATADIR%%/tcl/misc/misc.tcl
+%%DATADIR%%/tcl/misc.tcl
 %%DATADIR%%/tcl/move.tcl
 %%DATADIR%%/tcl/options.tcl
 %%DATADIR%%/tcl/search/board.tcl
@@ -667,6 +697,7 @@ bin/tkscid
 %%DATADIR%%/tcl/utils/win.tcl
 %%DATADIR%%/tcl/utils.tcl
 %%DATADIR%%/tcl/windows/book.tcl
+%%DATADIR%%/tcl/windows/browser.tcl
 %%DATADIR%%/tcl/windows/comment.tcl
 %%DATADIR%%/tcl/windows/crosstab.tcl
 %%DATADIR%%/tcl/windows/eco.tcl