Author: ranger
Date: Sun Oct 4 20:17:47 2009
New Revision: 1629
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1629&repname=user%3a+ranger>
Log:
couple of build fixes
Modified:
trunk/experimental/10.4/main/finkinfo/libs/jakarta-servletapi.info
trunk/experimental/10.4/main/finkinfo/libs/soprano.patch
trunk/experimental/common/main/finkinfo/libs/gmm.info
trunk/experimental/common/main/finkinfo/libs/jakarta-servletapi.info
trunk/experimental/common/main/finkinfo/libs/soprano.info
trunk/experimental/common/main/finkinfo/libs/soprano.patch
Modified: trunk/experimental/10.4/main/finkinfo/libs/jakarta-servletapi.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/jakarta-servletapi.info&rev=1629&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/jakarta-servletapi.info
(original)
+++ trunk/experimental/10.4/main/finkinfo/libs/jakarta-servletapi.info Sun Oct
4 20:17:47 2009
@@ -32,7 +32,7 @@
SourceDirectory: %n-4
PatchScript: perl -pi -e 's,<javac,<javac target="1.5" source="1.4",g'
build.xml
-CompileScript: ant dist
+CompileScript: ant dist -Dservletapi.build=build -Dservletapi.dist=dist
InstallScript: <<
mkdir -p %i/share/doc/%n
Modified: trunk/experimental/10.4/main/finkinfo/libs/soprano.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/soprano.patch&rev=1629&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/soprano.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/soprano.patch Sun Oct 4
20:17:47 2009
@@ -1,72 +1,12 @@
-diff -Nurd soprano-2.2.3/backends/redland/CMakeLists.txt
soprano-2.2.3-new/backends/redland/CMakeLists.txt
---- soprano-2.2.3/backends/redland/CMakeLists.txt 2009-02-02
14:29:29.000000000 -0500
-+++ soprano-2.2.3-new/backends/redland/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -49,7 +49,7 @@
+diff -Nurd soprano-2.3.1/index/CMakeLists.txt
soprano-2.3.1-new/index/CMakeLists.txt
+--- soprano-2.3.1/index/CMakeLists.txt 2009-05-06 14:36:54.000000000 -0400
++++ soprano-2.3.1-new/index/CMakeLists.txt 2009-10-04 14:10:09.000000000
-0400
+@@ -11,6 +11,8 @@
+ ${CMAKE_CURRENT_BINARY_DIR}
+ )
- qt4_automoc(${redland_backend_SRC})
-
-- add_library(soprano_redlandbackend SHARED ${redland_backend_SRC})
-+ add_library(soprano_redlandbackend MODULE ${redland_backend_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_redlandbackend soprano_redlandcore)
-
-diff -Nurd soprano-2.2.3/backends/sesame2/CMakeLists.txt
soprano-2.2.3-new/backends/sesame2/CMakeLists.txt
---- soprano-2.2.3/backends/sesame2/CMakeLists.txt 2008-12-02
08:12:08.000000000 -0500
-+++ soprano-2.2.3-new/backends/sesame2/CMakeLists.txt 2009-03-17
23:42:42.000000000 -0400
-@@ -36,7 +36,7 @@
-
- qt4_automoc(${sesame2_backend_SRC})
-
--add_library(soprano_sesame2backend SHARED ${sesame2_backend_SRC})
-+add_library(soprano_sesame2backend MODULE ${sesame2_backend_SRC})
-
- target_link_libraries(soprano_sesame2backend soprano ${JAVA_JVM_LIBRARY})
-
-diff -Nurd soprano-2.2.3/parsers/nquads/CMakeLists.txt
soprano-2.2.3-new/parsers/nquads/CMakeLists.txt
---- soprano-2.2.3/parsers/nquads/CMakeLists.txt 2007-11-23
04:56:23.000000000 -0500
-+++ soprano-2.2.3-new/parsers/nquads/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -13,7 +13,7 @@
-
- qt4_automoc(${nquadparser_SRC})
-
--add_library(soprano_nquadparser SHARED ${nquadparser_SRC})
-+add_library(soprano_nquadparser MODULE ${nquadparser_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_nquadparser soprano)
-
-diff -Nurd soprano-2.2.3/parsers/raptor/CMakeLists.txt
soprano-2.2.3-new/parsers/raptor/CMakeLists.txt
---- soprano-2.2.3/parsers/raptor/CMakeLists.txt 2007-10-15
14:23:31.000000000 -0400
-+++ soprano-2.2.3-new/parsers/raptor/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -17,7 +17,7 @@
-
- qt4_automoc(${raptor_parser_SRC})
-
--add_library(soprano_raptorparser SHARED ${raptor_parser_SRC})
-+add_library(soprano_raptorparser MODULE ${raptor_parser_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_raptorparser soprano ${RAPTOR_LIBRARIES})
-
-diff -Nurd soprano-2.2.3/serializers/nquads/CMakeLists.txt
soprano-2.2.3-new/serializers/nquads/CMakeLists.txt
---- soprano-2.2.3/serializers/nquads/CMakeLists.txt 2007-11-23
04:56:23.000000000 -0500
-+++ soprano-2.2.3-new/serializers/nquads/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -13,7 +13,7 @@
-
- qt4_automoc(${nquadserializer_SRC})
-
--add_library(soprano_nquadserializer SHARED ${nquadserializer_SRC})
-+add_library(soprano_nquadserializer MODULE ${nquadserializer_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_nquadserializer soprano)
-
-diff -Nurd soprano-2.2.3/serializers/raptor/CMakeLists.txt
soprano-2.2.3-new/serializers/raptor/CMakeLists.txt
---- soprano-2.2.3/serializers/raptor/CMakeLists.txt 2008-07-10
03:41:35.000000000 -0400
-+++ soprano-2.2.3-new/serializers/raptor/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -25,7 +25,7 @@
-
- qt4_automoc(${raptor_serializer_SRC})
-
--add_library(soprano_raptorserializer SHARED ${raptor_serializer_SRC})
-+add_library(soprano_raptorserializer MODULE ${raptor_serializer_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_raptorserializer soprano soprano_redlandcore
${RAPTOR_LIBRARIES})
-
++add_definitions(-I${CLUCENE_INCLUDE_DIR})
++
+ set( SOPRANO_INDEX_SRCS
+ cluceneindex.cpp
+ clucenedocumentwrapper.cpp
Modified: trunk/experimental/common/main/finkinfo/libs/gmm.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/gmm.info&rev=1629&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/gmm.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/gmm.info Sun Oct 4 20:17:47
2009
@@ -1,9 +1,22 @@
Package: gmm
Version: 3.1
-Revision: 1
+Revision: 2
Source: http://download.gna.org/getfem/stable/%n-%v.tar.gz
Source-MD5: 5706d23bf3bb6d06d3d7e5889cf8554d
BuildDependsOnly: true
+GCC: 4.0
+CompileScript: <<
+#!/bin/sh
+
+ if [ -x /usr/bin/gcc-4.2 ]; then
+ export CC=gcc-4.2 CXX=g++-4.2 CPP=cpp-4.2
+ else
+ export CC=gcc-4.0 CXX=g++-4.0 CPP=cpp-4.0
+ fi
+ ./configure %c
+ make
+<<
+InstallScript: make -j1 install DESTDIR="%d"
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
Description: C++ template library for matrices
Maintainer: Benjamin Reed <g...@fink.racoonfink.com>
Modified: trunk/experimental/common/main/finkinfo/libs/jakarta-servletapi.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/jakarta-servletapi.info&rev=1629&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/jakarta-servletapi.info
(original)
+++ trunk/experimental/common/main/finkinfo/libs/jakarta-servletapi.info Sun
Oct 4 20:17:47 2009
@@ -20,7 +20,7 @@
xerces-j (>= 2.0-1),
system-java (>= 1.5-1)
<<
-CompileScript: ant dist
+CompileScript: ant dist -Dservletapi.build=build -Dservletapi.dist=dist
JarFiles: dist/lib/*.jar
InstallScript: <<
mkdir -p %i/share/doc/%n
Modified: trunk/experimental/common/main/finkinfo/libs/soprano.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/soprano.info&rev=1629&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/soprano.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/soprano.info Sun Oct 4
20:17:47 2009
@@ -38,7 +38,7 @@
Source: mirror:sourceforge:soprano/soprano-%v.tar.bz2
Source-MD5: c9a2c008b80cd5d76599e9d48139dfe9
#PatchFile: soprano.patch
-#PatchFile-MD5: a969bb1a3459268857fcd13c3a92c2c0
+#PatchFile-MD5: c5389f083e21faf50d2ab9558b859c33
PatchScript: find . -name CMakeLists.txt | xargs perl -pi -e
's,include/Soprano,include/soprano,g'
CompileScript: <<
Modified: trunk/experimental/common/main/finkinfo/libs/soprano.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/soprano.patch&rev=1629&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/soprano.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/soprano.patch Sun Oct 4
20:17:47 2009
@@ -1,72 +1,12 @@
-diff -Nurd soprano-2.2.3/backends/redland/CMakeLists.txt
soprano-2.2.3-new/backends/redland/CMakeLists.txt
---- soprano-2.2.3/backends/redland/CMakeLists.txt 2009-02-02
14:29:29.000000000 -0500
-+++ soprano-2.2.3-new/backends/redland/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -49,7 +49,7 @@
+diff -Nurd soprano-2.3.1/index/CMakeLists.txt
soprano-2.3.1-new/index/CMakeLists.txt
+--- soprano-2.3.1/index/CMakeLists.txt 2009-05-06 14:36:54.000000000 -0400
++++ soprano-2.3.1-new/index/CMakeLists.txt 2009-10-04 14:10:09.000000000
-0400
+@@ -11,6 +11,8 @@
+ ${CMAKE_CURRENT_BINARY_DIR}
+ )
- qt4_automoc(${redland_backend_SRC})
-
-- add_library(soprano_redlandbackend SHARED ${redland_backend_SRC})
-+ add_library(soprano_redlandbackend MODULE ${redland_backend_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_redlandbackend soprano_redlandcore)
-
-diff -Nurd soprano-2.2.3/backends/sesame2/CMakeLists.txt
soprano-2.2.3-new/backends/sesame2/CMakeLists.txt
---- soprano-2.2.3/backends/sesame2/CMakeLists.txt 2008-12-02
08:12:08.000000000 -0500
-+++ soprano-2.2.3-new/backends/sesame2/CMakeLists.txt 2009-03-17
23:42:42.000000000 -0400
-@@ -36,7 +36,7 @@
-
- qt4_automoc(${sesame2_backend_SRC})
-
--add_library(soprano_sesame2backend SHARED ${sesame2_backend_SRC})
-+add_library(soprano_sesame2backend MODULE ${sesame2_backend_SRC})
-
- target_link_libraries(soprano_sesame2backend soprano ${JAVA_JVM_LIBRARY})
-
-diff -Nurd soprano-2.2.3/parsers/nquads/CMakeLists.txt
soprano-2.2.3-new/parsers/nquads/CMakeLists.txt
---- soprano-2.2.3/parsers/nquads/CMakeLists.txt 2007-11-23
04:56:23.000000000 -0500
-+++ soprano-2.2.3-new/parsers/nquads/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -13,7 +13,7 @@
-
- qt4_automoc(${nquadparser_SRC})
-
--add_library(soprano_nquadparser SHARED ${nquadparser_SRC})
-+add_library(soprano_nquadparser MODULE ${nquadparser_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_nquadparser soprano)
-
-diff -Nurd soprano-2.2.3/parsers/raptor/CMakeLists.txt
soprano-2.2.3-new/parsers/raptor/CMakeLists.txt
---- soprano-2.2.3/parsers/raptor/CMakeLists.txt 2007-10-15
14:23:31.000000000 -0400
-+++ soprano-2.2.3-new/parsers/raptor/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -17,7 +17,7 @@
-
- qt4_automoc(${raptor_parser_SRC})
-
--add_library(soprano_raptorparser SHARED ${raptor_parser_SRC})
-+add_library(soprano_raptorparser MODULE ${raptor_parser_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_raptorparser soprano ${RAPTOR_LIBRARIES})
-
-diff -Nurd soprano-2.2.3/serializers/nquads/CMakeLists.txt
soprano-2.2.3-new/serializers/nquads/CMakeLists.txt
---- soprano-2.2.3/serializers/nquads/CMakeLists.txt 2007-11-23
04:56:23.000000000 -0500
-+++ soprano-2.2.3-new/serializers/nquads/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -13,7 +13,7 @@
-
- qt4_automoc(${nquadserializer_SRC})
-
--add_library(soprano_nquadserializer SHARED ${nquadserializer_SRC})
-+add_library(soprano_nquadserializer MODULE ${nquadserializer_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_nquadserializer soprano)
-
-diff -Nurd soprano-2.2.3/serializers/raptor/CMakeLists.txt
soprano-2.2.3-new/serializers/raptor/CMakeLists.txt
---- soprano-2.2.3/serializers/raptor/CMakeLists.txt 2008-07-10
03:41:35.000000000 -0400
-+++ soprano-2.2.3-new/serializers/raptor/CMakeLists.txt 2009-03-17
23:42:21.000000000 -0400
-@@ -25,7 +25,7 @@
-
- qt4_automoc(${raptor_serializer_SRC})
-
--add_library(soprano_raptorserializer SHARED ${raptor_serializer_SRC})
-+add_library(soprano_raptorserializer MODULE ${raptor_serializer_SRC})
-
- TARGET_LINK_LIBRARIES(soprano_raptorserializer soprano soprano_redlandcore
${RAPTOR_LIBRARIES})
-
++add_definitions(-I${CLUCENE_INCLUDE_DIR})
++
+ set( SOPRANO_INDEX_SRCS
+ cluceneindex.cpp
+ clucenedocumentwrapper.cpp
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
