Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/games
In directory vz-cvs-3.sog:/tmp/cvs-serv9424/stable/main/finkinfo/games

Modified Files:
        scid.info scid.patch 
Log Message:
latest %v to stable; knock down -O4 to -O2 to fix build-failure on 10.6/xcode4.2


Index: scid.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/games/scid.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scid.info   27 Aug 2009 11:27:48 -0000      1.3
+++ scid.info   1 Jun 2012 03:41:38 -0000       1.4
@@ -1,15 +1,31 @@
 Package: scid
-Version: 3.5
-Revision: 1001
+Version: 3.6.26
+Revision: 1002
+
+# tied to tcltk version (8.4 on i386/ppc, 8.5 on x86_64). See .patch
 Architecture: i386, powerpc
+
 GCC: 4.0
-BuildDepends: tcltk-dev (>= 8.4), x11-dev, fink (>= 0.24.12-1)
-Depends: tcltk (>= 8.4)
+BuildDepends: tcltk-dev (>= 8.4), x11-dev, guile18-dev, fink (>= 0.24.12-1)
+Depends: tcltk (>= 8.4), guile18-shlibs
 Recommends: chess-tex
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 0748b222ec1c06a5a1764e6515e04e70
+Source: mirror:sourceforge:%n/%n-%v.tar.bz2
+Source-MD5: fdf70539bca21513c33ca6d3d031ec9d
+SourceDirectory: %n
 PatchFile: %n.patch
-PatchFile-MD5: e116657e2ed5f1efdeb8607ab30b8f3d
+PatchFile-MD5: 224b8fed247d2790bc908c6b501c5181
+PatchScript: <<
+#!/bin/sh -ev
+       %{default_script}
+
+       # -O4 leads to all sorts of "Unknown instruction for
+       # architecture i386" and "Invalid ALLOCA record for
+       # architecture i386" during linking (might be fixable by
+       # controlling whether using gcc or llvm?) -- dmacks
+       if [ %m = "i386" ]; then
+               perl -pi -e 's/(OPTIMIZE =) -O4/\1 -O2/' Makefile
+       fi
+<<
 CompileScript: <<
 make prefix=%p
 <<

Index: scid.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/games/scid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scid.patch  11 Feb 2006 15:52:24 -0000      1.1
+++ scid.patch  1 Jun 2012 03:41:38 -0000       1.2
@@ -1,16 +1,9 @@
-diff -ru scid-3.4-orig/Makefile scid-3.4/Makefile
---- scid-3.4-orig/Makefile     Wed Feb  5 14:35:38 2003
-+++ scid-3.4/Makefile  Wed Feb  5 14:37:43 2003
-@@ -2,23 +2,24 @@
- 
- ### Compiler: Most Unix systems use g++ for compiling and linking.
- #
--COMPILE = g++
--CC = gcc
--LINK = g++
-+COMPILE = c++
-+CC = cc
-+LINK = c++
+diff -ruN scid-orig/Makefile scid/Makefile
+--- scid-orig/Makefile 2009-01-02 00:21:46.000000000 +0100
++++ scid/Makefile      2009-01-02 00:29:56.000000000 +0100
+@@ -6,19 +6,20 @@
+ CC = gcc
+ LINK = g++
  DESTDIR =
 +prefix = /usr/local
  
@@ -19,7 +12,7 @@
 -BINDIR = /usr/local/bin
 +BINDIR = $(prefix)/bin
  
- # SHAREDIR: where scid.eco and spelling.ssp are copied for "make install".
+ # SHAREDIR: where scid.eco is copied for "make install".
  #
 -SHAREDIR = /usr/local/share/scid
 +SHAREDIR = $(prefix)/share/scid
@@ -27,38 +20,21 @@
  ### 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.3
+-TCL_VERSION = 8.5
 +TCL_VERSION = 8.4
  
  # TCL_INCLUDE, TCL_LIBRARY, TK_LIBRARY: these are the compiler options
  #    needed for linking Scid with Tcl/Tk.  The program "./configure"
-@@ -27,15 +28,15 @@
+@@ -27,9 +28,9 @@
  #
- # You have not run "./configure" yet.  The default settings are:
+ # The settings determined by "./configure" are:
  #
--TCL_INCLUDE = -I/usr/include
--TCL_LIBRARY = -L/usr/lib -ltcl$(TCL_VERSION) -ldl
+-TCL_INCLUDE = -I/usr/local/ActiveTcl8.5/include
+-TCL_LIBRARY = -L/usr/local/ActiveTcl8.5/lib -ltcl$(TCL_VERSION) -ldl
+-TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L/usr/lib -lX11
 +TCL_INCLUDE = -I$(prefix)/include -I/usr/X11R6/include
 +TCL_LIBRARY = -L$(prefix)/lib -ltcl$(TCL_VERSION) -ldl
- TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L/usr/X11R6/lib -lX11
++TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L/usr/X11R6/lib -lX11
  
  ### Here are other commonly used settings for the Tcl/Tk compiler options:
  
- ### Linux (Red Hat and other distributions):
--# TCL_INCLUDE = -I /usr/include
--# TCL_LIBRARY = -L /usr/lib -ltcl$(TCL_VERSION) -ldl
-+# TCL_INCLUDE = -I $(prefix)/include
-+# TCL_LIBRARY = -L $(prefix)/lib -ltcl$(TCL_VERSION) -ldl
- # TK_LIBRARY  = $(TCL_LIBRARY) -ltk$(TCL_VERSION) -L /usr/X11R6/lib -lX11
- 
- ### Solaris:
-@@ -183,6 +184,7 @@
- 
- old-install: all
-       chmod 755 scid $(SCRIPTS) $(EXECS)
-+      -mkdir -p $(BINDIR)
-       cp scid $(SCRIPTS) $(EXECS) $(BINDIR)
-       -mkdir -p $(SHAREDIR)
-       -chmod a+rx $(SHAREDIR)
-Only in scid-3.4: Makefile.rej
-Only in scid-3.4: Makefile~


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to