Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

author: Vasil Yonkov 2010-04-01 21:58:08 +0300
committer: Vasil Yonkov 2010-04-01 21:58:08 +0300
commit: 1ff42c70d8671f8e06ab917b41a4206cc3599f80 (patch)
tree: 7bd7aec8bf11d8edbd527ca0003ff0a54675dfae
parent: 55b8a49d9186626913828a4d68a8fecd4e3a9508 (diff)
parent: 9f21f304f609ad59dca6cefecc678b22133bc7d8 (diff)
44 files changed, 576 insertions, 127 deletions
diff --git a/ChangeLog b/ChangeLog
index 433a45e0c8..0ce740ea92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-01 Arjan Bouter <abouter@sourcemage.org>
+	* spelling/mythes: new spell, thesaurus library
+
 2010-04-01 Treeve Jelbert <treeve@sourcemage.org>
 	* database/drizzle: new spell, database engine for cloud
 
diff --git a/database/virtuoso/DETAILS b/database/virtuoso/DETAILS
index d1fa4f5642..18908c15cb 100755
--- a/database/virtuoso/DETAILS
+++ b/database/virtuoso/DETAILS
@@ -1,6 +1,6 @@
            SPELL=virtuoso
-         VERSION=6.1.0
-     SOURCE_HASH=sha512:607c8e5268cbfc4db3243b4a09319ad1e3cb8f3430ef2070437c9d501db37685a77021237970f69ae4177825fe5113c7029c2b5681871bc8e15de7172950f960
+         VERSION=6.1.1
+     SOURCE_HASH=sha512:bb63fb6e7cf3d671c34645149fdfbc14835ae775b329930911656f9259cfd7d3b0cfcf8a48b0d0d6449794a890dddbc211d7fc6994f6d70f1bf17927badb93d2
           SOURCE=$SPELL-opensource-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-opensource-$VERSION
         WEB_SITE=http://virtuoso.openlinksw.com/wiki/main/Main/
diff --git a/database/virtuoso/HISTORY b/database/virtuoso/HISTORY
index adab29771e..27a623b976 100644
--- a/database/virtuoso/HISTORY
+++ b/database/virtuoso/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 6.1.1
+
 2010-02-25 Remko van der Vossen <wich@sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/devel/apiextractor/HISTORY b/devel/apiextractor/HISTORY
index 4934743d79..abd7eec42c 100644
--- a/devel/apiextractor/HISTORY
+++ b/devel/apiextractor/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Treeve Jelbert <treeve@sourcemage.org>
+	* TRIGGERS: delete obsolete trigger
+
 2010-03-29 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.4.0
 	* DEPENDS: remove boost
diff --git a/devel/apiextractor/TRIGGERS b/devel/apiextractor/TRIGGERS
deleted file mode 100755
index 1696e74dae..0000000000
--- a/devel/apiextractor/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast boost check_self
diff --git a/devel/boostpythongenerator/BUILD b/devel/boostpythongenerator/BUILD
index 21134344c7..27ba77ddaf 100755
--- a/devel/boostpythongenerator/BUILD
+++ b/devel/boostpythongenerator/BUILD
@@ -1 +1 @@
-qt4_cmake_build
+true
diff --git a/devel/boostpythongenerator/DEPENDS b/devel/boostpythongenerator/DEPENDS
index 328aa0e691..c695439828 100755
--- a/devel/boostpythongenerator/DEPENDS
+++ b/devel/boostpythongenerator/DEPENDS
@@ -1,8 +1 @@
-depends  qt4      &&
-depends  cmake    &&
-depends  python   &&
-depends  -sub PYTHON boost  &&
-depends  apiextractor &&
-if [[ $PYSIDE == git ]];then
-  depends  git
-fi
+depends apiextractor
diff --git a/devel/boostpythongenerator/DETAILS b/devel/boostpythongenerator/DETAILS
index 1ce82c6857..4b0fbbbe24 100755
--- a/devel/boostpythongenerator/DETAILS
+++ b/devel/boostpythongenerator/DETAILS
@@ -1,23 +1,8 @@
            SPELL=boostpythongenerator
-        WEB_SITE=http://www.pyside.org/
-#http://qt.gitorious.org/pyside
-if [[ $PYSIDE == git ]];then
-         VERSION=git
-          SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=git://gitorious.org/pyside/$SPELL.git:$SPELL-git
-  FORCE_DOWNLOAD=on
-   SOURCE_IGNORE=volatile
-else
-         VERSION=0.3.3
-     SOURCE_HASH=sha512:9f5f870ce264de5093801d1fdbd44f1d574043429e925c7a84b6426a81b3ac8c7a2838a8a6c554f85a8e82631d17b35ea0a1bec32560c50c76124e9f05c80d0f
-          SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-         ENTERED=20080921
-      LICENSE[0]=LGPL
-        KEYWORDS="python libs"
-           SHORT="Python bindings generator"
+         VERSION=0
+      PATCHLEVEL=9999
+           SHORT="deprecated"
 cat << EOF
