5 files changed, 76 insertions, 161 deletions

diff --git a/games/scid/Makefile b/games/scid/Makefile
index ca30642720dc..039233f8ea09 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	scid
-PORTVERSION=	4.2.2
+PORTVERSION=	4.3
 CATEGORIES=	games databases
-MASTER_SITES=	SF/${PORTNAME}/Scid/Scid%204.2/
+MASTER_SITES=	SF/${PORTNAME}/Scid/Scid%204.3/
 
 MAINTAINER=	bsd@volki.at
 COMMENT=	A free chess database application
@@ -17,25 +17,32 @@ COMMENT=	A free chess database application
 USE_TK=		84+
 INVALID_TCL_VER=	86
 
+HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
+TCL_LIBRARY=	-L${LOCALBASE}/lib -ltcl${USE_TCL}${_TCL_THREADS_SUFFIX}
+
+CONFIGURE_ARGS=	\
+    BINDIR="${PREFIX}/bin" \
+    SHAREDIR="${PREFIX}/share/scid" \
+    TCL_VERSION="${TCL_VER}" \
+    TCL_INCLUDE="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" \
+    TCL_LIBRARY="${TCL_LIBRARY}" \
+    TK_LIBRARY="${TCL_LIBRARY} -ltk${USE_TK}${_TCL_THREADS_SUFFIX} -lX11" \
+    OPTIMIZE="${CXXFLAGS} -fno-rtti -fno-exceptions" \
+    WARNINGS=""
 
 ALL_TARGET=	all strip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
-MAKE_ARGS+=	TCL_VER="${TCL_VER}" \
-		TCL_LIBVER="${TCL_VER:S/.//}" \
-		TCL_THREADS_SUFFIX="${_TCL_THREADS_SUFFIX}" \
-		TCL_LIBDIR="${TCL_LIBDIR}" \
-		TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \
-		TK_LIBDIR="${TK_LIBDIR}" \
-		TK_INCLUDEDIR="${TK_INCLUDEDIR}"
 
 .if defined(USE_TCL_THREADS)
-MAKE_ARGS+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+TCL_LIBRARY+=	${PTHREAD_LIBS}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/scid/distinfo b/games/scid/distinfo
index c8c1422f7749..b5404e155028 100644
--- a/games/scid/distinfo
+++ b/games/scid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scid-4.2.2.tar.bz2) = 24a22e7e8abf3a0e1f1cc52c0fa9ecfcca8432324a229e49973faf41c20bb673
-SIZE (scid-4.2.2.tar.bz2) = 14045085
+SHA256 (scid-4.3.tar.bz2) = 3cc3405ef7d49adf633b26ec633173bf4e42aec0aeb93d857d84a34ec0c5657d
+SIZE (scid-4.3.tar.bz2) = 12029115
diff --git a/games/scid/files/patch-Makefile b/games/scid/files/patch-Makefile
deleted file mode 100644
index a56702cd2fa5..000000000000
--- a/games/scid/files/patch-Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
---- 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".
- #
--BINDIR = /usr/local/bin
-+BINDIR = ${PREFIX}/bin
- 
- # 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 @@
- #
- # 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) -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:
- 
-@@ -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}
- 
- 
- ########################################
-@@ -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.
- #
--OPTIMIZE = -O4 -fno-rtti -fno-exceptions
-+OPTIMIZE = ${CXXFLAGS} -fno-rtti -fno-exceptions
- 
- ### DEBUG: Defining the macro ASSERTIONS will turn on assertions, which
- #       helps to track bugs after modifications, but the programs will run 
-@@ -91,7 +90,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,11 +142,11 @@
- 
- ### 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.
diff --git a/games/scid/files/patch-Makefile.conf b/games/scid/files/patch-Makefile.conf
new file mode 100644
index 000000000000..209eb1efbdff
--- /dev/null
+++ b/games/scid/files/patch-Makefile.conf
@@ -0,0 +1,11 @@
+--- Makefile.conf.orig	2011-02-15 19:01:57.000000000 +0100
++++ Makefile.conf	2012-02-04 12:19:08.000000000 +0100
+@@ -300,7 +300,7 @@
+ 
+ ### To make the executable files smaller: type "make strip".
+ #
+-strip:
++strip: $(EXECS)
+ 	strip $(EXECS)
+ 
+ ### To compress scid and executables with gzexe: type "make gzexe".
diff --git a/games/scid/pkg-plist b/games/scid/pkg-plist
index dee877bd8737..ea62d39a84ac 100644
--- a/games/scid/pkg-plist
+++ b/games/scid/pkg-plist
@@ -16,67 +16,49 @@ bin/spf2spi
 bin/spliteco
 bin/tcscid
 bin/tkscid
-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-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
-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-scid
-@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
+%%DATADIR%%/books/Elo2400.bin
+%%DATADIR%%/books/Performance.bin
+%%DATADIR%%/books/gm2600.bin
+%%DATADIR%%/books/readme.txt
+%%DATADIR%%/books/varied.bin
+%%DATADIR%%/data/scid.eco
+%%DATADIR%%/engines/phalanx-scid/phalanx-scid
+%%DATADIR%%/engines/togaII1.2.1a/togaII
+%%DATADIR%%/html/scid.css
+%%DATADIR%%/html/scid.js
+%%DATADIR%%/html/bitmaps/bb.gif
+%%DATADIR%%/html/bitmaps/bk.gif
+%%DATADIR%%/html/bitmaps/bn.gif
+%%DATADIR%%/html/bitmaps/bp.gif
+%%DATADIR%%/html/bitmaps/bq.gif
+%%DATADIR%%/html/bitmaps/br.gif
+%%DATADIR%%/html/bitmaps/sq.gif
+%%DATADIR%%/html/bitmaps/wb.gif
+%%DATADIR%%/html/bitmaps/wk.gif
+%%DATADIR%%/html/bitmaps/wn.gif
+%%DATADIR%%/html/bitmaps/wp.gif
+%%DATADIR%%/html/bitmaps/wq.gif
+%%DATADIR%%/html/bitmaps/wr.gif
+%%DATADIR%%/html/bitmaps/mini/bb.gif
+%%DATADIR%%/html/bitmaps/mini/bk.gif
+%%DATADIR%%/html/bitmaps/mini/bn.gif
+%%DATADIR%%/html/bitmaps/mini/bp.gif
+%%DATADIR%%/html/bitmaps/mini/bq.gif
+%%DATADIR%%/html/bitmaps/mini/br.gif
+%%DATADIR%%/html/bitmaps/mini/sq.gif
+%%DATADIR%%/html/bitmaps/mini/wb.gif
+%%DATADIR%%/html/bitmaps/mini/wk.gif
+%%DATADIR%%/html/bitmaps/mini/wn.gif
+%%DATADIR%%/html/bitmaps/mini/wp.gif
+%%DATADIR%%/html/bitmaps/mini/wq.gif
+%%DATADIR%%/html/bitmaps/mini/wr.gif
+@dirrm %%DATADIR%%/books
+@dirrm %%DATADIR%%/bases
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/engines/phalanx-scid
+@dirrm %%DATADIR%%/engines/togaII1.2.1a
+@dirrm %%DATADIR%%/engines
+@dirrm %%DATADIR%%/html/bitmaps/mini
+@dirrm %%DATADIR%%/html/bitmaps
+@dirrm %%DATADIR%%/html
+@dirrm %%DATADIR%%