Hello Maurice (and ports) --
On 5/9/2023 7:41 PM, Brian Callahan wrote:
> On 5/6/2023 10:06 AM, Maurice McCarthy wrote:
>> Just did a fresh install of 7.3 not problems.
>> When I launched scid-4.7.0 I had he same problems as last year.
>> But the identical cure worked. I used your diff to upgrade to 4.7.4
>> and all worked perfectly.
>>
>> https://marc.info/?l=openbsd-ports&m=166886213023708&q=p3
>>
>> Thanks again for all the fine efforts!
>>
>
> Thanks for the heads up. Glad it is still working. Will commit soon...
>
> ~Brian
>
Attached in an update to scid-5.0.2. Please test and let me know if it
is still good for you.
Thanks.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/scid/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 11 Mar 2022 19:04:53 -0000 1.7
+++ Makefile 5 Jun 2023 18:56:10 -0000
@@ -1,6 +1,6 @@
-V = 4.7.0
+V = 5.0.2
COMMENT = chess database software
-DISTNAME = scid-code-${V}
+DISTNAME = scid_src_${V}
PKGNAME = scid-${V}
EXTRACT_SUFX = .zip
CATEGORIES = games x11
@@ -15,12 +15,11 @@ WANTLIB += ${COMPILER_LIBCXX} ${MODTCL_W
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=scid/}
-# C++11
-COMPILER = base-clang ports-gcc base-gcc
+# C++20
+COMPILER = base-clang ports-gcc
MODULES = lang/python \
x11/tk
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODTK_VERSION = 8.6
MODPY_ADJ_FILES = scripts/pgnfix.py
@@ -35,7 +34,7 @@ MAKE_FLAGS = CXX="${CXX}"
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/scid
+WRKDIST = ${WRKDIR}/scid-${V}
FIX_CRLF_FILES = engines/togaII1.2.1a/src/Makefile
pre-configure:
@@ -51,5 +50,8 @@ post-configure:
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/tcl/lang/checklangs.tcl
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/tcl/lang/propagatelang.tcl
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/tcl/lang/removetoken.tcl
+
+post-install:
+ rm -f ${PREFIX}/share/scid/tcl/utils/tooltip.tcl.orig.port
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/scid/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 31 Mar 2019 21:31:16 -0000 1.2
+++ distinfo 5 Jun 2023 18:56:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (scid-code-4.7.0.zip) = LtJXgew8gtYPzuhSWcGf2JNP6uJUf5RkMEzbAZYPhto=
-SIZE (scid-code-4.7.0.zip) = 15782104
+SHA256 (scid_src_5.0.2.zip) = J0HQGoA1nhHImf+JTf+gVSkvJPYoeTuvQTS1t1gZy3s=
+SIZE (scid_src_5.0.2.zip) = 15661705
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/games/scid/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 11 Mar 2022 19:04:53 -0000 1.3
+++ patches/patch-configure 5 Jun 2023 18:56:10 -0000
@@ -14,12 +14,12 @@ Index: configure
set var(DEBUG) {-DNDEBUG}
set var(OBJS) {$(SCIDOBJS)}
set var(THREADS) {-pthread}
--set var(OPTIMIZE) {-std=c++14 -O3 -march=native -fno-rtti -fno-exceptions}
-+set var(OPTIMIZE) {${CXXFLAGS} -std=c++14 -fno-rtti -fno-exceptions}
+-set var(OPTIMIZE) {-std=c++20 -O3 -march=native -fno-rtti -fno-exceptions}
++set var(OPTIMIZE) {${CXXFLAGS} -std=c++20 -fno-rtti -fno-exceptions}
set var(PROFILE) {}
set var(SCIDFLAGS) {}
-set var(SHAREDIR) /usr/local/share/scid
+set var(SHAREDIR) ${LOCALBASE}/share/scid
- set var(TB) {-DSCID_USE_TB -DT41_INCLUDE}
set var(TCL_VERSION) $tcl_version
set var(WARNINGS) -Wall
+ set var(MAKEFILE) Makefile.conf
Index: patches/patch-engines_scidlet_scidlet_cpp
===================================================================
RCS file: patches/patch-engines_scidlet_scidlet_cpp
diff -N patches/patch-engines_scidlet_scidlet_cpp
--- patches/patch-engines_scidlet_scidlet_cpp 11 Mar 2022 19:04:53 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Missing sys/select.h
-
-Index: engines/scidlet/scidlet.cpp
---- engines/scidlet/scidlet.cpp.orig
-+++ engines/scidlet/scidlet.cpp
-@@ -17,6 +17,7 @@
-
- #include "../../src/engine.h"
- #include "../../src/misc.h"
-+#include <sys/select.h>
- #include <algorithm>
- #include <stdarg.h>
- #include <stdlib.h>
Index: patches/patch-tcl_utils_tooltip_tcl
===================================================================
RCS file: patches/patch-tcl_utils_tooltip_tcl
diff -N patches/patch-tcl_utils_tooltip_tcl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tcl_utils_tooltip_tcl 5 Jun 2023 18:56:10 -0000
@@ -0,0 +1,15 @@
+Force the use of the built-in tooltip package.
+Otherwise, there is a problem if you have tk-8.5 and tk-8.6 installed.
+
+Index: tcl/utils/tooltip.tcl
+--- tcl/utils/tooltip.tcl.orig
++++ tcl/utils/tooltip.tcl
+@@ -3,7 +3,7 @@
+ # Tooltips
+ #
+
+-set useLocalTklib [catch {package require tooltip 1.4.6}]
++set useLocalTklib 1
+ if {$useLocalTklib} {
+ source [file nativename [file join $::scidTclDir "utils/tklib_tooltip.tcl"]]
+ }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/scid/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 11 Mar 2022 19:04:53 -0000 1.3
+++ pkg/PLIST 5 Jun 2023 18:56:10 -0000
@@ -91,6 +91,7 @@ share/scid/img/buttons/FICSusers.png
share/scid/img/buttons/copyright
share/scid/img/buttons/tb_BD_Autoplay.png
share/scid/img/buttons/tb_BD_Back.png
+share/scid/img/buttons/tb_BD_BackStart.png
share/scid/img/buttons/tb_BD_BackToMainline.png
share/scid/img/buttons/tb_BD_Changes.gif
share/scid/img/buttons/tb_BD_Comment.gif
@@ -98,7 +99,7 @@ share/scid/img/buttons/tb_BD_Coords.png
share/scid/img/buttons/tb_BD_End.png
share/scid/img/buttons/tb_BD_Flip.png
share/scid/img/buttons/tb_BD_Forward.png
-share/scid/img/buttons/tb_BD_Fullscreen.png
+share/scid/img/buttons/tb_BD_ForwardEnd.png
share/scid/img/buttons/tb_BD_Layout.gif
share/scid/img/buttons/tb_BD_Material.png
share/scid/img/buttons/tb_BD_NewMainline.png
@@ -108,6 +109,7 @@ share/scid/img/buttons/tb_BD_Replace.png
share/scid/img/buttons/tb_BD_Revert.png
share/scid/img/buttons/tb_BD_Save.png
share/scid/img/buttons/tb_BD_SaveAs.png
+share/scid/img/buttons/tb_BD_Scorebar.png
share/scid/img/buttons/tb_BD_SetupBoard.png
share/scid/img/buttons/tb_BD_ShowToolbar.gif
share/scid/img/buttons/tb_BD_Start.png
@@ -116,6 +118,7 @@ share/scid/img/buttons/tb_BD_VarDelete.p
share/scid/img/buttons/tb_BD_VarLeave.png
share/scid/img/buttons/tb_BD_VarPromote.png
share/scid/img/buttons/tb_BD_Variations.gif
+share/scid/img/buttons/tb_BD_exitvar.png
share/scid/img/buttons/tb_BoardMask.gif
share/scid/img/buttons/tb_BoardMaskBusy.gif
share/scid/img/buttons/tb_CC_Retrieve.gif
@@ -167,14 +170,24 @@ share/scid/img/buttons/tb_down.png
share/scid/img/buttons/tb_eco.png
share/scid/img/buttons/tb_empty.gif
share/scid/img/buttons/tb_end.gif
+share/scid/img/buttons/tb_eng_add.png
+share/scid/img/buttons/tb_eng_addbestline.png
+share/scid/img/buttons/tb_eng_addbestmove.png
+share/scid/img/buttons/tb_eng_addlines.png
+share/scid/img/buttons/tb_eng_clone.png
+share/scid/img/buttons/tb_eng_config.png
share/scid/img/buttons/tb_eng_connecting.png
+share/scid/img/buttons/tb_eng_delete.png
share/scid/img/buttons/tb_eng_dgt.gif
share/scid/img/buttons/tb_eng_disconnected.png
share/scid/img/buttons/tb_eng_error.png
+share/scid/img/buttons/tb_eng_lock.png
+share/scid/img/buttons/tb_eng_network.png
share/scid/img/buttons/tb_eng_off.png
share/scid/img/buttons/tb_eng_ok.png
share/scid/img/buttons/tb_eng_on.png
share/scid/img/buttons/tb_eng_query.png
+share/scid/img/buttons/tb_eng_reload.png
share/scid/img/buttons/tb_engine.png
share/scid/img/buttons/tb_engineinfo.png
share/scid/img/buttons/tb_finder.png
@@ -250,6 +263,8 @@ share/scid/img/flags/flag_bdi.gif
share/scid/img/flags/flag_bel.gif
share/scid/img/flags/flag_ben.gif
share/scid/img/flags/flag_ber.gif
+share/scid/img/flags/flag_bfa.gif
+share/scid/img/flags/flag_bhu.gif
share/scid/img/flags/flag_bih.gif
share/scid/img/flags/flag_blr.gif
share/scid/img/flags/flag_blz.gif
@@ -259,23 +274,36 @@ share/scid/img/flags/flag_bra.gif
share/scid/img/flags/flag_brn.gif
share/scid/img/flags/flag_bru.gif
share/scid/img/flags/flag_bul.gif
+share/scid/img/flags/flag_caf.gif
+share/scid/img/flags/flag_cam.gif
share/scid/img/flags/flag_can.gif
+share/scid/img/flags/flag_cay.gif
+share/scid/img/flags/flag_cgo.gif
+share/scid/img/flags/flag_cha.gif
share/scid/img/flags/flag_chi.gif
share/scid/img/flags/flag_chn.gif
+share/scid/img/flags/flag_civ.gif
share/scid/img/flags/flag_cmr.gif
+share/scid/img/flags/flag_cod.gif
+share/scid/img/flags/flag_cok.gif
share/scid/img/flags/flag_col.gif
share/scid/img/flags/flag_com.gif
+share/scid/img/flags/flag_cpv.gif
share/scid/img/flags/flag_crc.gif
share/scid/img/flags/flag_cro.gif
+share/scid/img/flags/flag_cta.gif
share/scid/img/flags/flag_cub.gif
share/scid/img/flags/flag_cym.gif
share/scid/img/flags/flag_cyp.gif
share/scid/img/flags/flag_cze.gif
share/scid/img/flags/flag_den.gif
+share/scid/img/flags/flag_dji.gif
+share/scid/img/flags/flag_dma.gif
share/scid/img/flags/flag_dom.gif
share/scid/img/flags/flag_ecu.gif
share/scid/img/flags/flag_egy.gif
share/scid/img/flags/flag_eng.gif
+share/scid/img/flags/flag_eqg.gif
share/scid/img/flags/flag_eri.gif
share/scid/img/flags/flag_esa.gif
share/scid/img/flags/flag_esp.gif
@@ -286,14 +314,19 @@ share/scid/img/flags/flag_fai.gif
share/scid/img/flags/flag_fij.gif
share/scid/img/flags/flag_fin.gif
share/scid/img/flags/flag_fra.gif
+share/scid/img/flags/flag_gab.gif
share/scid/img/flags/flag_gam.gif
share/scid/img/flags/flag_gbr.gif
+share/scid/img/flags/flag_gci.gif
share/scid/img/flags/flag_geo.gif
share/scid/img/flags/flag_ger.gif
share/scid/img/flags/flag_gha.gif
+share/scid/img/flags/flag_gnb.gif
share/scid/img/flags/flag_grd.gif
share/scid/img/flags/flag_gre.gif
share/scid/img/flags/flag_gua.gif
+share/scid/img/flags/flag_gui.gif
+share/scid/img/flags/flag_gum.gif
share/scid/img/flags/flag_guy.gif
share/scid/img/flags/flag_hai.gif
share/scid/img/flags/flag_hkg.gif
@@ -306,8 +339,10 @@ share/scid/img/flags/flag_irl.gif
share/scid/img/flags/flag_irq.gif
share/scid/img/flags/flag_isl.gif
share/scid/img/flags/flag_isr.gif
+share/scid/img/flags/flag_isv.gif
share/scid/img/flags/flag_ita.gif
share/scid/img/flags/flag_jam.gif
+share/scid/img/flags/flag_jci.gif
share/scid/img/flags/flag_jor.gif
share/scid/img/flags/flag_jpn.gif
share/scid/img/flags/flag_kaz.gif
@@ -316,20 +351,31 @@ share/scid/img/flags/flag_kgz.gif
share/scid/img/flags/flag_khm.gif
share/scid/img/flags/flag_kir.gif
share/scid/img/flags/flag_kor.gif
+share/scid/img/flags/flag_kos.gif
+share/scid/img/flags/flag_ksa.gif
share/scid/img/flags/flag_kuw.gif
+share/scid/img/flags/flag_kvx.gif
share/scid/img/flags/flag_lao.gif
share/scid/img/flags/flag_lat.gif
share/scid/img/flags/flag_lba.gif
+share/scid/img/flags/flag_lbn.gif
share/scid/img/flags/flag_lbr.gif
+share/scid/img/flags/flag_lby.gif
+share/scid/img/flags/flag_lca.gif
+share/scid/img/flags/flag_les.gif
share/scid/img/flags/flag_lib.gif
share/scid/img/flags/flag_lie.gif
share/scid/img/flags/flag_ltu.gif
share/scid/img/flags/flag_lux.gif
+share/scid/img/flags/flag_lva.gif
+share/scid/img/flags/flag_mac.gif
share/scid/img/flags/flag_mad.gif
share/scid/img/flags/flag_mar.gif
share/scid/img/flags/flag_mas.gif
share/scid/img/flags/flag_mau.gif
+share/scid/img/flags/flag_maw.gif
share/scid/img/flags/flag_mda.gif
+share/scid/img/flags/flag_mdv.gif
share/scid/img/flags/flag_mex.gif
share/scid/img/flags/flag_mgl.gif
share/scid/img/flags/flag_mkd.gif
@@ -339,20 +385,29 @@ share/scid/img/flags/flag_mnc.gif
share/scid/img/flags/flag_mne.gif
share/scid/img/flags/flag_moz.gif
share/scid/img/flags/flag_mri.gif
+share/scid/img/flags/flag_mtn.gif
+share/scid/img/flags/flag_mwi.gif
share/scid/img/flags/flag_mya.gif
+share/scid/img/flags/flag_nam.gif
share/scid/img/flags/flag_nca.gif
share/scid/img/flags/flag_ned.gif
share/scid/img/flags/flag_nep.gif
+share/scid/img/flags/flag_nga.gif
share/scid/img/flags/flag_ngr.gif
+share/scid/img/flags/flag_nig.gif
share/scid/img/flags/flag_nir.gif
share/scid/img/flags/flag_nor.gif
+share/scid/img/flags/flag_nru.gif
share/scid/img/flags/flag_nzl.gif
+share/scid/img/flags/flag_oma.gif
share/scid/img/flags/flag_omn.gif
share/scid/img/flags/flag_pak.gif
share/scid/img/flags/flag_pan.gif
share/scid/img/flags/flag_par.gif
share/scid/img/flags/flag_per.gif
share/scid/img/flags/flag_phi.gif
+share/scid/img/flags/flag_ple.gif
+share/scid/img/flags/flag_plw.gif
share/scid/img/flags/flag_png.gif
share/scid/img/flags/flag_pol.gif
share/scid/img/flags/flag_por.gif
@@ -361,30 +416,46 @@ share/scid/img/flags/flag_pur.gif
share/scid/img/flags/flag_qat.gif
share/scid/img/flags/flag_que.gif
share/scid/img/flags/flag_rom.gif
+share/scid/img/flags/flag_rou.gif
share/scid/img/flags/flag_rsa.gif
share/scid/img/flags/flag_rus.gif
+share/scid/img/flags/flag_rwa.gif
+share/scid/img/flags/flag_sam.gif
share/scid/img/flags/flag_sau.gif
share/scid/img/flags/flag_sco.gif
share/scid/img/flags/flag_sen.gif
share/scid/img/flags/flag_sey.gif
+share/scid/img/flags/flag_sgp.gif
share/scid/img/flags/flag_sin.gif
+share/scid/img/flags/flag_skn.gif
share/scid/img/flags/flag_sle.gif
share/scid/img/flags/flag_slo.gif
share/scid/img/flags/flag_smr.gif
+share/scid/img/flags/flag_sol.gif
+share/scid/img/flags/flag_som.gif
share/scid/img/flags/flag_srb.gif
share/scid/img/flags/flag_sri.gif
+share/scid/img/flags/flag_ssd.gif
+share/scid/img/flags/flag_stp.gif
share/scid/img/flags/flag_sud.gif
share/scid/img/flags/flag_sui.gif
share/scid/img/flags/flag_sun.gif
share/scid/img/flags/flag_sur.gif
share/scid/img/flags/flag_svk.gif
share/scid/img/flags/flag_swe.gif
+share/scid/img/flags/flag_swz.gif
share/scid/img/flags/flag_syr.gif
+share/scid/img/flags/flag_tan.gif
share/scid/img/flags/flag_tcd.gif
+share/scid/img/flags/flag_tga.gif
share/scid/img/flags/flag_tha.gif
share/scid/img/flags/flag_tjk.gif
share/scid/img/flags/flag_tkm.gif
+share/scid/img/flags/flag_tls.gif
+share/scid/img/flags/flag_tog.gif
+share/scid/img/flags/flag_tpe.gif
share/scid/img/flags/flag_tri.gif
+share/scid/img/flags/flag_tto.gif
share/scid/img/flags/flag_tun.gif
share/scid/img/flags/flag_tur.gif
share/scid/img/flags/flag_twn.gif
@@ -395,9 +466,12 @@ share/scid/img/flags/flag_urs.gif
share/scid/img/flags/flag_uru.gif
share/scid/img/flags/flag_usa.gif
share/scid/img/flags/flag_uzb.gif
+share/scid/img/flags/flag_van.gif
share/scid/img/flags/flag_ven.gif
share/scid/img/flags/flag_vie.gif
+share/scid/img/flags/flag_vin.gif
share/scid/img/flags/flag_wal.gif
+share/scid/img/flags/flag_wls.gif
share/scid/img/flags/flag_yem.gif
share/scid/img/flags/flag_yug.gif
share/scid/img/flags/flag_zam.gif
@@ -641,8 +715,11 @@ share/scid/tcl/contrib/ezsmtp/koi8-r-bod
share/scid/tcl/contrib/ezsmtp/license.txt
share/scid/tcl/contrib/ezsmtp/postinst.tcl
share/scid/tcl/contrib/ezsmtp/test_examples.txt
+share/scid/tcl/darktheme.tcl
share/scid/tcl/edit.tcl
share/scid/tcl/end.tcl
+share/scid/tcl/enginecfg.tcl
+share/scid/tcl/enginecomm.tcl
share/scid/tcl/errors.tcl
share/scid/tcl/file/
share/scid/tcl/file.tcl
@@ -694,8 +771,6 @@ share/scid/tcl/start.tcl
share/scid/tcl/tools/
share/scid/tcl/tools/analysis.tcl
share/scid/tcl/tools/calvar.tcl
-share/scid/tcl/tools/correspondence.tcl
-share/scid/tcl/tools/email.tcl
share/scid/tcl/tools/fics.tcl
share/scid/tcl/tools/graphs.tcl
share/scid/tcl/tools/import.tcl
@@ -708,7 +783,6 @@ share/scid/tcl/tools/preport.tcl
share/scid/tcl/tools/ptracker.tcl
share/scid/tcl/tools/reviewgame.tcl
share/scid/tcl/tools/sergame.tcl
-share/scid/tcl/tools/tablebase.tcl
share/scid/tcl/tools/tacgame.tcl
share/scid/tcl/tools/tactics.tcl
share/scid/tcl/tools/uci.tcl
@@ -736,9 +810,11 @@ share/scid/tcl/windows/browser.tcl
share/scid/tcl/windows/comment.tcl
share/scid/tcl/windows/crosstab.tcl
share/scid/tcl/windows/eco.tcl
+share/scid/tcl/windows/engine.tcl
share/scid/tcl/windows/gamelist.tcl
share/scid/tcl/windows/pfinder.tcl
share/scid/tcl/windows/pgn.tcl
+share/scid/tcl/windows/preferences.tcl
share/scid/tcl/windows/stats.tcl
share/scid/tcl/windows/switcher.tcl
share/scid/tcl/windows/tourney.tcl