-Python binding generator based on Boost.Python
+deprecated spell [replaced by apiextractor]
 EOF
+
diff --git a/devel/boostpythongenerator/DOWNLOAD b/devel/boostpythongenerator/DOWNLOAD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/devel/boostpythongenerator/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/devel/boostpythongenerator/HISTORY b/devel/boostpythongenerator/HISTORY
index ee05f53eda..ccb83378b2 100644
--- a/devel/boostpythongenerator/HISTORY
+++ b/devel/boostpythongenerator/HISTORY
@@ -1,20 +1,4 @@
-2010-01-04 Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 0.3.3
-
-2009-12-02 Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 0.3.2
-
-2009-09-06 Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 0.3
-
-2009-08-27 Treeve Jelbert <treeve@sourcemage.org>
-	* TRIGGERS: added
-
-2009-08-25 Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 0.2
-	* PREPARE: added
-	* DEPENDS: git only for git version
-
-2009-08-21 Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version git
-	  spell created
+2010-04-01  Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0
+	  PATCHLEVEL=9999
+	  spell deprecated [replaced by apiextractor]
diff --git a/devel/boostpythongenerator/INSTALL b/devel/boostpythongenerator/INSTALL
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/devel/boostpythongenerator/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/devel/boostpythongenerator/PREPARE b/devel/boostpythongenerator/PREPARE
deleted file mode 100755
index b5f9bdece1..0000000000
--- a/devel/boostpythongenerator/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list PYSIDE 'which version to build?' stable git
diff --git a/devel/boostpythongenerator/PRE_BUILD b/devel/boostpythongenerator/PRE_BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/devel/boostpythongenerator/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/devel/boostpythongenerator/TRIGGERS b/devel/boostpythongenerator/TRIGGERS
index 1696e74dae..61ee7bf416 100755
--- a/devel/boostpythongenerator/TRIGGERS
+++ b/devel/boostpythongenerator/TRIGGERS
@@ -1 +1 @@
-on_cast boost check_self
+on_cast boostpythongenerator dispel_self
diff --git a/devel/falcon/DETAILS b/devel/falcon/DETAILS
index 9dd0f27a34..dffbae7592 100755
--- a/devel/falcon/DETAILS
+++ b/devel/falcon/DETAILS
@@ -1,7 +1,7 @@
            SPELL=falcon
           SPELLX=Falcon
-         VERSION=0.9.6-1
-     SOURCE_HASH=sha512:5b431e874a7157ce02305203d8244a7ce9863d1263680807f0ad19e7c5ee61c1615a6357b6c8b33c6b91d7382c038ec0c120eeee096c22f132aac99cfa212fb3
+         VERSION=0.9.6.4
+     SOURCE_HASH=sha512:244fc0cc6811d9c918a1983d93e380982584016d84752b00d3adc17e46d7a7cbf9d20f09b7562316b1c9ea6eaaa91c1cb931f4469f7d510d9084f1daaca732a5
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION//-1}
         WEB_SITE=http://www.falconpl.org/
diff --git a/devel/falcon/HISTORY b/devel/falcon/HISTORY
index e3e8c526e8..81b61112a7 100644
--- a/devel/falcon/HISTORY
+++ b/devel/falcon/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.9.6.4
+
 2010-01-27 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.9.6-1
 
diff --git a/e-17/elicit/HISTORY b/e-17/elicit/HISTORY
index 6258de7196..b657a69dfa 100644
--- a/e-17/elicit/HISTORY
+++ b/e-17/elicit/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Ladislav Hagara <hgr@vabo.cz>
+	* PRE_BUILD: autogen.sh -> bootstrap
+
 2008-09-19 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: CVS -> SVN
 	  Remove unneeded modification of SPELL for SOURCE_URL
diff --git a/e-17/elicit/PRE_BUILD b/e-17/elicit/PRE_BUILD
index 534a7d38b7..0203653a89 100755
--- a/e-17/elicit/PRE_BUILD
+++ b/e-17/elicit/PRE_BUILD
@@ -1,3 +1,3 @@
 default_pre_build             &&
 cd  $SOURCE_DIRECTORY         &&
-NOCONFIGURE=ON  ./autogen.sh
+NOCONFIGURE=ON  ./bootstrap
diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index e612a61263..a68b3ea065 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -21,6 +21,7 @@ depends  curl '--with-system-curl' &&
 depends  boost '--with-system-boost' &&
 depends  hunspell '--with-system-hunspell' &&
 depends  hyphen '--with-system-altlinuxhyph' &&
+depends  mythes '--with-system-mythes' &&
 # just weird, it needs to be installed but OOo won't build when you specify --with-stlport
 depends  stlport  "--without-stlport"  &&
 depends  vigra  '--with-system-vigra' &&
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 95a864d350..c3f8539448 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,7 @@
+2010-03-31 Arjan Bouter <abouter@sourcemage.org>
+	* DEPENDS: added mythes
+	* INSTALL: fixed dmake prefix
+
 2010-03-26 Arjan Bouter <abouter@sourcemage.org>
 	* BUILD,CONFIGURE,CONFLICTS,DEPENDS,INSTALL,PRE_BUILD,PREPARE,DETAILS:
 	  version 3.2.0 and the spell works!
diff --git a/editors/openoffice/INSTALL b/editors/openoffice/INSTALL
index 1e71faa975..fc92edda02 100755
--- a/editors/openoffice/INSTALL
+++ b/editors/openoffice/INSTALL
@@ -1,5 +1,5 @@
-dmake install --prefix="${INSTALL_ROOT}/opt" &&
-OOO_APPPATH="${INSTALL_ROOT}/opt/openoffice/openoffice.org3/program" &&
+dmake install prefix="${INSTALL_ROOT}/opt" &&
+OOO_APPPATH="${INSTALL_ROOT}/opt/openoffice.org3/program" &&
 for app in sbase scalc sdraw simpress smath soffice spadmin swriter ; do
   ln -s "${OOO_APPPATH}/$app" ${INSTALL_ROOT}/usr/bin/$app
 done
diff --git a/editors/openoffice/TODO b/editors/openoffice/TODO
index 8095f7a6b0..af37246d76 100644
--- a/editors/openoffice/TODO
+++ b/editors/openoffice/TODO
@@ -6,6 +6,7 @@
 * hsqldb spell needs to be written
 * graphite spell may need to be written
 * figure out dictionaries
-* figure out hyphenation (hyphen, mythes)
-* figure out spelling (myspell, hunspell)
+* figure out hyphenation (hyphen)
+* figure out spelling (hunspell)
+* figure out thesaurus (mythes)
 * smgl themed bitmaps maybe? (--with-intro-bitmaps --with-about-bitmaps)
diff --git a/gnome2-libs/gnome-applets2/HISTORY b/gnome2-libs/gnome-applets2/HISTORY
index a8cc3fc8b3..20bd1bb6d8 100644
--- a/gnome2-libs/gnome-applets2/HISTORY
+++ b/gnome2-libs/gnome-applets2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Arjan Bouter <abouter@sourcemage.org>
+	* PRE_BUILD, disable-rarian.patch: removed. no longer needed.
+
 2010-03-30 Vasil Yonkov <spirtbrat@sourcemage.org>
 	* DETAILS: updated spell to 2.30.0
 
diff --git a/gnome2-libs/gnome-applets2/PRE_BUILD b/gnome2-libs/gnome-applets2/PRE_BUILD
deleted file mode 100755
index 5a460a5986..0000000000
--- a/gnome2-libs/gnome-applets2/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-if ! is_depends_enabled $SPELL rarian ; then
-  patch -p1 < ${SCRIPT_DIRECTORY}/disable-rarian.patch
-fi
diff --git a/gnome2-libs/gnome-applets2/disable-rarian.patch b/gnome2-libs/gnome-applets2/disable-rarian.patch
deleted file mode 100644
index 585aca8978..0000000000
--- a/gnome2-libs/gnome-applets2/disable-rarian.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- gnome-applets-2.26.3/configure	2009-06-29 08:36:31.000000000 +0200
-+++ gnome-applets-2.26.3-new/configure	2009-07-19 00:42:52.849687456 +0200
-@@ -17495,54 +17495,6 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--# Extract the first word of "scrollkeeper-config", so it can be a program name with args.
--set dummy scrollkeeper-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_SCROLLKEEPER_CONFIG+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  case $SCROLLKEEPER_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_SCROLLKEEPER_CONFIG="$SCROLLKEEPER_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_SCROLLKEEPER_CONFIG" && ac_cv_path_SCROLLKEEPER_CONFIG="no"
--  ;;
--esac
--fi
--SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG
--if test -n "$SCROLLKEEPER_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $SCROLLKEEPER_CONFIG" >&5
--$as_echo "$SCROLLKEEPER_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test x$SCROLLKEEPER_CONFIG = xno; then
--  { { $as_echo "$as_me:$LINENO: error: Couldn't find scrollkeeper-config" >&5
--$as_echo "$as_me: error: Couldn't find scrollkeeper-config" >&2;}
--   { (exit please install the Scrollkeeper 0.1.4 package); exit please install the Scrollkeeper 0.1.4 package; }; }
--fi
--
--
- # Extract the first word of "jw", so it can be a program name with args.
- set dummy jw; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
diff --git a/gnome2-libs/mutter/DETAILS b/gnome2-libs/mutter/DETAILS
index bf1161e323..c5291405d5 100755
--- a/gnome2-libs/mutter/DETAILS
+++ b/gnome2-libs/mutter/DETAILS
@@ -1,5 +1,5 @@
            SPELL=mutter
-         VERSION=2.29.0
+         VERSION=2.29.1
           BRANCH=${VERSION:0:4}
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/mutter/HISTORY b/gnome2-libs/mutter/HISTORY
index 7a8c6b4dda..25748e1dac 100644
--- a/gnome2-libs/mutter/HISTORY
+++ b/gnome2-libs/mutter/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Arjan Bouter <abouter@sourcemage.org>
+	* DETAILS: version 2.29.1
+
 2010-03-08 Vasil Yonkov <spirtbrat@sourcemage.org>
 	* DETAILS: Fixed SOURCE_URL[0], fixed WEB_SITE, updated spell to 2.29.0
 	* DEPENDS: removed libglade2, orbit2, made libcanberra optional,
