ports/130192: [UPDATE] games/scid to 3.6.26

Mon Jan 5 15:10:04 UTC 2009

>Number:         130192
>Category:       ports
>Synopsis:       [UPDATE] games/scid to 3.6.26
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 05 15:10:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     RebuM
>Release:        FreeBSD 7.1-RELEASE i386/amd64
>Organization:
>Environment:
System: FreeBSD 7.1-RELEASE i386/amd64
>Description:
- update to 3.6.26
- switch to USE_TCL infrastructure
- add support for Tcl/Tk 85
>How-To-Repeat:
>Fix:
Index: ports/games/scid/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/scid/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile

--- ports/games/scid/Makefile	22 Mar 2008 14:47:58 -0000	1.10
+++ ports/games/scid/Makefile	5 Jan 2009 15:07:42 -0000
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	scid
-PORTVERSION=	3.6.1
-PORTREVISION=	2
+PORTVERSION=	3.6.26
 CATEGORIES=	games databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,12 +15,22 @@
 MAINTAINER=	volkmann at inode.at
 COMMENT=	A free chess database application
 
-LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
-		tk84:${PORTSDIR}/x11-toolkits/tk84
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USE_BZIP2=	yes
+
+USE_TK=		84+
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 
 ALL_TARGET=	all strip
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+MAKE_ARGS=	TCL_VER="${TCL_VER}" \
+		TCL_LIBVER="${TCL_VER:S/.//}" \
+		TCL_LIBDIR="${TCL_LIBDIR}" \
+		TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \
+		TK_LIBDIR="${TK_LIBDIR}" \
+		TK_INCLUDEDIR="${TK_INCLUDEDIR}"
+
+.include <bsd.port.post.mk>
Index: ports/games/scid/distinfo
===================================================================
RCS file: /home/pcvs/ports/games/scid/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- ports/games/scid/distinfo	22 Jan 2006 11:18:39 -0000	1.6
+++ ports/games/scid/distinfo	5 Jan 2009 15:07:42 -0000
@@ -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
Index: ports/games/scid/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/games/scid/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- ports/games/scid/pkg-plist	27 Jan 2003 16:04:55 -0000	1.3
+++ ports/games/scid/pkg-plist	5 Jan 2009 15:07:42 -0000
@@ -8,12 +8,74 @@
 bin/sc_spell
 bin/sc_tree
 bin/scid
+bin/scidt
 bin/scidlet
 bin/scidpgn
 bin/scmerge
 bin/spliteco
 bin/tcscid
 bin/tkscid
-share/scid/scid.eco
-share/scid/spelling.ssp
+share/scid/data/scid.eco
+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/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/html/bitmaps/mini/wr.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/bb.gif
+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/scid.js
+share/scid/html/scid.css
+share/scid/engines/Phalanx-XXII/phalanx
+share/scid/engines/togaII1.2.1a/fruit
+ at dirrm share/scid/data
+ at dirrm share/scid/books
+ at dirrm share/scid/bases
+ at dirrm share/scid/html/bitmaps/mini
+ at dirrm share/scid/html/bitmaps
+ at dirrm share/scid/html
+ at dirrm share/scid/engines/Phalanx-XXII
+ at dirrm share/scid/engines/togaII1.2.1a
+ at dirrm share/scid/engines
 @dirrm share/scid
Index: ports/games/scid/files/patch-Makefile
===================================================================
RCS file: /home/pcvs/ports/games/scid/files/patch-Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile
--- ports/games/scid/files/patch-Makefile	19 Apr 2008 17:49:26 -0000	1.4
+++ ports/games/scid/files/patch-Makefile	5 Jan 2009 15:07:42 -0000
@@ -1,29 +1,45 @@
---- Makefile.orig	Wed Jan 22 03:54:00 2003
-+++ Makefile	Mon Jan 27 17:02:06 2003
-@@ -9,11 +9,11 @@
+--- Makefile.orig	2008-10-10 10:59:55.000000000 +0200
++++ Makefile	2009-01-05 15:46:54.000000000 +0100
+@@ -2,23 +2,23 @@
+ 
+ ### Compiler: Most Unix systems use g++ for compiling and linking.
+ #
+-COMPILE = g++
+-CC = gcc
+-LINK = g++
++COMPILE := ${CXX}
++CC := ${CC}
++LINK := ${CXX}
+ DESTDIR =
  
  # BINDIR: where the Scid programs are copied for "make install".
  #
 -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
  
  ### TCL_VERSION: Set this according to the version of Tcl/Tk you have
  #   installed that you want Scid to use: 8.0, 8.1, 8.2, 8.3, etc.
+ #
+-TCL_VERSION = 8.5
++TCL_VERSION = ${TCL_VER}
+ 
+ # TCL_INCLUDE, TCL_LIBRARY, TK_LIBRARY: these are the compiler options
+ #    needed for linking Scid with Tcl/Tk.  The program "./configure"
 @@ -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:
  
@@ -34,9 +50,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.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include
-+TCL_LIBRARY = -L${LOCALBASE}/lib -ltcl84
-+TK_LIBRARY  = $(TCL_LIBRARY) -ltk84 -L${LOCALBASE}/lib -lX11
++TCL_INCLUDE = -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include
++TCL_LIBRARY = -L${LOCALBASE}/lib -ltcl${TCL_LIBVER}
++TK_LIBRARY  = $(TCL_LIBRARY) -ltk${TCL_LIBVER} -L${LOCALBASE}/lib -lX11
  
  
  ########################################
@@ -58,25 +74,3 @@
  
  ### 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 @@
- 
- ### ZLIBOBJS: object files in the zlib compression library.
- #
--ZLIBOBJS= src/zlib/adler32.o src/zlib/compress.o src/zlib/crc32.o \
--      src/zlib/gzio.o src/zlib/uncompr.o src/zlib/deflate.o src/zlib/trees.o \
--      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
-+#ZLIBOBJS= src/zlib/adler32.o src/zlib/compress.o src/zlib/crc32.o \
-+#      src/zlib/gzio.o src/zlib/uncompr.o src/zlib/deflate.o src/zlib/trees.o \
-+#      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)", and also "$(ZLIBOBJS)" if they are
- #      needed on your system.
>Release-Note:
>Audit-Trail:
>Unformatted:

