Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv11873/10.4/stable/main/finkinfo/sci
Modified Files:
classicladder.info classicladder.patch
Log Message:
New upstream.
Index: classicladder.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/classicladder.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- classicladder.info 21 Mar 2012 20:00:53 -0000 1.12
+++ classicladder.info 23 Aug 2012 14:17:46 -0000 1.13
@@ -1,10 +1,10 @@
Package: classicladder
-Version: 0.9.004
+Version: 0.9.005
Revision: 1
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Description: Free ladder logic simulator in C
Source: mirror:sourceforge:%n/%n-%v.zip
-Source-MD5: cd1e641920848f902f575541b327d5cd
+Source-MD5: 51ea609beaf2ff369f9ea193b30ef5e6
SourceDirectory:%n
Depends: <<
atk1-shlibs (>= 1.20.0-1), cairo-shlibs (>= 1.8.10-3), gtk+2-shlibs
(>=2.18.9-5),
@@ -20,7 +20,7 @@
x11-dev
<<
PatchFile: %n.patch
-PatchFile-MD5: 99a71b386f42f9504c7952134b3d93e2
+PatchFile-MD5: db9387dd6a8742616fca1f93e023517a
CompileScript: <<
#!/bin/sh -ev
export
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
@@ -63,6 +63,8 @@
<<
DescPackaging: <<
Install example files in %p/share.
+Patch to ensure that Fink's fontconfig2 is used.
+Misses an -lz, so patch that in, too.
<<
DescPort: <<
I/O support disabled even on Intels, as it's apparently Linux-centric.
Index: classicladder.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/classicladder.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- classicladder.patch 21 Mar 2012 20:00:53 -0000 1.4
+++ classicladder.patch 23 Aug 2012 14:17:46 -0000 1.5
@@ -1,7 +1,7 @@
diff -Nurd classicladder/Makefile classicladder.patched/Makefile
---- classicladder/Makefile 2012-03-10 06:40:42.000000000 -0700
-+++ classicladder.patched/Makefile 2012-03-21 11:49:42.000000000 -0700
-@@ -35,7 +35,7 @@
+--- classicladder/Makefile 2012-08-17 05:27:03.000000000 -0700
++++ classicladder.patched/Makefile 2012-08-23 07:04:02.000000000 -0700
+@@ -29,7 +29,7 @@
###ifndef WINDOWS
# Comment if you do not want the I/O access (not x86 platform)
# Used in the hardware.c file.
@@ -9,24 +9,24 @@
+#MAKE_IO_ACCESS = 1
###endif
- # Comment if you do not want to support this language
-@@ -65,8 +65,8 @@
- INCLUDEDIR=${PREFIX}/include
+ # Uncomment the following flag to make the MAT connection version
+@@ -71,8 +71,8 @@
+ endif
ifdef GTK_INTERFACE
--OWN_CFLAGS = -Wall `pkg-config gtk+-2.0 --cflags` `pkg-config pango --cflags`
`pkg-config gthread-2.0 --cflags` -DGTK_INTERFACE -DGTK2
+-OWN_CFLAGS += -Wall `pkg-config gtk+-2.0 --cflags` `pkg-config pango
--cflags` `pkg-config gthread-2.0 --cflags` -DGTK_INTERFACE -DGTK2
-OWN_LIBS += `pkg-config gtk+-2.0 --cflags --libs` `pkg-config pango --cflags
--libs` `pkg-config gthread-2.0 --cflags --libs`
-+OWN_CFLAGS = -Wall `pkg-config --cflags fontconfig` `pkg-config gtk+-2.0
--cflags` `pkg-config pango --cflags` `pkg-config gthread-2.0 --cflags`
-DGTK_INTERFACE -DGTK2
++OWN_CFLAGS += -Wall `pkg-config --cflags fontconfig` `pkg-config gtk+-2.0
--cflags` `pkg-config pango --cflags` `pkg-config gthread-2.0 --cflags`
-DGTK_INTERFACE -DGTK2
+OWN_LIBS += `pkg-config --cflags --libs fontconfig` `pkg-config gtk+-2.0
--cflags --libs` `pkg-config pango --cflags --libs` `pkg-config gthread-2.0
--cflags --libs`
###ifdef GNOME_PRINT
###OWN_CFLAGS += `pkg-config --cflags libgnomeprintui-2.2` -DGNOME_PRINT_USE
###OWN_LIBS += `pkg-config --libs libgnomeprintui-2.2`
diff -Nurd classicladder/tasks.h classicladder.patched/tasks.h
---- classicladder/tasks.h 2012-02-20 12:46:09.000000000 -0700
-+++ classicladder.patched/tasks.h 2012-03-21 11:55:43.000000000 -0700
+--- classicladder/tasks.h 2012-08-02 06:08:36.000000000 -0700
++++ classicladder.patched/tasks.h 2012-08-23 06:59:39.000000000 -0700
@@ -1,4 +1,4 @@
-
+#include <time.h>
#define NBR_TASKS 10
- #define ID_TASK_LOGIC 0
+ #define ID_TASK_SCAN_INPUTS 0
------------------------------------------------------------------------------
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