diff --git a/gnome2-libs/mutter/mutter-2.29.0.tar.bz2.sig b/gnome2-libs/mutter/mutter-2.29.0.tar.bz2.sig
deleted file mode 100644
index 11d66d83b7..0000000000
--- a/gnome2-libs/mutter/mutter-2.29.0.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-libs/mutter/mutter-2.29.1.tar.bz2.sig b/gnome2-libs/mutter/mutter-2.29.1.tar.bz2.sig
new file mode 100644
index 0000000000..2cf63811e1
--- /dev/null
+++ b/gnome2-libs/mutter/mutter-2.29.1.tar.bz2.sig
diff --git a/graphics/lensfun/DETAILS b/graphics/lensfun/DETAILS
index 5c90167b99..ab73e23c35 100755
--- a/graphics/lensfun/DETAILS
+++ b/graphics/lensfun/DETAILS
@@ -12,8 +12,8 @@ fi
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
 else
-         VERSION=0.2.3
-     SOURCE_HASH=sha512:1266df0e9d6eb42667ec95fa8425bea19e52d7982f78631227135ad81d5dc9e19410ef5b03a7a4b1f621a045a3b7f2b7ac248ac3e365723ddcfa51d6512946a9
+         VERSION=0.2.5
+     SOURCE_HASH=sha512:a90292fd53fc12d82ccfd0211b8e544b18e2bd712010bf4c1cad5ad1d18f82145c399371f3699fe004571a845420f8e17f3237b45f861cb58c7ac8df8e503baa
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
diff --git a/graphics/lensfun/HISTORY b/graphics/lensfun/HISTORY
index 4dab5673ca..39501ab7e2 100644
--- a/graphics/lensfun/HISTORY
+++ b/graphics/lensfun/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.2.5
+
 2009-08-07 Thomas Orgis <sobukus@sourcemage.org>
 	* BUILD: force usage of /usr/lib (prevent /usr/lib64)
 
diff --git a/net/bind-tools/DEPENDS b/net/bind-tools/DEPENDS
index 3584909a3b..73c443f9cc 100755
--- a/net/bind-tools/DEPENDS
+++ b/net/bind-tools/DEPENDS
@@ -1,4 +1,9 @@
 optional_depends libcap \
                  "--enable-linux-caps" \
                  "--disable-linux-caps" \
-                 "for linux capabilities support"
+                 "for linux capabilities support" &&
+
+optional_depends openssl \
+                 "--with-openssl" \
+                 "--without-openssl" \
+                 "to build with OpenSSL, required for DNSSEC"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index 4ed49ee194..250813451e 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Ladislav Hagara <hgr@vabo.cz>
+	* DEPENDS: added optional_depends openssl
+
 2010-03-17 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 9.7.0-P1
 
diff --git a/net/bind/DEPENDS b/net/bind/DEPENDS
new file mode 100755
index 0000000000..73c443f9cc
--- /dev/null
+++ b/net/bind/DEPENDS
@@ -0,0 +1,9 @@
+optional_depends libcap \
+                 "--enable-linux-caps" \
+                 "--disable-linux-caps" \
+                 "for linux capabilities support" &&
+
+optional_depends openssl \
+                 "--with-openssl" \
+                 "--without-openssl" \
+                 "to build with OpenSSL, required for DNSSEC"
diff --git a/net/bind/HISTORY b/net/bind/HISTORY
index 44a3300211..9d58e58625 100644
--- a/net/bind/HISTORY
+++ b/net/bind/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Ladislav Hagara <hgr@vabo.cz>
+	* DEPENDS: added, copy from bind-tools
+
 2010-03-17 Julien "_kaze_" ROZO <julien@rozo.org>
 	* DETAILS: updated version to 9.7.0-P1
 
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 8d16dd5511..7ba3941dee 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,7 @@
+2010-04-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* PRE_BUILD, ruby-1.9.2pre1-openssl1-patch:
+	  added patch to fix build issue with openssl 1.0.0
+
 2010-02-26 Remko van der Vossen <wich@sourcemage.org>
 	* DETAILS: fixed SPELL != PACKAGE issue
 
