Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23755
Modified Files:
boost1.35..info boost1.41.cmake.info boost1.46.1.cmake.info
Log Message:
prepare for boost1.52.0.cmake and boost1.53.*
Index: boost1.46.1.cmake.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/boost1.46.1.cmake.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- boost1.46.1.cmake.info 21 Oct 2012 00:23:00 -0000 1.3
+++ boost1.46.1.cmake.info 17 Jun 2013 18:54:11 -0000 1.4
@@ -1,6 +1,6 @@
Package: boost1.46.1.cmake
Version: 1.46.1
-Revision: 2
+Revision: 3
Description: Boost C++ Libraries
DescDetail: <<
The Boost web site provides free peer-reviewed portable C++ source
@@ -30,6 +30,7 @@
Depends: %n-shlibs (= %v-%r)
BuildDepends: fink (>= 0.24.12), cmake (>= 2.6.4)
BuildDependsOnly: true
+### Always include ALL boost variants in Conflicts
Conflicts: <<
boost-foreach,
boost1.31,
@@ -49,8 +50,19 @@
boost1.35.python26,
boost1.35.python27,
boost1.35.nopython,
- boost1.41.cmake
+ boost1.41.cmake,
+ boost1.46.1.cmake,
+ boost1.52.0.cmake,
+ boost1.53.systempython,
+ boost1.53.python25,
+ boost1.53.python26,
+ boost1.53.python27,
+ boost1.53.python31,
+ boost1.53.python32,
+ boost1.53.python33,
+ boost1.53.nopython
<<
+### Always include ALL boost variants in Replaces
Replaces: <<
boost-foreach,
boost1.31,
@@ -70,7 +82,17 @@
boost1.35.python26,
boost1.35.python27,
boost1.35.nopython,
- boost1.41.cmake
+ boost1.41.cmake,
+ boost1.46.1.cmake,
+ boost1.52.0.cmake,
+ boost1.53.systempython,
+ boost1.53.python25,
+ boost1.53.python26,
+ boost1.53.python27,
+ boost1.53.python31,
+ boost1.53.python32,
+ boost1.53.python33,
+ boost1.53.nopython
<<
CompileScript: <<
@@ -81,8 +103,8 @@
-DWITH_DOXYGEN=off -DWITH_ICU=off -DWITH_MPI=off \
-DBZIP2_INCLUDE_DIR=/usr/include \
-DBZIP2_LIBRARIES=/usr/lib/libbz2.dylib \
- -DPYTHON_INCLUDE_PATH=/usr/include/python2.5 \
- -DPYTHON_EXECUTABLE=/usr/bin/python2.5 \
+ -DPYTHON_INCLUDE_PATH=/usr/include/python2.7 \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \
-DPYTHON_LIBRARIES="-framework Python" \
-DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc
make
Index: boost1.35..info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/boost1.35..info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- boost1.35..info 14 Sep 2012 08:00:47 -0000 1.4
+++ boost1.35..info 17 Jun 2013 18:54:11 -0000 1.5
@@ -1,7 +1,7 @@
Info2: <<
Package: boost1.35.%type_pkg[python]
Version: 1.35.0
-Revision: 12
+Revision: 13
Type: python (nopython systempython python2.5 python2.6 python2.7)
Distribution: (%type_raw[python] = python2.5) 10.5, (%type_raw[python] =
python2.5) 10.6
@@ -11,11 +11,13 @@
BuildDepends: boost-jam, (%type_num[python]) %type_pkg[python], fink (>=
0.27.2)
BuildDependsOnly: True
#BuildConflicts: (%type_pkg[python] != nopython) python
+### Conflicts gets ALL variants for OTHER boost versions
+### For same boost version, conditional all on " !nopython " BUT omit the
nopython variant.
Conflicts: <<
boost1.31, boost1.32-py23, boost1.32-py24, boost1.32.python, boost1.33,
boost-foreach,
- boost1.34.systempython,
- boost1.34.python23,
- boost1.34.python24,
+ boost1.34.systempython,
+ boost1.34.python23,
+ boost1.34.python24,
boost1.34.python25,
(%type_pkg[python] != nopython) boost1.35.systempython,
(%type_pkg[python] != nopython) boost1.35.python23,
@@ -24,15 +26,25 @@
(%type_pkg[python] != nopython) boost1.35.python26,
(%type_pkg[python] != nopython) boost1.35.python27,
boost1.41.cmake,
- boost1.46.1.cmake
-<<
+ boost1.46.1.cmake,
+ boost1.52.0.cmake,
+ boost1.53.systempython,
+ boost1.53.python25,
+ boost1.53.python26,
+ boost1.53.python27,
+ boost1.53.python31,
+ boost1.53.python32,
+ boost1.53.python33,
+ boost1.53.nopython
+<<
+### Always include ALL boost variants in Replaces
Replaces: <<
boost1.31, boost1.32-py23, boost1.32-py24, boost1.32.python, boost1.33,
boost-foreach,
- boost1.34.systempython,
- boost1.34.python23,
- boost1.34.python24,
+ boost1.34.systempython,
+ boost1.34.python23,
+ boost1.34.python24,
boost1.34.python25,
- boost1.34.nopython,
+ boost1.34.nopython,
boost1.35.systempython,
boost1.35.python23,
boost1.35.python24,
@@ -41,7 +53,16 @@
boost1.35.python27,
boost1.35.nopython,
boost1.41.cmake,
- boost1.46.1.cmake
+ boost1.46.1.cmake,
+ boost1.52.0.cmake,
+ boost1.53.systempython,
+ boost1.53.python25,
+ boost1.53.python26,
+ boost1.53.python27,
+ boost1.53.python31,
+ boost1.53.python32,
+ boost1.53.python33,
+ boost1.53.nopython
<<
Source: mirror:sourceforge:boost/boost_1_35_0.tar.bz2
@@ -250,7 +271,7 @@
they are compatible.
The nopython variant contains all others except the python libraries,
- so of you want a complete set of boost libraries, install
+ so if you want a complete set of boost libraries, install
the nopython variant and one of the python variants.
The systempython variant uses the system Python framework and installs the
Index: boost1.41.cmake.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/boost1.41.cmake.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- boost1.41.cmake.info 21 Oct 2012 00:23:00 -0000 1.4
+++ boost1.41.cmake.info 17 Jun 2013 18:54:11 -0000 1.5
@@ -1,8 +1,8 @@
Package: boost1.41.cmake
Version: 1.41.0
# up to 11 so that upgrades from the fink-python-using rev1 get updated
-Revision: 14
-Distribution: 10.5, 10.6, 10.7
+Revision: 15
+Distribution: 10.7
Description: Boost C++ Libraries
DescDetail: <<
The Boost web site provides free peer-reviewed portable C++ source
@@ -31,6 +31,7 @@
Depends: %n-shlibs (= %v-%r)
BuildDepends: fink (>= 0.24.12), cmake (>= 2.6.4)
BuildDependsOnly: true
+### Always include ALL boost variants in Conflicts
Conflicts: <<
boost-foreach,
boost1.31,
@@ -50,8 +51,19 @@
boost1.35.python26,
boost1.35.python27,
boost1.35.nopython,
- boost1.46.1.cmake
+ boost1.41.cmake,
+ boost1.46.1.cmake,
+ boost1.52.0.cmake,
+ boost1.53.systempython,
+ boost1.53.python25,
+ boost1.53.python26,
+ boost1.53.python27,
+ boost1.53.python31,
+ boost1.53.python32,
+ boost1.53.python33,
+ boost1.53.nopython
<<
+### Always include ALL boost variants in Replaces
Replaces: <<
boost-foreach,
boost1.31,
@@ -71,7 +83,17 @@
boost1.35.python26,
boost1.35.python27,
boost1.35.nopython,
- boost1.46.1.cmake
+ boost1.41.cmake,
+ boost1.46.1.cmake,
+ boost1.52.0.cmake,
+ boost1.53.systempython,
+ boost1.53.python25,
+ boost1.53.python26,
+ boost1.53.python27,
+ boost1.53.python31,
+ boost1.53.python32,
+ boost1.53.python33,
+ boost1.53.nopython
<<
CompileScript: <<
@@ -82,8 +104,8 @@
-DWITH_DOXYGEN=off -DWITH_ICU=off \
-DBZIP2_INCLUDE_DIR=/usr/include \
-DBZIP2_LIBRARIES=/usr/lib/libbz2.dylib \
- -DPYTHON_INCLUDE_PATH=/usr/include/python2.5 \
- -DPYTHON_EXECUTABLE=/usr/bin/python2.5 \
+ -DPYTHON_INCLUDE_PATH=/usr/include/python2.7 \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \
-DPYTHON_LIBRARIES="-framework Python" \
-DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc
make
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
