ports/131008: [PATCH] games/scid switch to USE_TCL

[Martin Matuska]

>Number:         131008
>Category:       ports
>Synopsis:       [PATCH] games/scid switch to USE_TCL
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 26 11:50:01 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:
- switch to USE_TCL infrastructure
- add support for Tcl/Tk 84 and 85 w + w/o threads
- prepare for introduction of tcl86
- supersedes ports/130192
>How-To-Repeat:
>Fix:
Index: ports/games/scid/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/scid/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ports/games/scid/Makefile	18 Jan 2009 11:21:56 -0000	1.11
+++ ports/games/scid/Makefile	26 Jan 2009 11:45:22 -0000
@@ -8,14 +8,15 @@
 
 PORTNAME=	scid
 PORTVERSION=	3.6.26
+PORTREVISION=	1
 CATEGORIES=	games databases
 MASTER_SITES=	SF
 
 MAINTAINER=	bsd at volki.at
 COMMENT=	A free chess database application
 
-LIB_DEPENDS=	tcl85:${PORTSDIR}/lang/tcl85 \
-		tk85:${PORTSDIR}/x11-toolkits/tk85
+USE_TK=		84+
+INVALID_TCL_VER=	86
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
@@ -25,4 +26,17 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.include <bsd.port.mk>
+.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}"
+.endif
+
+.include <bsd.port.post.mk>
Index: ports/games/scid/files/patch-Makefile
===================================================================
RCS file: /home/pcvs/ports/games/scid/files/patch-Makefile,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile
--- ports/games/scid/files/patch-Makefile	18 Jan 2009 11:21:56 -0000	1.5
+++ ports/games/scid/files/patch-Makefile	26 Jan 2009 11:45:22 -0000
@@ -1,6 +1,6 @@
 --- Makefile.orig	2008-10-10 10:59:55.000000000 +0200
-+++ Makefile	2008-12-26 15:09:52.000000000 +0100
-@@ -9,11 +9,11 @@
++++ Makefile	2009-01-26 12:27:47.000000000 +0100
+@@ -9,16 +9,16 @@
  
  # BINDIR: where the Scid programs are copied for "make install".
  #
@@ -14,6 +14,12 @@
  
  ### 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:
@@ -31,9 +37,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
++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}
  
  
  ########################################
>Release-Note:
>Audit-Trail:
>Unformatted: