Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Mar 2014 22:07:46 GMT
From:      Friedrich Volkmann <bsd@volki.at>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/187357: update games/scid to 4.4
Message-ID:  <201403072207.s27M7kkm024795@cgiserv.freebsd.org>
Resent-Message-ID: <201403072210.s27MA07r034315@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         187357
>Category:       ports
>Synopsis:       update games/scid to 4.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 07 22:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Friedrich Volkmann
>Release:        9.2-STABLE
>Organization:
>Environment:
FreeBSD daemon.volki.at 9.2-STABLE FreeBSD 9.2-STABLE #0 r258254: Sun Nov 17 15:16:10 CET 2013     root@daemon.volki.at:/usr/obj/usr/src/sys/CU05  i386
>Description:
- update games/scid to current stable version 4.4
- hopefully fix build error caused by the removal of GCC from the base system
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN scid.orig/Makefile scid/Makefile
--- scid.orig/Makefile	2014-03-05 12:55:42.000000000 +0100
+++ scid/Makefile	2014-03-07 22:31:07.000000000 +0100
@@ -2,24 +2,26 @@
 # $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
 
 HAS_CONFIGURE=	yes
-USES=		gmake tk:84,85
+USES=		gmake tk:84,85,86
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
+USE_GCC=	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 +31,7 @@
 
 ALL_TARGET=	all strip
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+#WRKSRC=		${WRKDIR}/${PORTNAME}
 
 NO_STAGE=	yes
 .include <bsd.port.mk>
diff -ruN scid.orig/distinfo scid/distinfo
--- scid.orig/distinfo	2014-02-10 19:15:36.000000000 +0100
+++ scid/distinfo	2014-03-07 19:25:06.000000000 +0100
@@ -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
diff -ruN scid.orig/files/patch-Makefile.conf scid/files/patch-Makefile.conf
--- scid.orig/files/patch-Makefile.conf	2014-02-10 19:15:36.000000000 +0100
+++ scid/files/patch-Makefile.conf	2014-03-07 19:37:03.000000000 +0100
@@ -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".
diff -ruN scid.orig/files/patch-configure scid/files/patch-configure
--- scid.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ scid/files/patch-configure	2014-03-07 20:04:52.000000000 +0100
@@ -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:
+ #
diff -ruN scid.orig/pkg-plist scid/pkg-plist
--- scid.orig/pkg-plist	2014-02-10 19:15:36.000000000 +0100
+++ scid/pkg-plist	2014-03-07 19:31:40.000000000 +0100
@@ -16,6 +16,7 @@
 bin/spliteco
 bin/tcscid
 bin/tkscid
+%%DATADIR%%/scid.gif
 %%DATADIR%%/books/Elo2400.bin
 %%DATADIR%%/books/Performance.bin
 %%DATADIR%%/books/gm2600.bin


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403072207.s27M7kkm024795>