diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2009-02-02 11:44:26 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2009-02-02 11:44:26 +0000 |
| commit | e7d914cc096a06a3f1337c77b8a012a7ce085c1b (patch) | |
| tree | 44b0d2ad39d2f0d51dc26214c03b3910dc6cd7dd /games/scid | |
| parent | 8778ccc5a2a10768754d06a3a644886431e2db11 (diff) | |
| download | ports-e7d914cc096a06a3f1337c77b8a012a7ce085c1b.tar.gz ports-e7d914cc096a06a3f1337c77b8a012a7ce085c1b.zip | |
Notes
Diffstat (limited to 'games/scid')
| -rw-r--r-- | games/scid/Makefile | 20 | ||||
| -rw-r--r-- | games/scid/files/patch-Makefile | 16 |
2 files changed, 28 insertions, 8 deletions
diff --git a/games/scid/Makefile b/games/scid/Makefile index c429671f277f..754996634d72 100644 --- a/games/scid/Makefile +++ b/games/scid/Makefile @@ -8,14 +8,15 @@ PORTNAME= scid PORTVERSION= 3.6.26 +PORTREVISION= 1 CATEGORIES= games databases MASTER_SITES= SF MAINTAINER= bsd@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 @@ ALL_TARGET= all strip 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> diff --git a/games/scid/files/patch-Makefile b/games/scid/files/patch-Makefile index fee7a95f6855..d141549d3334 100644 --- a/games/scid/files/patch-Makefile +++ b/games/scid/files/patch-Makefile @@ -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} ######################################## |