diff --git a/ruby-raa/ruby-1.9/PRE_BUILD b/ruby-raa/ruby-1.9/PRE_BUILD
new file mode 100755
index 0000000000..f04549ffdf
--- /dev/null
+++ b/ruby-raa/ruby-1.9/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/ruby-1.9.2pre1-openssl1-patch
diff --git a/ruby-raa/ruby-1.9/ruby-1.9.2pre1-openssl1-patch b/ruby-raa/ruby-1.9/ruby-1.9.2pre1-openssl1-patch
new file mode 100644
index 0000000000..d2a44b15d4
--- /dev/null
+++ b/ruby-raa/ruby-1.9/ruby-1.9.2pre1-openssl1-patch
@@ -0,0 +1,463 @@
+
+Index: ext/openssl/ossl.c
+
+--- ext/openssl/ossl.c.orig	2009-03-19 20:40:38.000000000 +0900
++++ ext/openssl/ossl.c
+@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary)
+ 
+ #define OSSL_IMPL_SK2ARY(name, type)	        \
+ VALUE						\
+-ossl_##name##_sk2ary(STACK *sk)			\
++ossl_##name##_sk2ary(STACK_OF(type) *sk)	\
+ {						\
+     type *t;					\
+     int i, num;					\
+@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
+ 	OSSL_Debug("empty sk!");		\
+ 	return Qnil;				\
+     }						\
+-    num = sk_num(sk);				\
++    num = sk_##type##_num(sk);			\
+     if (num < 0) {				\
+ 	OSSL_Debug("items in sk < -1???");	\
+ 	return rb_ary_new();			\
+@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
+     ary = rb_ary_new2(num);			\
+ 						\
+     for (i=0; i<num; i++) {			\
+-	t = (type *)sk_value(sk, i);		\
++	t = sk_##type##_value(sk, i);		\
+ 	rb_ary_push(ary, ossl_##name##_new(t));	\
+     }						\
+     return ary;					\
+Index: ext/openssl/ossl_asn1.c
+
+--- ext/openssl/ossl_asn1.c.orig	2009-03-13 10:42:21.000000000 +0900
++++ ext/openssl/ossl_asn1.c
+@@ -304,7 +304,7 @@ obj_to_asn1derstr(VALUE obj)
+  * DER to Ruby converters
+  */
+ static VALUE
+-decode_bool(unsigned char* der, int length)
++decode_bool(const unsigned char* der, int length)
+ {
+     int val;
+     const unsigned char *p;
+@@ -317,7 +317,7 @@ decode_bool(unsigned char* der, int leng
+ }
+ 
+ static VALUE
+-decode_int(unsigned char* der, int length)
++decode_int(const unsigned char* der, int length)
+ {
+     ASN1_INTEGER *ai;
+     const unsigned char *p;
+@@ -336,7 +336,7 @@ decode_int(unsigned char* der, int lengt
+ }
+ 
+ static VALUE
+-decode_bstr(unsigned char* der, int length, long *unused_bits)
++decode_bstr(const unsigned char* der, int length, long *unused_bits)
+ {
+     ASN1_BIT_STRING *bstr;
+     const unsigned char *p;
+@@ -357,7 +357,7 @@ decode_bstr(unsigned char* der, int leng
+ }
+ 
+ static VALUE
+-decode_enum(unsigned char* der, int length)
++decode_enum(const unsigned char* der, int length)
+ {
+     ASN1_ENUMERATED *ai;
+     const unsigned char *p;
+@@ -376,7 +376,7 @@ decode_enum(unsigned char* der, int leng
+ }
+ 
+ static VALUE
+-decode_null(unsigned char* der, int length)
++decode_null(const unsigned char* der, int length)
+ {
+     ASN1_NULL *null;
+     const unsigned char *p;
+@@ -390,7 +390,7 @@ decode_null(unsigned char* der, int leng
+ }
+ 
+ static VALUE
+-decode_obj(unsigned char* der, int length)
++decode_obj(const unsigned char* der, int length)
+ {
+     ASN1_OBJECT *obj;
+     const unsigned char *p;
+@@ -419,7 +419,7 @@ decode_obj(unsigned char* der, int lengt
+ }
+ 
+ static VALUE
+-decode_time(unsigned char* der, int length)
++decode_time(const unsigned char* der, int length)
+ {
+     ASN1_TIME *time;
+     const unsigned char *p;
+@@ -707,10 +707,10 @@ ossl_asn1data_to_der(VALUE self)
+ }
+ 
+ static VALUE
+-ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
+-		  int once, int yield)
++ossl_asn1_decode0(const unsigned char **pp, long length, long *offset,
++		  long depth, int once, int yield)
+ {
+-    unsigned char *start, *p;
++    const unsigned char *start, *p;
+     const unsigned char *p0;
+     long len, off = *offset;
+     int hlen, tag, tc, j;
+@@ -816,7 +816,7 @@ ossl_asn1_decode0(unsigned char **pp, lo
+ static VALUE
+ ossl_asn1_traverse(VALUE self, VALUE obj)
+ {
+-    unsigned char *p;
++    const unsigned char *p;
+     long offset = 0;
+     volatile VALUE tmp;
+ 
+@@ -832,7 +832,7 @@ static VALUE
+ ossl_asn1_decode(VALUE self, VALUE obj)
+ {
+     VALUE ret, ary;
+-    unsigned char *p;
++    const unsigned char *p;
+     long offset = 0;
+     volatile VALUE tmp;
+ 
+@@ -849,7 +849,7 @@ static VALUE
+ ossl_asn1_decode_all(VALUE self, VALUE obj)
+ {
+     VALUE ret;
+-    unsigned char *p;
++    const unsigned char *p;
+     long offset = 0;
+     volatile VALUE tmp;
+ 
+Index: ext/openssl/ossl_config.c
+
+--- ext/openssl/ossl_config.c.orig	2009-04-18 23:10:06.000000000 +0900
++++ ext/openssl/ossl_config.c
+@@ -304,8 +304,17 @@ ossl_config_get_section_old(VALUE self, 
+ 
+ #ifdef IMPLEMENT_LHASH_DOALL_ARG_FN
+ static void
+-get_conf_section(CONF_VALUE *cv, VALUE ary)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++get_conf_section_doall_arg(void *arg1, void *arg2)
++#else
++get_conf_section(void *arg1, void *arg2)
++#endif
+ {
++    CONF_VALUE *cv;
++    VALUE ary;
++
++    cv = arg1;
++    ary = (VALUE)arg2;
+     if(cv->name) return;
+     rb_ary_push(ary, rb_str_new2(cv->section));
+ }
+@@ -320,19 +329,31 @@ ossl_config_get_sections(VALUE self)
+ 
+     GetConfig(self, conf);
+     ary = rb_ary_new();
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHM_lh_doall_arg(CONF_VALUE, conf->data,
++		     LHASH_DOALL_ARG_FN(get_conf_section), void, (void*)ary);
++#else
+     lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(get_conf_section), (void*)ary);
++#endif
+ 
+     return ary;
+ }
+ 
+ static void
+-dump_conf_value(CONF_VALUE *cv, VALUE str)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++dump_conf_value_doall_arg(void *arg1, void *arg2)
++#else
++dump_conf_value(void *arg1, void *arg2)
++#endif
+ {
+     STACK_OF(CONF_VALUE) *sk;
+-    CONF_VALUE *v;
++    CONF_VALUE *cv, *v;
++    VALUE str;
+     int i, num;
+ 
++    cv = arg1;
+     if (cv->name) return;
++    str = (VALUE)arg2;
+     sk = (STACK_OF(CONF_VALUE)*)cv->value;
+     num = sk_CONF_VALUE_num(sk);
+     rb_str_cat2(str, "[ ");
+@@ -356,7 +377,12 @@ dump_conf(CONF *conf)
+     VALUE str;
+ 
+     str = rb_str_new(0, 0);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHM_lh_doall_arg(CONF_VALUE, conf->data,
++		     LHASH_DOALL_ARG_FN(dump_conf_value), void, (void*)str);
++#else
+     lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), (void*)str);
++#endif
+ 
+     return str;
+ }
+@@ -372,13 +398,18 @@ ossl_config_to_s(VALUE self)
+ }
+ 
+ static void
+-each_conf_value(CONF_VALUE *cv, void* dummy)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++each_conf_value_doall_arg(void *arg1, void* dummy)
++#else
++each_conf_value(void *arg1, void* dummy)
++#endif
+ {
+     STACK_OF(CONF_VALUE) *sk;
+-    CONF_VALUE *v;
++    CONF_VALUE *cv, *v;
+     VALUE section, name, value, args;
+     int i, num;
+ 
++    cv = arg1;
+     if (cv->name) return;
+     sk = (STACK_OF(CONF_VALUE)*)cv->value;
+     num = sk_CONF_VALUE_num(sk);
+@@ -402,7 +433,12 @@ ossl_config_each(VALUE self)
+     RETURN_ENUMERATOR(self, 0, 0);
+ 
+     GetConfig(self, conf);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHM_lh_doall_arg(CONF_VALUE, conf->data,
++		     LHASH_DOALL_ARG_FN(each_conf_value), void, (void*)NULL);
++#else
+     lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL);
++#endif
+ 
+     return self;
+ }
+Index: ext/openssl/ossl_pkcs7.c
+
+--- ext/openssl/ossl_pkcs7.c.orig	2008-07-23 00:34:23.000000000 +0900
++++ ext/openssl/ossl_pkcs7.c
+@@ -572,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, V
+     return self;
+ }
+ 
+-static STACK *
+-pkcs7_get_certs_or_crls(VALUE self, int want_certs)
++static STACK_OF(X509) *
++pkcs7_get_certs(VALUE self)
+ {
+     PKCS7 *pkcs7;
+     STACK_OF(X509) *certs;
+-    STACK_OF(X509_CRL) *crls;
+     int i;
+ 
+     GetPKCS7(self, pkcs7);
+@@ -585,17 +584,38 @@ pkcs7_get_certs_or_crls(VALUE self, int 
+     switch(i){
+     case NID_pkcs7_signed:
+         certs = pkcs7->d.sign->cert;
+-        crls = pkcs7->d.sign->crl;
+         break;
+     case NID_pkcs7_signedAndEnveloped:
+         certs = pkcs7->d.signed_and_enveloped->cert;
++        break;
++    default:
++        certs = NULL;
++    }
++
++    return certs;
++}
++
++static STACK_OF(X509_CRL) *
++pkcs7_get_crls(VALUE self)
++{
++    PKCS7 *pkcs7;
++    STACK_OF(X509_CRL) *crls;
++    int i;
++
++    GetPKCS7(self, pkcs7);
++    i = OBJ_obj2nid(pkcs7->type);
++    switch(i){
++    case NID_pkcs7_signed:
++        crls = pkcs7->d.sign->crl;
++        break;
++    case NID_pkcs7_signedAndEnveloped:
+         crls = pkcs7->d.signed_and_enveloped->crl;
+         break;
+     default:
+-        certs = crls = NULL;
++        crls = NULL;
+     }
+ 
+-    return want_certs ? certs : crls;
++    return crls;
+ }
+ 
+ static VALUE
+@@ -610,7 +630,7 @@ ossl_pkcs7_set_certificates(VALUE self, 
+     STACK_OF(X509) *certs;
+     X509 *cert;
+ 
+-    certs = pkcs7_get_certs_or_crls(self, 1);
++    certs = pkcs7_get_certs(self);
+     while((cert = sk_X509_pop(certs))) X509_free(cert);
+     rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self);
+ 
+@@ -620,7 +640,7 @@ ossl_pkcs7_set_certificates(VALUE self, 
+ static VALUE
+ ossl_pkcs7_get_certificates(VALUE self)
+ {
+-    return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1));
++    return ossl_x509_sk2ary(pkcs7_get_certs(self));
+ }
+ 
+ static VALUE
+@@ -650,7 +670,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar
+     STACK_OF(X509_CRL) *crls;
+     X509_CRL *crl;
+ 
+-    crls = pkcs7_get_certs_or_crls(self, 0);
++    crls = pkcs7_get_crls(self);
+     while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
+     rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self);
+ 
+@@ -660,7 +680,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar
+ static VALUE
+ ossl_pkcs7_get_crls(VALUE self)
+ {
+-    return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0));
++    return ossl_x509crl_sk2ary(pkcs7_get_crls(self));
+ }
+ 
+ static VALUE
+Index: ext/openssl/ossl_ssl.c
+
+--- ext/openssl/ossl_ssl.c.orig	2009-03-21 17:08:52.000000000 +0900
++++ ext/openssl/ossl_ssl.c
+@@ -16,6 +16,12 @@
+ #  include <unistd.h> /* for read(), and write() */
+ #endif
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x00909000L
++#define OSSL_CONST	const
++#else
++#define OSSL_CONST
++#endif
++
+ #define numberof(ary) (sizeof(ary)/sizeof(ary[0]))
+ 
+ #ifdef _WIN32
+@@ -101,7 +107,7 @@ ID ID_callback_state;
+  */
+ struct {
+     const char *name;
+-    SSL_METHOD *(*func)(void);
++    OSSL_CONST SSL_METHOD *(*func)(void);
+ } ossl_ssl_method_tab[] = {
+ #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
+     OSSL_SSL_METHOD_ENTRY(TLSv1),
+@@ -150,7 +156,7 @@ ossl_sslctx_s_alloc(VALUE klass)
+ static VALUE
+ ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
+ {
+-    SSL_METHOD *method = NULL;
++    OSSL_CONST SSL_METHOD *method = NULL;
+     const char *s;
+     int i;
+ 
+@@ -662,7 +668,7 @@ ossl_sslctx_setup(VALUE self)
+ }
+ 
+ static VALUE
+-ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
++ossl_ssl_cipher_to_ary(const SSL_CIPHER *cipher)
+ {
+     VALUE ary;
+     int bits, alg_bits;
+@@ -700,10 +706,10 @@ ossl_sslctx_get_ciphers(VALUE self)
+     if (!ciphers)
+         return rb_ary_new();
+ 
+-    num = sk_num((STACK*)ciphers);
++    num = sk_SSL_CIPHER_num(ciphers);
+     ary = rb_ary_new2(num);
+     for(i = 0; i < num; i++){
+-        cipher = (SSL_CIPHER*)sk_value((STACK*)ciphers, i);
++        cipher = sk_SSL_CIPHER_value(ciphers, i);
+         rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher));
+     }
+     return ary;
+@@ -1400,10 +1406,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
+     }
+     chain = SSL_get_peer_cert_chain(ssl);
+     if(!chain) return Qnil;
+-    num = sk_num(chain);
++    num = sk_X509_num(chain);
+     ary = rb_ary_new2(num);
+     for (i = 0; i < num; i++){
+-	cert = (X509*)sk_value(chain, i);
++	cert = sk_X509_value(chain, i);
+ 	rb_ary_push(ary, ossl_x509_new(cert));
+     }
+ 
+@@ -1418,7 +1424,7 @@ static VALUE
+ ossl_ssl_get_cipher(VALUE self)
+ {
+     SSL *ssl;
+-    SSL_CIPHER *cipher;
++    const SSL_CIPHER *cipher;
+ 
+     Data_Get_Struct(self, SSL, ssl);
+     if (!ssl) {
+Index: ext/openssl/ossl_ssl_session.c
+
+--- ext/openssl/ossl_ssl_session.c.orig	2009-03-13 16:45:35.000000000 +0900
++++ ext/openssl/ossl_ssl_session.c
+@@ -84,10 +84,12 @@ static VALUE ossl_ssl_session_eq(VALUE v
+ 	GetSSLSession(val1, ctx1);
+ 	SafeGetSSLSession(val2, ctx2);
+ 
+-	switch (SSL_SESSION_cmp(ctx1, ctx2)) {
+-	case 0:		return Qtrue;
+-	default:	return Qfalse;
+-	}
++	if ((ctx1->ssl_version == ctx2->ssl_version) &&
++	    (ctx1->session_id_length == ctx2->session_id_length) &&
++	    memcmp(ctx1->session_id, ctx2->session_id, ctx1->session_id_length) == 0)
++	    return Qtrue;
++	else
++	    return Qfalse;
+ }
+ 
+ /*
+Index: ext/openssl/ossl_x509crl.c
+
+--- ext/openssl/ossl_x509crl.c.orig	2008-07-23 00:34:23.000000000 +0900
++++ ext/openssl/ossl_x509crl.c
+@@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self)
+     VALUE ary, revoked;
+ 
+     GetX509CRL(self, crl);
+-    num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl));
++    num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
+     if (num < 0) {
+ 	OSSL_Debug("num < 0???");
+ 	return rb_ary_new();
+@@ -272,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self)
+     ary = rb_ary_new2(num);
+     for(i=0; i<num; i++) {
+ 	/* NO DUP - don't free! */
+-	rev = (X509_REVOKED *)sk_X509_CRL_value(X509_CRL_get_REVOKED(crl), i);
++	rev = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
+ 	revoked = ossl_x509revoked_new(rev);
+ 	rb_ary_push(ary, revoked);
+     }
diff --git a/spelling/mythes/BUILD b/spelling/mythes/BUILD
new file mode 100755
index 0000000000..8f58e6df93
--- /dev/null
+++ b/spelling/mythes/BUILD
@@ -0,0 +1 @@
+make
diff --git a/spelling/mythes/DEPENDS b/spelling/mythes/DEPENDS
new file mode 100755
index 0000000000..fd0b0eb3e6
--- /dev/null
+++ b/spelling/mythes/DEPENDS
@@ -0,0 +1 @@
+depends g++
diff --git a/spelling/mythes/DETAILS b/spelling/mythes/DETAILS
new file mode 100755
index 0000000000..08302f8f08
--- /dev/null
+++ b/spelling/mythes/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=mythes
+         VERSION=1.1
+          SOURCE="MyThes-${VERSION}.tar.gz"
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/hunspell/${SOURCE}
+     SOURCE_HASH=sha512:4969b5445aa9fa14a440191103f80b70f2c22ef659cd5b1c6a94f6201699b44ad496b24c7da04e3dbdd49398602f2abaae0e59bbe6755ed7f6cf7f079838a832
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/MyThes-${VERSION}"
+        WEB_SITE="http://hyphen.sourceforge.net"
+      LICENSE[0]=other
+         ENTERED=20090901
+           SHORT="thesaurus library"
+cat << EOF
+thesaurus library
+EOF
diff --git a/spelling/mythes/HISTORY b/spelling/mythes/HISTORY
new file mode 100644
index 0000000000..af196a9a06
--- /dev/null
+++ b/spelling/mythes/HISTORY
@@ -0,0 +1,2 @@
+2010-03-31 Arjan Bouter <abouter@sourcemage.org>
+	* BUILD,DEPENDS,DETAILS,INSTALL,PRE_BUILD: spell created
diff --git a/spelling/mythes/INSTALL b/spelling/mythes/INSTALL
new file mode 100755
index 0000000000..486dc45ef0
--- /dev/null
+++ b/spelling/mythes/INSTALL
@@ -0,0 +1,8 @@
+cd "${SOURCE_DIRECTORY}" &&
+
+install -m 0644 libmythes.a ${INSTALL_ROOT}/usr/lib/libmythes.a &&
+install -m 0644 mythes.hxx ${INSTALL_ROOT}/usr/include/mythes.hxx &&
+
+mkdir -p "${INSTALL_ROOT}/usr/share/mythes" &&
+install -m 0644 th_en_US_new.idx \
+                ${INSTALL_ROOT}/usr/share/mythes/th_en_US_new.idx
diff --git a/spelling/mythes/PRE_BUILD b/spelling/mythes/PRE_BUILD
new file mode 100755
index 0000000000..50757b0f9f
--- /dev/null
+++ b/spelling/mythes/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+sedit 's/^CXXFLAGS/#CXXFLAGS/' Makefile
author	Vasil Yonkov	2010-04-01 21:58:08 +0300
committer	Vasil Yonkov	2010-04-01 21:58:08 +0300
commit	1ff42c70d8671f8e06ab917b41a4206cc3599f80 (patch)
tree	7bd7aec8bf11d8edbd527ca0003ff0a54675dfae
parent	55b8a49d9186626913828a4d68a8fecd4e3a9508 (diff)
parent	9f21f304f609ad59dca6cefecc678b22133bc7d8 (diff)