- Update to 3.6.26

- update my email address

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

4 files changed, 107 insertions, 38 deletions

diff --git a/games/scid/Makefile b/games/scid/Makefile
index 87ddd08d5204..c429671f277f 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -7,21 +7,22 @@
 #
 
 PORTNAME=	scid
-PORTVERSION=	3.6.1
-PORTREVISION=	2
+PORTVERSION=	3.6.26
 CATEGORIES=	games databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
-MAINTAINER=	volkmann@inode.at
+MAINTAINER=	bsd@volki.at
 COMMENT=	A free chess database application
 
-LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
-		tk84:${PORTSDIR}/x11-toolkits/tk84
+LIB_DEPENDS=	tcl85:${PORTSDIR}/lang/tcl85 \
+		tk85:${PORTSDIR}/x11-toolkits/tk85
 
+USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 
 ALL_TARGET=	all strip
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 .include <bsd.port.mk>
diff --git a/games/scid/distinfo b/games/scid/distinfo
index e4708ef5cdb3..f774adc1204b 100644
--- a/games/scid/distinfo
+++ b/games/scid/distinfo
@@ -1,3 +1,3 @@
-MD5 (scid-3.6.1.tar.gz) = 3c9483a7990a2629a35a787c1c29eee0
-SHA256 (scid-3.6.1.tar.gz) = 42665fba00f9cf8dd7d4e4c13a6b281e3c48d4dcd91d9f78f75b29e3485aaa05
-SIZE (scid-3.6.1.tar.gz) = 2272946
+MD5 (scid-3.6.26.tar.bz2) = fdf70539bca21513c33ca6d3d031ec9d
+SHA256 (scid-3.6.26.tar.bz2) = 1864114cdd05031f2898dbc379c345bb5d51a73383b280efbc1e58cd780c685b
+SIZE (scid-3.6.26.tar.bz2) = 11375240
diff --git a/games/scid/files/patch-Makefile b/games/scid/files/patch-Makefile
index 03872e3cc917..fee7a95f6855 100644
--- a/games/scid/files/patch-Makefile
+++ b/games/scid/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Jan 22 03:54:00 2003
-+++ Makefile	Mon Jan 27 17:02:06 2003
+--- Makefile.orig	2008-10-10 10:59:55.000000000 +0200
++++ Makefile	2008-12-26 15:09:52.000000000 +0100
 @@ -9,11 +9,11 @@
  
  # BINDIR: where the Scid programs are copied for "make install".
@@ -7,7 +7,7 @@
 -BINDIR = /usr/local/bin
 +BINDIR = ${PREFIX}/bin
  
- # SHAREDIR: where scid.eco and spelling.ssp are copied for "make install".
+ # SHAREDIR: where scid.eco is copied for "make install".
  #
 -SHAREDIR = /usr/local/share/scid
 +SHAREDIR = ${PREFIX}/share/scid
@@ -16,31 +16,28 @@
  #   installed that you want Scid to use: 8.0, 8.1, 8.2, 8.3, etc.
 @@ -27,9 +27,9 @@
  #
- # You have not run "./configure" yet.  The default settings are:
+ # The settings determined by "./configure" are:
  #
--TCL_INCLUDE = -I/usr/include
--TCL_LIBRARY = -L/usr/lib -ltcl$(TCL_VERSION) -ldl
--TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L/usr/X11R6/lib -lX11
-+#TCL_INCLUDE = -I/usr/include
-+#TCL_LIBRARY = -L/usr/lib -ltcl$(TCL_VERSION) -ldl
-+#TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L/usr/X11R6/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/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
  
  ### Here are other commonly used settings for the Tcl/Tk compiler options:
  
-@@ -51,9 +51,9 @@
- 
- # 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${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include
-+TCL_LIBRARY = -L${LOCALBASE}/lib -ltcl84
-+TK_LIBRARY  = $(TCL_LIBRARY) -ltk84 -L${LOCALBASE}/lib -lX11
+@@ -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
++TCL_INCLUDE = -I${LOCALBASE}/include/tcl8.5 -I${LOCALBASE}/include/tk8.5 -I${LOCALBASE}/include
++TCL_LIBRARY = -L${LOCALBASE}/lib -ltcl85
++TK_LIBRARY  = $(TCL_LIBRARY) -ltk85 -L${LOCALBASE}/lib -lX11
  
  
  ########################################
-@@ -71,7 +71,7 @@
+@@ -71,7 +74,7 @@
  #      to include the code in the src/zlib directory.
  #      The default is to use the system zlib library.
  #
@@ -49,7 +46,7 @@
  
  ### OPTIMIZE: Optimization options for C++ compiler.
  #      -O4 is the most optimization for g++. I have found -O2 to do
-@@ -80,7 +80,7 @@
+@@ -80,7 +83,7 @@
  #      On some systems, adding "-fno-rtti" and "-fno-exceptions" produces
  #      smaller, faster programs since Scid does not use those C++ features.
  #
@@ -58,7 +55,16 @@
  
  ### DEBUG: Defining the macro ASSERTIONS will turn on assertions, which
  #       helps to track bugs after modifications, but the programs will run 
-@@ -135,15 +135,15 @@
+@@ -91,7 +94,7 @@
+ ### WARNINGS: I always compile with all warnings on (-Wall), and all the
+ #       files should compile warning-free using g++.
+ #
+-WARNINGS = -Wall
++WARNINGS =
+ 
+ ### PROFILE: Set this to "-pg" for profiling in g++ and gcc.
+ #
+@@ -143,15 +146,15 @@
  
  ### ZLIBOBJS: object files in the zlib compression library.
  #
@@ -72,11 +78,11 @@
 +#      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 
++ZLIB = -lz
  
- ### OBJS: Will be "$(SCIDOBJS)", and also "$(ZLIBOBJS)" if they are
+ ### 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 48e872cdc858..49977a59f01d 100644
--- a/games/scid/pkg-plist
+++ b/games/scid/pkg-plist
@@ -10,10 +10,72 @@ bin/sc_tree
 bin/scid
 bin/scidlet
 bin/scidpgn
+bin/scidt
 bin/scmerge
 bin/spliteco
 bin/tcscid
 bin/tkscid
-share/scid/scid.eco
-share/scid/spelling.ssp
+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/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/html/scid.css
+share/scid/html/scid.js
+share/scid/html/bitmaps/bb.gif
+share/scid/html/bitmaps/bk.gif
+share/scid/html/bitmaps/bn.gif
+share/scid/html/bitmaps/bp.gif
+share/scid/html/bitmaps/bq.gif
+share/scid/html/bitmaps/br.gif
+share/scid/html/bitmaps/sq.gif
+share/scid/html/bitmaps/wb.gif
+share/scid/html/bitmaps/wk.gif
+share/scid/html/bitmaps/wn.gif
+share/scid/html/bitmaps/wp.gif
+share/scid/html/bitmaps/wq.gif
+share/scid/html/bitmaps/wr.gif
+share/scid/html/bitmaps/mini/bb.gif
+share/scid/html/bitmaps/mini/bk.gif
+share/scid/html/bitmaps/mini/bn.gif
+share/scid/html/bitmaps/mini/bp.gif
+share/scid/html/bitmaps/mini/bq.gif
+share/scid/html/bitmaps/mini/br.gif
+share/scid/html/bitmaps/mini/sq.gif
+share/scid/html/bitmaps/mini/wb.gif
+share/scid/html/bitmaps/mini/wk.gif
+share/scid/html/bitmaps/mini/wn.gif
+share/scid/html/bitmaps/mini/wp.gif
+share/scid/html/bitmaps/mini/wq.gif
+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/togaII1.2.1a
+@dirrm share/scid/engines
+@dirrm share/scid/html/bitmaps/mini
+@dirrm share/scid/html/bitmaps
+@dirrm share/scid/html
 @dirrm share/scid