From owner-svn-ports-all@FreeBSD.ORG Wed Mar 12 15:47:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0D8ECC1E; Wed, 12 Mar 2014 15:47:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E1E9BC92; Wed, 12 Mar 2014 15:47:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2CFlCRS070929; Wed, 12 Mar 2014 15:47:12 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2CFlBLx070924; Wed, 12 Mar 2014 15:47:11 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201403121547.s2CFlBLx070924@svn.freebsd.org> From: Pawel Pekala Date: Wed, 12 Mar 2014 15:47:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347983 - in head/games/scid: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 15:47:13 -0000 Author: pawel Date: Wed Mar 12 15:47:11 2014 New Revision: 347983 URL: http://svnweb.freebsd.org/changeset/ports/347983 QAT: https://qat.redports.org/buildarchive/r347983/ Log: - Update to version 4.4 [1] - Remove leading article from COMMENT - Fix build on 10.x by respecting CC and CXX - Support staging PR: ports/187357 [1] Submitted by: maintainer Added: head/games/scid/files/patch-configure (contents, props changed) Modified: head/games/scid/Makefile head/games/scid/distinfo head/games/scid/files/patch-Makefile.conf head/games/scid/pkg-plist Modified: head/games/scid/Makefile ============================================================================== --- head/games/scid/Makefile Wed Mar 12 15:39:14 2014 (r347982) +++ head/games/scid/Makefile Wed Mar 12 15:47:11 2014 (r347983) @@ -2,24 +2,24 @@ # $FreeBSD$ PORTNAME= scid -PORTVERSION= 4.3 +PORTVERSION= 4.4 CATEGORIES= games databases -MASTER_SITES= SF/${PORTNAME}/Scid/Scid%204.3/ +MASTER_SITES= SF/${PORTNAME}/Scid/Scid%204.4/ MAINTAINER= bsd@volki.at -COMMENT= A free chess database application +COMMENT= Free chess database application HAS_CONFIGURE= yes -USES= gmake tk:84,85 +USES= gmake tk:84,85,86 USE_BZIP2= yes USE_PYTHON= yes -USE_GMAKE= yes TCL_LIBRARY= -L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER} CONFIGURE_ARGS= \ BINDIR="${PREFIX}/bin" \ SHAREDIR="${PREFIX}/share/scid" \ + THREADS="-pthread" \ TCL_VERSION="${TCL_VER}" \ TCL_INCLUDE="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" \ TCL_LIBRARY="${TCL_LIBRARY}" \ @@ -29,7 +29,11 @@ CONFIGURE_ARGS= \ ALL_TARGET= all strip -WRKSRC= ${WRKDIR}/${PORTNAME} +post-configure: + @${REINPLACE_CMD} -e 's|g++|${CXX}|g; s|gcc|${CC}|g' \ + -e '/engines/ s|SHAREDIR|DESTDIR\)$$\(&|g' \ + ${WRKSRC}/Makefile \ + ${WRKSRC}/engines/phalanx-scid/makefile \ + ${WRKSRC}/engines/togaII1.2.1a/src/Makefile -NO_STAGE= yes .include Modified: head/games/scid/distinfo ============================================================================== --- head/games/scid/distinfo Wed Mar 12 15:39:14 2014 (r347982) +++ head/games/scid/distinfo Wed Mar 12 15:47:11 2014 (r347983) @@ -1,2 +1,2 @@ -SHA256 (scid-4.3.tar.bz2) = 3cc3405ef7d49adf633b26ec633173bf4e42aec0aeb93d857d84a34ec0c5657d -SIZE (scid-4.3.tar.bz2) = 12029115 +SHA256 (scid-4.4.tar.bz2) = ba3b01440ed7f16396360aab10a0bfe8354721c05a0a4f9e0031a800b8d781f2 +SIZE (scid-4.4.tar.bz2) = 12403187 Modified: head/games/scid/files/patch-Makefile.conf ============================================================================== --- head/games/scid/files/patch-Makefile.conf Wed Mar 12 15:39:14 2014 (r347982) +++ head/games/scid/files/patch-Makefile.conf Wed Mar 12 15:47:11 2014 (r347983) @@ -1,11 +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 @@ +--- Makefile.conf.orig 2013-03-28 18:51:58.000000000 +0100 ++++ Makefile.conf 2014-03-07 19:34:39.000000000 +0100 +@@ -302,7 +302,7 @@ ### To make the executable files smaller: type "make strip". # -strip: -+strip: $(EXECS) ++strip: $(EXECS) strip $(EXECS) ### To compress scid and executables with gzexe: type "make gzexe". Added: head/games/scid/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/scid/files/patch-configure Wed Mar 12 15:47:11 2014 (r347983) @@ -0,0 +1,32 @@ +--- configure.orig 2013-03-28 18:51:54.000000000 +0100 ++++ configure 2014-03-07 20:03:28.000000000 +0100 +@@ -13,21 +13,17 @@ + # tclsh program with a version number in the file name is found, the + # default program to execute is just tclsh. + # The backslashes at the end of these lines are needed: \ +-# tclsh=tclsh8.5; +- +-# This shell script code did not work for me in Linux so it is +-# commented out for now; the configure script will just run in +-# tclsh even if there is a more recent version. +-## for tclver in 80 8.0 81 8.1 82 8.2 83 8.3 84 8.4 85 8.5; do \ +-## IFS=:; \ +-## for dir in $PATH; do \ +-## if [ -x $dir/tclsh$tclver ]; then tclsh=$dir/tclsh$tclver; fi; \ +-## done; \ +-## done ++tclsh=tclsh8.6; \ ++for tclver in 80 8.0 81 8.1 82 8.2 83 8.3 84 8.4 85 8.5 86 8.6; do \ ++ IFS=:; \ ++ for dir in $PATH; do \ ++ if [ -x $dir/tclsh$tclver ]; then tclsh=$dir/tclsh$tclver; fi; \ ++ done; \ ++done + + # Now execute this script using the best tclsh version found: + # The backslash at the end of this line is needed: \ +-exec tclsh "$0" ${1+"$@"} ++exec $tclsh "$0" ${1+"$@"} + + # Default values for Makefile settings: + # Modified: head/games/scid/pkg-plist ============================================================================== --- head/games/scid/pkg-plist Wed Mar 12 15:39:14 2014 (r347982) +++ head/games/scid/pkg-plist Wed Mar 12 15:47:11 2014 (r347983) @@ -16,6 +16,7 @@ bin/spf2spi bin/spliteco bin/tcscid bin/tkscid +%%DATADIR%%/scid.gif %%DATADIR%%/books/Elo2400.bin %%DATADIR%%/books/Performance.bin %%DATADIR%%/books/gm2600.bin