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

Treeve Jelbert scm at mail.sourcemage.org
Sat Sep 16 10:59:25 EDT 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 ChangeLog                      |    6 ++
 devel/bobcat/BUILD             |    4 -
 devel/bobcat/DEPENDS           |    2 
 devel/bobcat/DETAILS           |    4 -
 devel/bobcat/HISTORY           |    5 ++
 devel/bobcat/INSTALL           |    2 
 devel/bobcat/PRE_BUILD         |    3 -
 devel/icmake/BUILD             |    1 
 devel/icmake/DETAILS           |   17 ++++++++
 devel/icmake/HISTORY           |    5 ++
 devel/icmake/INSTALL           |    5 ++
 devel/icmake/PRE_BUILD         |   10 ++++
 devel/icmake/gcc.diff          |   84 +++++++++++++++++++++++++++++++++++++++++
 doc/libharu2/DETAILS           |    6 +-
 doc/libharu2/HISTORY           |    4 +
 doc/yodl/BUILD                 |    3 +
 doc/yodl/DEPENDS               |    3 +
 doc/yodl/DETAILS               |   16 +++++++
 doc/yodl/HISTORY               |    5 ++
 doc/yodl/INSTALL               |    1 
 doc/yodl/PRE_BUILD             |    5 ++
 graphics/exiv2/DETAILS         |    4 -
 graphics/exiv2/HISTORY         |    3 +
 odbc-drivers/ruby-odbc/DETAILS |    4 -
 odbc-drivers/ruby-odbc/HISTORY |    3 +
 25 files changed, 192 insertions(+), 13 deletions(-)

New commits:
commit f6a776707c8763e142e4952bc6d7d04d822d10d8
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    yodl: new spell

commit 348fa1b93ac194deb869d8bcc7bc5f9f0d37837b
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    icmake - new spell

commit 909efb88c44517adb93768c17a29cd6264a76e9c
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    bobcat-1.10.2

commit 1a6a19bd50fdff94a52585d7d58dd82668e3d4a1
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    exiv2-0.11

commit c38c312c2dd8d9d3e4a16e181dc01e312fd50d7c
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    ruby-odbc-0.9993

commit f1df5bf89bc361182fc49a3384dab4f800fbfe86
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    libharu2-2_0_5

diff --git a/ChangeLog b/ChangeLog
index bfcbd26..a393f63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-16 Treeve Jelbert <treeve at pi.be>
+	* doc/yodl: new spell
+
+2006-09-16 Treeve Jelbert <treeve at pi.be>
+	* devel/icmake: new spell
+
 2006-09-16 Ladislav Hagara <hgr at vabo.cz>
 	* disk/testdisk: new spell, data recovery software
 
diff --git a/devel/bobcat/BUILD b/devel/bobcat/BUILD
index 4cb52ac..1e70c8f 100755
--- a/devel/bobcat/BUILD
+++ b/devel/bobcat/BUILD
@@ -1,2 +1,2 @@
-echo "\n\n" | ./make/library
-
+echo "\n\n" | ./build libraries  &&
+./build man
diff --git a/devel/bobcat/DEPENDS b/devel/bobcat/DEPENDS
index 33f8005..a273cad 100755
--- a/devel/bobcat/DEPENDS
+++ b/devel/bobcat/DEPENDS
@@ -1,2 +1,4 @@
+depends icmake  &&
+depends yodl    &&
 depends g++
 
diff --git a/devel/bobcat/DETAILS b/devel/bobcat/DETAILS
index 16b7dd9..b962464 100755
--- a/devel/bobcat/DETAILS
+++ b/devel/bobcat/DETAILS
@@ -1,6 +1,6 @@
            SPELL=bobcat
-         VERSION=1.10.0
-     SOURCE_HASH=sha512:d9ef04f1a3492d5650f59c9b426eb6b3cdb61b54f5ddebcf5f653ff600f184431d039a85dcdecb66bc492236043904d896cb3b408c4b24b23c1f463f12bcac07
+         VERSION=1.10.2
+     SOURCE_HASH=sha512:a98a77b3f3b5df5607eec330c7002f8ed7541c58643ac51856dbf662b23a1059d937e394d5586034286478fcfa7c5740c23f39562f871f887fd07fca5fecf0a5
           SOURCE=${SPELL}_${VERSION}.orig.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/bobcat/HISTORY b/devel/bobcat/HISTORY
index a608f22..3c333d4 100644
--- a/devel/bobcat/HISTORY
+++ b/devel/bobcat/HISTORY
@@ -1,3 +1,8 @@
+2006-09-16 Treeve Jelbert <treeve01 at pi.be>
+	* DETAILS: version 1.10.02
+	* DEPENDS: add icmake, yodl
+	* PRE_BUILD, BUILD, INSTALL: adapt to icmake
+
 2006-08-19 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: fix minor linting probs
 
diff --git a/devel/bobcat/INSTALL b/devel/bobcat/INSTALL
index db96fea..86c7530 100755
--- a/devel/bobcat/INSTALL
+++ b/devel/bobcat/INSTALL
@@ -1 +1 @@
-./make/install
+./build install
diff --git a/devel/bobcat/PRE_BUILD b/devel/bobcat/PRE_BUILD
index 20a54d5..f1b5a10 100755
--- a/devel/bobcat/PRE_BUILD
+++ b/devel/bobcat/PRE_BUILD
@@ -1,3 +1,4 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY 	   &&
-sedit "/^COMPILER=g++-4.1/D" INSTALL.cf
+#sedit "/^COMPILER=g++-4.1/D" INSTALL.cf
+sedit "s/-O3/$CFLAGS/" build
diff --git a/devel/icmake/BUILD b/devel/icmake/BUILD
new file mode 100755
index 0000000..ef24a30
--- /dev/null
+++ b/devel/icmake/BUILD
@@ -0,0 +1 @@
+./bootstrap  
diff --git a/devel/icmake/DETAILS b/devel/icmake/DETAILS
new file mode 100755
index 0000000..edc759c
--- /dev/null
+++ b/devel/icmake/DETAILS
@@ -0,0 +1,17 @@
+           SPELL=icmake
+         VERSION=6.22-7
+     SOURCE_HASH=sha512:7a51a44dd0f99346a1ed1163c680f9195448619fa933999f2274cc813a90215f8c6070603a2b5d40c5170f95f2e17bacc41e6b66c083518ff4162932ecdf29ad
+    SOURCE2_HASH=sha512:e7f157a73c0a04e165c05d46d995f8ec68441fb8387843ad5650a852f19a8ef4440544280cc4aa1b87db6047bc3d3654b47d51223bb47b94f1f43bc9a094901b
+          SOURCE=${SPELL}_${VERSION//-?}.orig.tar.gz
+          SOURCE2=${SPELL}_${VERSION}.diff.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}
+        WEB_SITE=http://packages.debian.org/testing/source/
+   SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/i/icmake/$SOURCE
+  SOURCE2_URL[0]=http://ftp.debian.org/debian/pool/main/i/icmake/$SOURCE2
+      LICENSE[0]=http://packages.debian.org/changelogs/pool/main/i/icmake/${SPELL}_${VERSION}/copyright
+         ENTERED=20060902
+        KEYWORDS="make utility"
+           SHORT="make utility"
+cat << EOF
+Icmake is a hybrid between a 'make' utility and a 'shell script' language
+EOF
diff --git a/devel/icmake/HISTORY b/devel/icmake/HISTORY
new file mode 100644
index 0000000..b101308
--- /dev/null
+++ b/devel/icmake/HISTORY
@@ -0,0 +1,5 @@
+2006-09-03 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 6.22-7
+	* PRE_BUILD: also apply gcc-4.1 patch
+	  spell created
+
diff --git a/devel/icmake/INSTALL b/devel/icmake/INSTALL
new file mode 100755
index 0000000..55d4de6
--- /dev/null
+++ b/devel/icmake/INSTALL
@@ -0,0 +1,5 @@
+#default_install
+chmod a+x bin/icmake  &&
+cp bin/icmake $INSTALL_ROOT/usr/bin    &&
+mkdir -p $INSTALL_ROOT/usr/lib/icmake  &&
+cp bin/icm-* $INSTALL_ROOT/usr/lib/icmake
diff --git a/devel/icmake/PRE_BUILD b/devel/icmake/PRE_BUILD
new file mode 100755
index 0000000..b20c530
--- /dev/null
+++ b/devel/icmake/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+verify_file 2         &&
+# apply Debian patch
+zcat $SOURCE_CACHE/$SOURCE2 | patch -p1  &&
+# apply ggc-4.1 patches
+patch -p1 < $SPELL_DIRECTORY/gcc.diff    &&
+# use Sourcemage flags
+sed -i "s/-O2 -g -Wall/$CFLAGS/"  bootstrap &&
+chmod u+x bootstrap
diff --git a/devel/icmake/gcc.diff b/devel/icmake/gcc.diff
new file mode 100644
index 0000000..26d162d
--- /dev/null
+++ b/devel/icmake/gcc.diff
@@ -0,0 +1,84 @@
+diff -uNr icmake.orig/comp/callrss.c icmake/comp/callrss.c
+--- icmake.orig/comp/callrss.c	1999-11-06 11:33:52.000000000 +0100
++++ icmake/comp/callrss.c	2006-09-16 11:21:58.000000000 +0200
+@@ -68,7 +68,7 @@
+             args = va_arg(marker, unsigned);
+         break;
+ 
+-        default:
++        default: ;
+         /*
+             default is entered in the switch to prevent a long compiler 
+             warning
+diff -uNr icmake.orig/comp/cast.c icmake/comp/cast.c
+--- icmake.orig/comp/cast.c	1999-11-06 11:34:34.000000000 +0100
++++ icmake/comp/cast.c	2006-09-16 11:22:32.000000000 +0200
+@@ -26,7 +26,7 @@
+             lcast(e);
+         break;
+ 
+-        default:
++        default: ;
+         /* 
+             default is entered in the switch to prevent a long compiler
+             warning
+diff -uNr icmake.orig/comp/gencode.c icmake/comp/gencode.c
+--- icmake.orig/comp/gencode.c	1999-11-06 11:40:51.000000000 +0100
++++ icmake/comp/gencode.c	2006-09-16 11:23:06.000000000 +0200
+@@ -91,7 +91,7 @@
+             ++dead[dead_sp];
+         break;
+ 
+-        default:
++        default: ;
+ /*
+         The default switch entry is inserted to prvent a long compiler
+         warning about a not-handled enum value
+diff -uNr icmake.orig/comp/negate.c icmake/comp/negate.c
+--- icmake.orig/comp/negate.c	1994-03-14 14:46:46.000000000 +0100
++++ icmake/comp/negate.c	2006-09-16 11:25:28.000000000 +0200
+@@ -13,7 +13,7 @@
+     }
+ 
+     if (e->type & e_const)                  /* immediate value */
+-        (int)e->evalue = -(int)e->evalue;
++        e->evalue = -(int)e->evalue;
+     else
+     {
+         etoc(e);                            /* convert to code */
+diff -uNr icmake.orig/exec/icm-exec.c icmake/exec/icm-exec.c
+--- icmake.orig/exec/icm-exec.c	1999-11-06 11:52:06.000000000 +0100
++++ icmake/exec/icm-exec.c	2006-09-16 11:31:05.000000000 +0200
+@@ -34,7 +34,7 @@
+ 
+ #include "icm-exec.h"
+ 
+-void main (argc, argv, envp)
++int main (argc, argv, envp)
+ int argc;
+ char **argv;
+ char **envp;
+diff -uNr icmake.orig/pp/icm-pp.c icmake/pp/icm-pp.c
+--- icmake.orig/pp/icm-pp.c	1995-07-06 14:39:48.000000000 +0200
++++ icmake/pp/icm-pp.c	2006-09-16 11:29:02.000000000 +0200
+@@ -35,7 +35,7 @@
+ 
+ #include "icm-pp.h"
+ 
+-void main (int argc, char **argv)
++int main (int argc, char **argv)
+ {
+     register char
+         *progname;
+diff -uNr icmake.orig/un/icmun.c icmake/un/icmun.c
+--- icmake.orig/un/icmun.c	1994-03-14 13:50:28.000000000 +0100
++++ icmake/un/icmun.c	2006-09-16 11:30:07.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ #include "icmun.h"
+ 
+-void main (argc, argv)
++int main (argc, argv)
+ int argc;
+ char **argv;
+ {
diff --git a/doc/libharu2/DETAILS b/doc/libharu2/DETAILS
index 3acf3d2..a1040ae 100755
--- a/doc/libharu2/DETAILS
+++ b/doc/libharu2/DETAILS
@@ -1,8 +1,8 @@
            SPELL=libharu2
-         VERSION=2_0_2
-     SOURCE_HASH=sha512:87827d8f5a78c17d59222ea76f7788bc71097aec38321d9bd90d52e4ff6b2b736f3d047eb053fed5290f5b4fbedc50a1ce1427635afa6d02843976fd5f373ecc
+         VERSION=2_0_5
+     SOURCE_HASH=sha512:8b9c5fad1daff95fff45262c0bdc7145dc4ff3b6dc271755445091125b08275b7f4cea42adf40c4c06da8fff53f461812615f38155f07c575449ad6be997c370
           SOURCE=${SPELL//2}\_${VERSION}.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2/}-2.0.2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2/}-${VERSION//_/.}
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL//2/}/$SOURCE
         WEB_SITE=http://${SPELL//2}.SourceForge.net
          LICENSE=ZLIB
diff --git a/doc/libharu2/HISTORY b/doc/libharu2/HISTORY
index f64ed37..1aaa532 100644
--- a/doc/libharu2/HISTORY
+++ b/doc/libharu2/HISTORY
@@ -1,3 +1,7 @@
+2006-09-16 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 2.0.5
+	  SOURCE_DIRECTORY use $VERSION
+
 2006-08-07 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 2.0.2
 	  cloned from libharu spell
diff --git a/doc/yodl/BUILD b/doc/yodl/BUILD
new file mode 100755
index 0000000..997c566
--- /dev/null
+++ b/doc/yodl/BUILD
@@ -0,0 +1,3 @@
+#sedit "s/-O2/$CFLAGS/" build  &&
+./build package
+
diff --git a/doc/yodl/DEPENDS b/doc/yodl/DEPENDS
new file mode 100755
index 0000000..c2e71df
--- /dev/null
+++ b/doc/yodl/DEPENDS
@@ -0,0 +1,3 @@
+depends icmake  &&
+depends tetex
+
diff --git a/doc/yodl/DETAILS b/doc/yodl/DETAILS
new file mode 100755
index 0000000..5db0500
--- /dev/null
+++ b/doc/yodl/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=yodl
+         VERSION=2.04
+     SOURCE_HASH=sha512:f5a37099ea0b6c8d9086cdd00ec5163dcdb1b11aa6a5e32f9c2024d5b737dc81ae9c08c8937d986709e9628b30fc016bb8a718e71015336014b8e78fa685956d
+          SOURCE=${SPELL}_${VERSION}.orig.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+        WEB_SITE=http://$SPELL.SourceForge.net
+      LICENSE[0]=GPL
+         ENTERED=20060916
+        KEYWORDS="documentation tool"
+           SHORT="documentation tool"
+cat << EOF
+Yodl is a package that implements a pre-document language and tools to process it. 
+Write a single document, then use a tool (e.g. yodl2html) to convert it to some final 
+document language (html, man, LaTeX, etc.). Yodl's document language is easy to use. 
+EOF
diff --git a/doc/yodl/HISTORY b/doc/yodl/HISTORY
new file mode 100644
index 0000000..4152cb5
--- /dev/null
+++ b/doc/yodl/HISTORY
@@ -0,0 +1,5 @@
+2006-09-16 Treeve Jelbert <treeve01 at pi.be>
+	* DETAILS: version 2.04
+	* BUILD, DEPENDS: added
+	  spell created
+
diff --git a/doc/yodl/INSTALL b/doc/yodl/INSTALL
new file mode 100755
index 0000000..6394bb7
--- /dev/null
+++ b/doc/yodl/INSTALL
@@ -0,0 +1 @@
+./build install $INSTALL_ROOT/usr
diff --git a/doc/yodl/PRE_BUILD b/doc/yodl/PRE_BUILD
new file mode 100755
index 0000000..41ad899
--- /dev/null
+++ b/doc/yodl/PRE_BUILD
@@ -0,0 +1,5 @@
+ default_pre_build
+#  mk_source_dir $SOURCE_DIRECTORY &&
+#  cd $SOURCE_DIRECTORY 	   &&
+#  unpack_file
+#patch  -p0 < $SPELL_DIRECTORY/xxx.diff
diff --git a/graphics/exiv2/DETAILS b/graphics/exiv2/DETAILS
index 4e42ce6..e8a19a0 100755
--- a/graphics/exiv2/DETAILS
+++ b/graphics/exiv2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=exiv2
-         VERSION=0.10
-     SOURCE_HASH=sha512:4601a56b75db8317092a1ed7bc645dd1b026d177a4bddb9e7a541e44b3bf74bf88b81748ffcc5894d330b8e224fdd851588edfcdac2ec34f3c46474c84681a45
+         VERSION=0.11
+     SOURCE_HASH=sha512:163d6e1c017e0e7b697e3251c8d0cb6f32d3fe5698e13f4b04cf74aaee5f4a1eabf71c611f7c5c546754cf29f34016139f92d621aacd6ca236b23c3d17524e67
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://home.arcor.de/ahuggel/exiv2
diff --git a/graphics/exiv2/HISTORY b/graphics/exiv2/HISTORY
index 84cadc6..e32c73a 100644
--- a/graphics/exiv2/HISTORY
+++ b/graphics/exiv2/HISTORY
@@ -1,3 +1,6 @@
+2006-09-16 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 0.11
+
 2006-06-16 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug #12665
 
diff --git a/odbc-drivers/ruby-odbc/DETAILS b/odbc-drivers/ruby-odbc/DETAILS
index 91c5a51..066e07a 100755
--- a/odbc-drivers/ruby-odbc/DETAILS
+++ b/odbc-drivers/ruby-odbc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ruby-odbc
-         VERSION=0.9991
-     SOURCE_HASH=sha512:fe89badccf713f63d6e8f13b8a4decf93a3099824a830d5ca8addd671c4525e441f456661a2843a756f5db9ed0c66496ac1e964c5ca30c5319da42d24db1d383
+         VERSION=0.9993
+     SOURCE_HASH=sha512:91765144e814bd94d87f8f83233b2311a29cf0a91e40b5a03a4e9ebebc9592e13ec5cbf867d3c11e3ac3a69104c6e39d567cbab15b5420bda5a7eb9d6173916f
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.ch-werner.de/rubyodbc/
diff --git a/odbc-drivers/ruby-odbc/HISTORY b/odbc-drivers/ruby-odbc/HISTORY
index c3820bf..ca85fc5 100644
--- a/odbc-drivers/ruby-odbc/HISTORY
+++ b/odbc-drivers/ruby-odbc/HISTORY
@@ -1,3 +1,6 @@
+2006-09-16 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 0.9993
+
 2006-08-13 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 0.9991
 



More information about the SM-Commit mailing list