- Update to 4.2.2

PR:		146493
Submitted by:	Friedrich Volkmann <bsd@volki.at> (maintainer)

4 files changed, 48 insertions, 57 deletions

diff --git a/games/scid/Makefile b/games/scid/Makefile
index 38c3fa1b512b..ca30642720dc 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	scid
-PORTVERSION=	3.6.26
-PORTREVISION=	2
+PORTVERSION=	4.2.2
 CATEGORIES=	games databases
-MASTER_SITES=	SF/${PORTNAME}/Scid/Scid%20${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/Scid/Scid%204.2/
 
 MAINTAINER=	bsd@volki.at
 COMMENT=	A free chess database application
diff --git a/games/scid/distinfo b/games/scid/distinfo
index f774adc1204b..245d5256e4c2 100644
--- a/games/scid/distinfo
+++ b/games/scid/distinfo
@@ -1,3 +1,3 @@
-MD5 (scid-3.6.26.tar.bz2) = fdf70539bca21513c33ca6d3d031ec9d
-SHA256 (scid-3.6.26.tar.bz2) = 1864114cdd05031f2898dbc379c345bb5d51a73383b280efbc1e58cd780c685b
-SIZE (scid-3.6.26.tar.bz2) = 11375240
+MD5 (scid-4.2.2.tar.bz2) = 198d8a48f1381e03f4f231f35ae29407
+SHA256 (scid-4.2.2.tar.bz2) = 24a22e7e8abf3a0e1f1cc52c0fa9ecfcca8432324a229e49973faf41c20bb673
+SIZE (scid-4.2.2.tar.bz2) = 14045085
diff --git a/games/scid/files/patch-Makefile b/games/scid/files/patch-Makefile
index d141549d3334..a56702cd2fa5 100644
--- a/games/scid/files/patch-Makefile
+++ b/games/scid/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-10-10 10:59:55.000000000 +0200
-+++ Makefile	2009-01-26 12:27:47.000000000 +0100
+--- Makefile.orig	2010-01-20 10:48:13.000000000 +0100
++++ Makefile	2010-05-08 20:45:30.000000000 +0200
 @@ -9,16 +9,16 @@
  
  # BINDIR: where the Scid programs are copied for "make install".
@@ -24,35 +24,31 @@
  #
  # The settings determined by "./configure" are:
  #
--TCL_INCLUDE = -I/usr/local/ActiveTcl8.5/include
--TCL_LIBRARY = -L/usr/local/ActiveTcl8.5/lib -ltcl$(TCL_VERSION) -ldl
--TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L/usr/lib -lX11
-+#TCL_INCLUDE = -I/usr/local/ActiveTcl8.5/include
-+#TCL_LIBRARY = -L/usr/local/ActiveTcl8.5/lib -ltcl$(TCL_VERSION) -ldl
-+#TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L/usr/lib -lX11
+-TCL_INCLUDE = -I/usr/include
+-TCL_LIBRARY = -L/usr/lib -ltcl$(TCL_VERSION) -ldl
+-TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -lX11
++#TCL_INCLUDE = -I/usr/include
++#TCL_LIBRARY = -L/usr/lib -ltcl$(TCL_VERSION) -ldl
++#TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -lX11
  
  ### Here are other commonly used settings for the Tcl/Tk compiler options:
  
-@@ -54,6 +54,9 @@
- # TCL_INCLUDE = -I /usr/local/include/tcl8.0 -I /usr/local/include/tk8.0
- # TCL_LIBRARY = -L /usr/local/lib -ltcl80 -ldl
- # TK_LIBRARY  = $(TCL_LIBRARY) -ltk80 -L /usr/X11/lib -lX11
+@@ -49,11 +49,10 @@
+ # TCL_LIBRARY = -L /usr/lib -ltcl$(TCL_VERSION) -ldl
+ # TK_LIBRARY  = $(TCL_LIBRARY) -L /usr/X11R6/lib -ltk$(TCL_VERSION) -lX11
+ 
+-# Someone sent me these settings for FreeBSD with Tcl/Tk 8.0:
+ ### FreeBSD:
+-# TCL_INCLUDE = -I /usr/local/include/tcl8.0 -I /usr/local/include/tk8.0
+-# TCL_LIBRARY = -L /usr/local/lib -ltcl80 -ldl
+-# TK_LIBRARY  = $(TCL_LIBRARY) -ltk80 -L /usr/X11/lib -lX11
 +TCL_INCLUDE = -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include
 +TCL_LIBRARY = -L${LOCALBASE}/lib -ltcl${TCL_LIBVER}${TCL_THREADS_SUFFIX} ${PTHREAD_LIBS}
 +TK_LIBRARY  = $(TCL_LIBRARY) -ltk${TCL_LIBVER}${TCL_THREADS_SUFFIX} -L${LOCALBASE}/lib -lX11 ${PTHREAD_LIBS}
  
  
  ########################################
-@@ -71,7 +74,7 @@
- #      to include the code in the src/zlib directory.
- #      The default is to use the system zlib library.
- #
--SCIDFLAGS =  -DZLIB
-+#SCIDFLAGS =  -DZLIB
- 
- ### OPTIMIZE: Optimization options for C++ compiler.
- #      -O4 is the most optimization for g++. I have found -O2 to do
-@@ -80,7 +83,7 @@
+@@ -80,7 +79,7 @@
  #      On some systems, adding "-fno-rtti" and "-fno-exceptions" produces
  #      smaller, faster programs since Scid does not use those C++ features.
  #
@@ -61,7 +57,7 @@
  
  ### DEBUG: Defining the macro ASSERTIONS will turn on assertions, which
  #       helps to track bugs after modifications, but the programs will run 
-@@ -91,7 +94,7 @@
+@@ -91,7 +90,7 @@
  ### WARNINGS: I always compile with all warnings on (-Wall), and all the
  #       files should compile warning-free using g++.
  #
@@ -70,7 +66,7 @@
  
  ### PROFILE: Set this to "-pg" for profiling in g++ and gcc.
  #
-@@ -143,15 +146,15 @@
+@@ -143,11 +142,11 @@
  
  ### ZLIBOBJS: object files in the zlib compression library.
  #
@@ -84,11 +80,6 @@
 +#      src/zlib/zutil.o src/zlib/inflate.o src/zlib/infblock.o \
 +#      src/zlib/inftrees.o src/zlib/infcodes.o src/zlib/infutil.o \
 +#      src/zlib/inffast.o
+ 
         
  ### ZLIB: Should be "-lz" if your system has zlib, "" otherwise.
- #
--ZLIB = 
-+ZLIB = -lz
- 
- ### OBJS: Will be "$(SCIDOBJS)", "$(POLYGLOTOBJS)", and also "$(ZLIBOBJS)" if they are
- #      needed on your system.
diff --git a/games/scid/pkg-plist b/games/scid/pkg-plist
index 49977a59f01d..dee877bd8737 100644
--- a/games/scid/pkg-plist
+++ b/games/scid/pkg-plist
@@ -12,35 +12,36 @@ bin/scidlet
 bin/scidpgn
 bin/scidt
 bin/scmerge
+bin/spf2spi
 bin/spliteco
 bin/tcscid
 bin/tkscid
-share/scid/bases/endings.sg3
-share/scid/bases/endings.si3
-share/scid/bases/endings.sn3
-share/scid/bases/matein1.sg3
-share/scid/bases/matein1.si3
-share/scid/bases/matein1.sn3
-share/scid/bases/matein2.sg3
-share/scid/bases/matein2.si3
-share/scid/bases/matein2.sn3
-share/scid/bases/matein3.sg3
-share/scid/bases/matein3.si3
-share/scid/bases/matein3.sn3
-share/scid/bases/matein4andmore.sg3
-share/scid/bases/matein4andmore.si3
-share/scid/bases/matein4andmore.sn3
-share/scid/bases/tactics.sg3
-share/scid/bases/tactics.si3
-share/scid/bases/tactics.sn3
+share/scid/bases/endings.sg4
+share/scid/bases/endings.si4
+share/scid/bases/endings.sn4
+share/scid/bases/matein1.sg4
+share/scid/bases/matein1.si4
+share/scid/bases/matein1.sn4
+share/scid/bases/matein2.sg4
+share/scid/bases/matein2.si4
+share/scid/bases/matein2.sn4
+share/scid/bases/matein3.sg4
+share/scid/bases/matein3.si4
+share/scid/bases/matein3.sn4
+share/scid/bases/matein4andmore.sg4
+share/scid/bases/matein4andmore.si4
+share/scid/bases/matein4andmore.sn4
+share/scid/bases/tactics.sg4
+share/scid/bases/tactics.si4
+share/scid/bases/tactics.sn4
 share/scid/books/Elo2400.bin
 share/scid/books/Performance.bin
 share/scid/books/gm2600.bin
 share/scid/books/readme.txt
 share/scid/books/varied.bin
 share/scid/data/scid.eco
-share/scid/engines/Phalanx-XXII/phalanx
-share/scid/engines/togaII1.2.1a/fruit
+share/scid/engines/phalanx-scid/phalanx-scid
+share/scid/engines/togaII1.2.1a/togaII
 share/scid/html/scid.css
 share/scid/html/scid.js
 share/scid/html/bitmaps/bb.gif
@@ -72,7 +73,7 @@ share/scid/html/bitmaps/mini/wr.gif
 @dirrm share/scid/books
 @dirrm share/scid/bases
 @dirrm share/scid/data
-@dirrm share/scid/engines/Phalanx-XXII
+@dirrm share/scid/engines/phalanx-scid
 @dirrm share/scid/engines/togaII1.2.1a
 @dirrm share/scid/engines
 @dirrm share/scid/html/bitmaps/mini