[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (563ff337a1b3ea205b06cf934344b0515d69f8d1)

Treeve Jelbert scm at sourcemage.org
Sat Jun 2 06:15:17 EDT 2007


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 python-devel/itools/DETAILS |    4 ++--
 python-devel/itools/HISTORY |    3 +++
 x11-toolkits/fltk2/DETAILS  |    4 ++--
 x11-toolkits/fltk2/HISTORY  |    3 +++
 x11-toolkits/sptk/BUILD     |    7 ++++---
 x11-toolkits/sptk/CONFIGURE |   16 ----------------
 x11-toolkits/sptk/DEPENDS   |   30 ++++++------------------------
 x11-toolkits/sptk/DETAILS   |    4 ++--
 x11-toolkits/sptk/HISTORY   |    9 ++++++++-
 9 files changed, 30 insertions(+), 50 deletions(-)

New commits:
commit 857edf19bd6d60c5a3ab7b8ff7d6b141a8848175
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    sptk-3.5.1

commit 217dd01b691f3769477ac46684cbc3dc4726cf23
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    fltk2-2.0.x-r5864

commit b85b5ac09ee210b47f9dfecc3cb66b1bec5514a1
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    itools-0.15.5

diff --git a/python-devel/itools/DETAILS b/python-devel/itools/DETAILS
index 7b57169..05c769c 100755
--- a/python-devel/itools/DETAILS
+++ b/python-devel/itools/DETAILS
@@ -1,6 +1,6 @@
            SPELL=itools
-         VERSION=0.15.4
-     SOURCE_HASH=sha512:5e708a7a1637d98ee4d4bb31f34fea4de9445e506c7075c5f020ae1f7ccc6ae42038404057a2756bf9d30c272f75fdce9507e52e179851382d526f14e6f590cf
+         VERSION=0.15.5
+     SOURCE_HASH=sha512:f965b94c3c9b48baffd3103ed67a7d4cadab628e9593c72cff7088f8a400adf76ceb7fa95b57ade608d3ed268b531c8397230a119a5d7ebd853a11b82b9037eb
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.ikaaro.org
diff --git a/python-devel/itools/HISTORY b/python-devel/itools/HISTORY
index eb7fa53..28e54b7 100644
--- a/python-devel/itools/HISTORY
+++ b/python-devel/itools/HISTORY
@@ -1,3 +1,6 @@
+2007-06-01 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.15.5
+
 2007-05-10 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.15.4
 
diff --git a/x11-toolkits/fltk2/DETAILS b/x11-toolkits/fltk2/DETAILS
index 3361100..25ac1b6 100755
--- a/x11-toolkits/fltk2/DETAILS
+++ b/x11-toolkits/fltk2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=fltk2
-         VERSION=2.0.x-r5800
-     SOURCE_HASH=sha512:8d287bc1feb6268b0b3930d7d01840106b901adfdfab0e996938acf8d2ad517621c303d21a372e6ea5d1ae839c36da09a8234b5fb63f17f7b4027ee0a714b079
+         VERSION=2.0.x-r5864
+     SOURCE_HASH=sha512:08c0a7336e7a30464b0e9e2922011a7ebc2c1176fd95bdf4b41107057f6442caae12a7079009a613bc00511c40b3c15d0046e8414da8418c5ba267fc38e69fd5
           SOURCE=${SPELL//2}-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2}-$VERSION
         FLTK_URI=ftp3.easysw.com/pub/fltk/snapshots/$SOURCE
diff --git a/x11-toolkits/fltk2/HISTORY b/x11-toolkits/fltk2/HISTORY
index 7415fe8..c7933c8 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/HISTORY
@@ -1,3 +1,6 @@
+2007-06-01 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.0.x-r5864
+
 2007-05-07 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.0.x-r5800
 
diff --git a/x11-toolkits/sptk/BUILD b/x11-toolkits/sptk/BUILD
index e13b1c9..f3d9560 100755
--- a/x11-toolkits/sptk/BUILD
+++ b/x11-toolkits/sptk/BUILD
@@ -1,3 +1,4 @@
-OPTS="${SPTK_OPTIONAL_DEPS} \
-	${OPTS}" &&
-default_build
+# avoid building examples, as they won't link properly
+sed -i "/examples/D" CMakeLists.txt &&
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ./   &&
+make
diff --git a/x11-toolkits/sptk/CONFIGURE b/x11-toolkits/sptk/CONFIGURE
deleted file mode 100755
index e9c1f97..0000000
--- a/x11-toolkits/sptk/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-. $GRIMOIRE/config_query_multi.function
-config_query_option SPTK_OPTIONAL_DEPS                          \
-                    "Enable debug?"                             \
-                    n                                           \
-                    "--enable-debug"                            \
-                    "--disable-debug"                           &&
-config_query_option SPTK_OPTIONAL_DEPS				\
-		    "Build examples"				\
-		    n						\
-		    "--enable-examples"				\
-		    "--disable-examples"			&&
-config_query_option SPTK_OPTIONAL_DEPS				\
-		    "Build MS Excel support"			\
-		    y						\
-		    "--enable-excel"				\
-		    "--disable-excel"				\
diff --git a/x11-toolkits/sptk/DEPENDS b/x11-toolkits/sptk/DEPENDS
index 7dd45a0..5633d07 100755
--- a/x11-toolkits/sptk/DEPENDS
+++ b/x11-toolkits/sptk/DEPENDS
@@ -1,26 +1,8 @@
+depends cmake    &&
 depends g++      &&
 
-optional_depends  X11-LIBS \
-		  "--with-x" \
-		  "--without-x" \
-		  "for X support"
-
-optional_depends  fltk \
-                  "--enable-fltk" \
-                  "--disable-fltk" \
-                  "gui support"          &&
-
-optional_depends  sqlite  \
-                  "--enable-sqlite3" \
-                  "--disable-sqlite3" \
-                  "sqlite3 database support" &&
-
-optional_depends  ODBC-MGR  \
-                  "--enable-odbc" \
-                  "--disable-odbc" \
-                  "ODBC database support" &&
-
-optional_depends  aspell            \
-                  ""                \
-                  ""                \
-                  "spell checking"
+optional_depends  X11-LIBS "" "" "for X support"            &&
+optional_depends  fltk     "" "" "gui support"              &&
+optional_depends  sqlite   "" "" "sqlite3 database support" &&
+optional_depends  ODBC-MGR "" "" "ODBC database support"    &&
+optional_depends  aspell   "" "" "spell checking"
diff --git a/x11-toolkits/sptk/DETAILS b/x11-toolkits/sptk/DETAILS
index 5db0b2e..e41f3fd 100755
--- a/x11-toolkits/sptk/DETAILS
+++ b/x11-toolkits/sptk/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sptk
-         VERSION=3.4.1
-     SOURCE_HASH=sha512:aae08403b50ad8c38c133c5ab5ac6d79111eb4625e5a004979609600d407da070525e0bafb542426bb532285d02391cf9b78556c5cd481512728e5cc825f1270
+         VERSION=3.5.1
+     SOURCE_HASH=sha512:a1f6b51493f502c9395ef1f27e23e2e6072118fe7a9ee115e760b55ad389f2bdf40b7c50cd2cc10606807dbb2f439235b5fea9a4b2ef5b232a937ba56cd1b55b
           SOURCE=$SPELL-$VERSION.tbz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
         WEB_SITE=http://www.sptk.net
diff --git a/x11-toolkits/sptk/HISTORY b/x11-toolkits/sptk/HISTORY
index f5fdffc..dbcd3c7 100644
--- a/x11-toolkits/sptk/HISTORY
+++ b/x11-toolkits/sptk/HISTORY
@@ -1,4 +1,11 @@
-2007-033-18 Treeve Jelbert <treeve at sourcemage.org>
+2007-06-01 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.5.1
+	* DEPENDS: add cmake, change all optional depends for cmake use
+	* CONFIGURE: delete
+	* BUILD: use cmake
+	  don't build examples, as they won't link
+
+2007-03-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.4.1
 	* PRE_BUILD: removed, no longer needed
 	* CONFIGURE: debug is optional



More information about the SM-Commit mailing list