[SM-Commit] GIT changes to test grimoire by

scm at mail.sourcemage.org scm at mail.sourcemage.org
Wed May 10 13:20:27 EDT 2006


GIT changes to test grimoire by  <>:

 i18n/API_VERSION         |    1 
 i18n/ami/DETAILS         |    1 
 i18n/ami/HISTORY         |    3 +
 i18n/canna/BUILD         |   17 +++------
 i18n/canna/DETAILS       |    8 ++--
 i18n/canna/HISTORY       |    5 ++
 i18n/canna/INSTALL       |    2 +
 i18n/freewnn/BUILD       |    9 +----
 i18n/freewnn/CONFIGURE   |   10 ++---
 i18n/freewnn/DETAILS     |    1 
 i18n/freewnn/HISTORY     |    5 ++
 i18n/gjiten/DETAILS      |    4 +-
 i18n/gjiten/HISTORY      |    3 +
 i18n/iiimf-canna/DETAILS |    1 
 i18n/iiimf-canna/HISTORY |    3 +
 i18n/im-sdk/BUILD        |   84 ++++++++++++++++++-----------------------------
 i18n/im-sdk/DETAILS      |   12 +++---
 i18n/im-sdk/HISTORY      |    6 +++
 i18n/im-sdk/INSTALL      |   25 +++++++++++++
 i18n/kinput2/BUILD       |   39 +++++++--------------
 i18n/kinput2/CONFIGURE   |   16 --------
 i18n/kinput2/DEPENDS     |    6 +--
 i18n/kinput2/HISTORY     |    4 ++
 i18n/scim-tables/DETAILS |    9 ++---
 i18n/scim-tables/HISTORY |    4 ++
 i18n/scim/DEPENDS        |    4 +-
 i18n/scim/DETAILS        |    9 ++---
 i18n/scim/HISTORY        |    5 ++
 28 files changed, 153 insertions(+), 143 deletions(-)

New commits:
commit 40c592b63f357cf9a9ce4984b5e5e6517785e68a
Merge: 1e4aeb0... e281e53...
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

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

commit 1e4aeb0cfdf634852c523762f13a938cf798aebf
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    iiimf-canna: "ported" to BUILD_API=2

commit fa255a6cf685382d9c0a42155fbe3203dfc6fe36
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    im-sdk: version bump, ported to api2, made it build

commit 0cbdbc98e128c5f392969a4f9b294144653e6b10
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    gjiten: version bump, "ported" to api2

commit 14453ac2b0aed28812c39590b41622fcdb727791
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    scim-tables: "ported" to BUILD_API=2, bumped version, changed urls

commit c323155a553e460631cbe1e54cd44494bb0ccd10
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    scim: "ported" to BUILD_API=2, bumped version, changed urls
          commented out two depends, which don't appear to be needed

commit 5e1f7f8c08e62aca135a17c93db35dd141b16f35
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    kinput2: ported to api2, cleaned up

commit a1d26003219b7cf992585006401b79710acf6084
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    frewnn: ported to api2, fixed account creation, fixed horrible querying

commit 0e61300f5fcf85f8f9f274247c24609fc3417218
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    canna: bumped version, ported to api2, fixed man page install dir

commit 22ca35e5b405cbcaa85028960d43a961d9862640
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    "ported" to BUILD_API=2, removed MAINTAINER

commit 728189c278222cddb474e02dc6802da1fb44cd07
Author: Jaka Kranjc <lynx at mages.ath.cx>
Commit: Jaka Kranjc <lynx at mages.ath.cx>

    i18n: added section-wide API_VERSION (=2), spell updates follow

diff --git a/i18n/API_VERSION b/i18n/API_VERSION
new file mode 100755
index 0000000..844885a
--- /dev/null
+++ b/i18n/API_VERSION
@@ -0,0 +1 @@
+BUILD_API=2
diff --git a/i18n/ami/DETAILS b/i18n/ami/DETAILS
index 34558a4..85ff7a9 100755
--- a/i18n/ami/DETAILS
+++ b/i18n/ami/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
       LICENSE[0]=GPL
          ENTERED=20030912
          UPDATED=20030912
-      MAINTAINER=jimmy at yen.tp
         KEYWORDS="i18n"
            SHORT="An XIM input method server for Hangul/Korean"
 cat << EOF
diff --git a/i18n/ami/HISTORY b/i18n/ami/HISTORY
index 106260d..267d8d8 100644
--- a/i18n/ami/HISTORY
+++ b/i18n/ami/HISTORY
@@ -1,3 +1,6 @@
+2006-04-28 Jaka Kranjc <lynx at mages.ath.cx>
+	* DETAILS: "ported to BUILD_API=2", removed MAINTAINER
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/i18n/canna/BUILD b/i18n/canna/BUILD
index b96bb8d..407f8fe 100755
--- a/i18n/canna/BUILD
+++ b/i18n/canna/BUILD
@@ -1,10 +1,7 @@
-(
-  sedit "s:/usr/local/canna:${INSTALL_ROOT}/usr:"             Canna.conf  &&
-  sedit "s:/usr/spool/canna:${INSTALL_ROOT}/var/spool/canna:" Canna.conf  &&
-  xmkmf            &&
-  make Makefiles   &&
-  make canna       &&
-  prepare_install  &&
-  make install     &&
-  make install.man
-) > $C_FIFO 2>&1
+sed -i "s:/usr/local/canna:${INSTALL_ROOT}/usr:"             Canna.conf  &&
+sed -i "s:/usr/spool/canna:${INSTALL_ROOT}/var/spool/canna:" Canna.conf  &&
+sed -i 's:$(cannaPrefix)/man:$(cannaPrefix)/share/man:'      Canna.conf  &&
+xmkmf            &&
+make Makefiles   &&
+make canna
+
diff --git a/i18n/canna/DETAILS b/i18n/canna/DETAILS
index 03fce94..1a2adf8 100755
--- a/i18n/canna/DETAILS
+++ b/i18n/canna/DETAILS
@@ -1,9 +1,9 @@
            SPELL=canna
-         VERSION=36p3
-          SOURCE=Canna$VERSION.tar.gz
+         VERSION=37p3
+          SOURCE=Canna$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Canna$VERSION
-   SOURCE_URL[0]=http://downloads.sourceforge.jp/canna/2181/$SOURCE
-     SOURCE_HASH=sha512:722289fd30eca8d01639090f000e7a74c55c7efb969397144f4148853d22fb5e5186f924dc415aa3007e3e5b5914ff33d07eb543272495b05abe9c90b5a7b413
+   SOURCE_URL[0]=http://downloads.sourceforge.jp/canna/9565/$SOURCE
+     SOURCE_HASH=sha512:82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
         WEB_SITE=http://canna.sourceforge.jp
          ENTERED=20040122
          UPDATED=20030910
diff --git a/i18n/canna/HISTORY b/i18n/canna/HISTORY
index 782ea40..c1e1d26 100644
--- a/i18n/canna/HISTORY
+++ b/i18n/canna/HISTORY
@@ -1,3 +1,8 @@
+2006-04-29 Jaka Kranjc <lynx at mages.ath.cx>
+	* DETAILS: bumped version
+	* BUILD: ported to api2, fixed man page install dir
+	* INSTALL: added
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/i18n/canna/INSTALL b/i18n/canna/INSTALL
new file mode 100755
index 0000000..bda739b
--- /dev/null
+++ b/i18n/canna/INSTALL
@@ -0,0 +1,2 @@
+make install     &&
+make install.man
diff --git a/i18n/freewnn/BUILD b/i18n/freewnn/BUILD
index 8346ce8..66edb37 100755
--- a/i18n/freewnn/BUILD
+++ b/i18n/freewnn/BUILD
@@ -1,6 +1,3 @@
-(
-  groupadd wnn       2>/dev/null
-  useradd wnn -g wnn 2>/dev/null
-
-  default_build
-) >$C_FIFO 2>&1
+create_group wnn                                 &&
+create_account wnn /dev/null /bin/false wnn      &&
+default_build
diff --git a/i18n/freewnn/CONFIGURE b/i18n/freewnn/CONFIGURE
index bce974e..0c0c1a9 100755
--- a/i18n/freewnn/CONFIGURE
+++ b/i18n/freewnn/CONFIGURE
@@ -13,9 +13,9 @@ #  else echo 'OPTS="$OPTS --disable-clie
 #  fi
 #fi
 
-if ! grep -q "unsafe" $SPELL_CONFIG; then
-  if query "Allow clients to connect from any host (can be a security risk)?" n
-  then echo 'OPTS="$OPTS --enable-unsafe-path"' >> $SPELL_CONFIG
-  else echo 'OPTS="$OPTS --disable-unsafe-path"' >> $SPELL_CONFIG
-  fi
+config_query UNSAFE "Allow clients to connect from any host (can be a security risk)?" n &&
+if [[ $UNSAFE == "y" ]]; then
+  OPTS="$OPTS --enable-unsafe-path"
+else
+  OPTS="$OPTS --disable-unsafe-path"
 fi
diff --git a/i18n/freewnn/DETAILS b/i18n/freewnn/DETAILS
index e6371a3..c84e4a9 100755
--- a/i18n/freewnn/DETAILS
+++ b/i18n/freewnn/DETAILS
@@ -7,7 +7,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/FreeWn
         WEB_SITE=http://www.freewnn.org/
          ENTERED=20030108
          UPDATED=20030108
-      MAINTAINER=jimmy at yen.tp
         KEYWORDS="i18n"
            SHORT="A Japanese dictionary server for Kana-Kanji conversion"
 cat << EOF
diff --git a/i18n/freewnn/HISTORY b/i18n/freewnn/HISTORY
index 646ab04..8653536 100644
--- a/i18n/freewnn/HISTORY
+++ b/i18n/freewnn/HISTORY
@@ -1,3 +1,8 @@
+2006-04-29 Jaka Kranjc <lynx at mages.ath.cx>
+	* DETAILS: removed MAINTAINER
+	* BUILD: ported to api2, fixed account creation
+	* CONFIGURE: fixed horrible querying
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/i18n/gjiten/DETAILS b/i18n/gjiten/DETAILS
index 541ea90..5a133ca 100755
--- a/i18n/gjiten/DETAILS
+++ b/i18n/gjiten/DETAILS
@@ -1,9 +1,9 @@
            SPELL=gjiten
-         VERSION=2.1
+         VERSION=2.5
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://gjiten.sourceforge.net/$SOURCE
-     SOURCE_HASH=sha512:84a6b56c367d195d0705eaafe0a6af3a3c43c97c05236f40034dd116a7cde9ddbe81c62c0de0e9a97e071e520605dd443627c20df748c387b37b38d7c88cfe25
+     SOURCE_HASH=sha512:974700f30e46694db326d4be5e0eb2b85058d32f706b72589c2824c43cb616721472e129669727678463086f77880ea102abd23721f5431ca0c05df6af1e9ae9
         WEB_SITE=http://gjiten.sourceforge.net/
          ENTERED=20040126
          UPDATED=20040126
diff --git a/i18n/gjiten/HISTORY b/i18n/gjiten/HISTORY
index bcbef9c..51851dd 100644
--- a/i18n/gjiten/HISTORY
+++ b/i18n/gjiten/HISTORY
@@ -1,3 +1,6 @@
+2006-04-29 Jaka Kranjc <lynx at mages.ath.cx>
+	* DETAILS: version bump, "ported" to api2
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/i18n/iiimf-canna/DETAILS b/i18n/iiimf-canna/DETAILS
index 030e1a3..2695962 100755
--- a/i18n/iiimf-canna/DETAILS
+++ b/i18n/iiimf-canna/DETAILS
@@ -7,7 +7,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
         WEB_SITE=http://sourceforge.jp/projects/iiimf-skk/
          ENTERED=20030906
          UPDATED=20030906
-      MAINTAINER=jimmy at yen.tp
         KEYWORDS="i18n"
            SHORT="IIIM language engine module using Canna library"
 cat << EOF
diff --git a/i18n/iiimf-canna/HISTORY b/i18n/iiimf-canna/HISTORY
index 35f873b..0dcf9c7 100644
--- a/i18n/iiimf-canna/HISTORY
+++ b/i18n/iiimf-canna/HISTORY
@@ -1,3 +1,6 @@
+2006-05-10 Jaka Kranjc <lynx at mages.ath.cx>
+	* DETAILS: "ported" to BUILD_API=2, removed MAINTAINER
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/i18n/im-sdk/BUILD b/i18n/im-sdk/BUILD
index 55fb96d..ca05e70 100755
--- a/i18n/im-sdk/BUILD
+++ b/i18n/im-sdk/BUILD
@@ -1,54 +1,36 @@
-(
-  BUILDDIRS="lib/EIMIL lib/iiimp lib/iiimcf \
-    iiimsf leif iiimxcf/xiiimp.so iiimxcf/htt_xbe iiimgcf"
+# excluded leif, doesn't build
+BUILDDIRS="lib/EIMIL lib/iiimp lib/iiimcf \
+  iiimsf iiimxcf/xiiimp.so iiimxcf/htt_xbe iiimgcf"
 
-  (
-    # this makes it compile with libiconv installed
-    cp lib/CSConv/iconv/iconv.h include/   &&
+# this makes it compile with libiconv installed
+cp lib/CSConv/iconv/iconv.h include/   &&
 
-    cd lib/CSConv                          &&
-    ./configure \
-      --prefix=$INSTALL_ROOT/usr/lib/im \
-      --without-libiconv-prefix \
-      $OPTS  &&
-    make
-  )                                        &&
+pushd lib/CSConv                       &&
+./configure \
+  --prefix=$INSTALL_ROOT/usr/lib/im \
+  --without-libiconv-prefix \
+  $OPTS                                &&
+make                                   &&
+popd                                   &&
 
-  for dir in $BUILDDIRS; do
-  (
-    cd $dir                                &&
-    ./configure \
-      --prefix=$INSTALL_ROOT/usr \
-      --sysconfdir=$INSTALL_ROOT/etc \
-      --localstatedir=$INSTALL_ROOT/var \
-      --libdir=$INSTALL_ROOT/usr/lib \
-      --without-libiconv-prefix \
-      $OPTS                                &&
-    make
-  ) || return 1
-  done                         &&
-
-  prepare_install              &&
-
-  (
-    cd lib/CSConv              &&
-    make install
-  )                            &&
-
-  for dir in $BUILDDIRS; do
-  (
-    cd $dir                    &&
-    make install
-  ) || return 1
-  done                         &&
-  
-  # move config file to a sane place
-  cd $INSTALL_ROOT/usr/lib/im                       &&
-  if [ ! -f $INSTALL_ROOT/etc/im/htt.conf ] ; then
-    mkdir -p $INSTALL_ROOT/etc/im                   &&
-    mv htt.conf $INSTALL_ROOT/etc/im/
-  else
-    rm -f htt.conf
-  fi                                                &&
-  ln -sf /etc/im/htt.conf htt.conf
-) >$C_FIFO 2>&1
+for dir in $BUILDDIRS; do
+ {
+  pushd $dir                             &&
+  if [[ ! -e configure ]]; then
+    ./autogen.sh
+  fi                                     &&
+  ./configure \
+    --prefix=$INSTALL_ROOT/usr \
+    --sysconfdir=$INSTALL_ROOT/etc \
+    --localstatedir=$INSTALL_ROOT/var \
+    --libdir=$INSTALL_ROOT/usr/lib \
+    --without-libiconv-prefix \
+    $OPTS                                &&
+  if [[ $dir == iiimgcf ]]; then
+    # fix broken po files
+    sed -i '/Last-Translator/{ s/^.*$/&\n"Language-Team: unknown;\\n"/ }' po/*.po
+  fi                                     &&
+  make                                   &&
+  popd 
+ } || return 1
+done
diff --git a/i18n/im-sdk/DETAILS b/i18n/im-sdk/DETAILS
index fba1ed6..e0a2590 100755
--- a/i18n/im-sdk/DETAILS
+++ b/i18n/im-sdk/DETAILS
@@ -1,13 +1,13 @@
            SPELL=im-sdk
-         VERSION=r11_4-1467
-          SOURCE=$SPELL.r11_4.1467.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.openi18n.org/download/docs/im-sdk/$SOURCE
-     SOURCE_HASH=sha512:c5ee4675c5f0c6f102efd08102609750df4fda4f6349e6010f856d8c041a31839ebe076eb0cbaa4c3958f93427f952ec49c4f6e0dffde5c9166a308fbe62fe4b
+         VERSION=12_1-svn2002
+          SOURCE=$SPELL-src-r$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-r$VERSION
+   SOURCE_URL[0]=http://www.openi18n.org/download/im-sdk/src/$SOURCE
+     SOURCE_HASH=sha512:833200789975c12961a37bf36a78ec13512dd36f051eb89ac08d36b484db74a85cf3d781f0d3015a46637f49caee61a1d10d81af271da21585eb6459009c9596
         WEB_SITE=http://www.openi18n.org/subgroups/im/IIIMF/
          ENTERED=20030906
          UPDATED=20030906
-      MAINTAINER=jimmy at yen.tp
+         LICENSE=MIT
         KEYWORDS="i18n"
            SHORT="Internet/Intranet Input Method Framework IM SDK"
 cat << EOF
diff --git a/i18n/im-sdk/HISTORY b/i18n/im-sdk/HISTORY
index 1a133b7..974c672 100644
--- a/i18n/im-sdk/HISTORY
+++ b/i18n/im-sdk/HISTORY
@@ -1,3 +1,9 @@
+2006-05-09 Jaka Kranjc <lynx at mages.ath.cx>
+	* DETAILS: version bump, removed MAINTAINER, added LICENSE
+	* INSTALL: added, split off BUILD
+	* BUILD: ported to api2, removed building of broken leif component,
+	         fixed PO files for newer gettext
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/i18n/im-sdk/INSTALL b/i18n/im-sdk/INSTALL
new file mode 100755
index 0000000..e3c8063
--- /dev/null
+++ b/i18n/im-sdk/INSTALL
@@ -0,0 +1,25 @@
+# excluded leif, doesn't build
+BUILDDIRS="lib/EIMIL lib/iiimp lib/iiimcf \
+iiimsf iiimxcf/xiiimp.so iiimxcf/htt_xbe iiimgcf"
+
+pushd lib/CSConv           &&
+make install               &&
+popd                       &&
+
+for dir in $BUILDDIRS; do
+ {
+  pushd $dir               &&
+  make install             &&
+  popd                     &&
+ } || return 1
+done                       &&
+
+# move config file to a sane place
+cd $INSTALL_ROOT/usr/lib/im                       &&
+if [[ ! -f $INSTALL_ROOT/etc/im/htt.conf ]]; then
+  mkdir -p $INSTALL_ROOT/etc/im                   &&
+  mv htt.conf $INSTALL_ROOT/etc/im/
+else
+  rm -f htt.conf
+fi                                                &&
+ln -sf /etc/im/htt.conf htt.conf
diff --git a/i18n/kinput2/BUILD b/i18n/kinput2/BUILD
index 61b880c..6023f7a 100755
--- a/i18n/kinput2/BUILD
+++ b/i18n/kinput2/BUILD
@@ -1,28 +1,17 @@
-(
-  if ! (( $USE_CANNA+$USE_WNN )) ; then
-    message "You need at least one dictionary server for kinput2 to function!"
-    false
-  fi                                            &&
-  
-  sedit "s/#define UseSj3//" Kinput2.conf       &&
+sed -i "s/#define UseSj3//" Kinput2.conf       &&
 
-  if ! (( $USE_CANNA )) ; then
-    sedit "s/#define UseCanna//" Kinput2.conf
-  fi                                            &&
-  if (( $USE_WNN )) ; then
-    sedit "s/\/\* #define UseWnn \*\//#define UseWnn/" Kinput2.conf &&
-    sedit "s/^WNN/XCOMM _WNN/" Kinput2.conf                         &&
-    sedit "s/XCOMM WNN/WNN/" Kinput2.conf
-  fi                                            &&
+if [[ $DICT_SERVER != canna ]]; then
+    sed -i "s/#define UseCanna//" Kinput2.conf                       &&
+    sed -i "s/\/\* #define UseWnn \*\//#define UseWnn/" Kinput2.conf &&
+    sed -i "s/^WNN/XCOMM _WNN/" Kinput2.conf                         &&
+    sed -i "s/XCOMM WNN/WNN/" Kinput2.conf
+fi                                             &&
 
-  sedit "s/\/usr\/X11R6/\/usr/" Kinput2.conf    &&
-  sedit "s/\/usr\/local/\/usr/" Kinput2.conf    &&
-  sedit "s/\/usr\/canna/\/usr/" Kinput2.conf    &&
-  sedit "s/\/usr/${INSTALL_ROOT//\//\\\/}\/usr/" Kinput2.conf &&
+sed -i "s/\/usr\/X11R6/\/usr/" Kinput2.conf    &&
+sed -i "s/\/usr\/local/\/usr/" Kinput2.conf    &&
+sed -i "s/\/usr\/canna/\/usr/" Kinput2.conf    &&
+sed -i "s/\/usr/${INSTALL_ROOT//\//\\\/}\/usr/" Kinput2.conf &&
 
-  xmkmf 					&&
-  make Makefiles				&&
-  make						&&
-  prepare_install				&&
-  make install
-) > $C_FIFO 2>&1
+xmkmf           &&
+make Makefiles  &&
+make
diff --git a/i18n/kinput2/CONFIGURE b/i18n/kinput2/CONFIGURE
index b5868eb..def01ce 100755
--- a/i18n/kinput2/CONFIGURE
+++ b/i18n/kinput2/CONFIGURE
@@ -1,15 +1 @@
-if ! grep -q USE_CANNA $SPELL_CONFIG; then
-  if query "Enable Canna support?" y
-  then USE_CANNA=1
-  else USE_CANNA=0
-  fi
-  echo  "USE_CANNA=$USE_CANNA"  >>  $SPELL_CONFIG
-fi
-
-if ! grep -q USE_WNN $SPELL_CONFIG ; then
-  if query "Enable Wnn support?" y
-  then USE_WNN=1
-  else USE_WNN=0
-  fi
-  echo  "USE_WNN=$USE_WNN"  >>  $SPELL_CONFIG
-fi
+config_query_list DICT_SERVER "Which dictionary server for kinput2 would you like to use ?" canna wwn
diff --git a/i18n/kinput2/DEPENDS b/i18n/kinput2/DEPENDS
index d73bb68..68675f5 100755
--- a/i18n/kinput2/DEPENDS
+++ b/i18n/kinput2/DEPENDS
@@ -1,9 +1,7 @@
 depends  X11-LIBS  &&
 
-if [ ! -n $USE_CANNA ] || (( $USE_CANNA )) ; then
+if [[ $DICT_SERVER == canna ]]; then
   depends canna
-fi  &&
-
-if (( $USE_WNN )) ; then
+else
   depends freewnn
 fi
diff --git a/i18n/kinput2/HISTORY b/i18n/kinput2/HISTORY
index 5b3bbae..fda790f 100644
--- a/i18n/kinput2/HISTORY
+++ b/i18n/kinput2/HISTORY
@@ -1,3 +1,7 @@
+2006-04-29 Jaka Kranjc <lynx at mages.ath.cx>
+	* CONFIGURE, BUILD, DEPENDS: cleaned
+	* BUILD: ported to api2
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/i18n/scim-tables/DETAILS b/i18n/scim-tables/DETAILS
index e570cd7..a3faf20 100755
--- a/i18n/scim-tables/DETAILS
+++ b/i18n/scim-tables/DETAILS
@@ -1,14 +1,13 @@
            SPELL=scim-tables
-         VERSION=0.3.0
+         VERSION=0.5.6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://ns.turbolinux.com.cn/~suzhe/scim/
-   SOURCE_URL[0]=$WEB_SITE/sources/$SOURCE
-     SOURCE_HASH=sha512:09c9c97cf9de9e4a8f4de65d3eb5541f846c748b889777d543986f46ac6776e3ec5de61853efcc56059612ea7f4b97858802621538950e597144120ab23809d7
+        WEB_SITE=http://www.scim-im.org/
+   SOURCE_URL[0]=$SOURCEFORGE_URL/scim/$SOURCE
+     SOURCE_HASH=sha512:2b33318de1542ebf644f4243bf059cc5352a3d1de98f39d1ada34371c4a257ff6740f255c422a15f0ee5c6cc7033a2a9edf73f53d00b250e03cd54ce52b89fef
       LICENSE[0]=GPL
          ENTERED=20030912
          UPDATED=20030912
-      MAINTAINER=jimmy at yen.tp
         KEYWORDS="i18n"
            SHORT="Generic conversion tables for SCIM"
 cat << EOF
diff --git a/i18n/scim-tables/HISTORY b/i18n/scim-tables/HISTORY
index 5a1f97b..4fa335c 100644
--- a/i18n/scim-tables/HISTORY
+++ b/i18n/scim-tables/HISTORY
@@ -1,3 +1,7 @@
+2006-05-04 Jaka Kranjc <lynx at mages.ath.cx>
+	* DETAILS: ported to BUILD_API=2, bumped version, 
+	  changed urls, removed MAINTAINER
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/i18n/scim/DEPENDS b/i18n/scim/DEPENDS
index 21a8401..5a66c78 100755
--- a/i18n/scim/DEPENDS
+++ b/i18n/scim/DEPENDS
@@ -1,6 +1,6 @@
 depends  gtk+2    &&
 depends  pango    &&
 depends  libxml2  &&
-depends  orbit2   &&
-depends  gconf2   &&
+#depends  orbit2   &&
+#depends  gconf2   &&
 depends  atk
diff --git a/i18n/scim/DETAILS b/i18n/scim/DETAILS
index 57e3240..6c0af4e 100755
--- a/i18n/scim/DETAILS
+++ b/i18n/scim/DETAILS
@@ -1,14 +1,13 @@
            SPELL=scim
-         VERSION=0.8.1
+         VERSION=1.4.4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://ns.turbolinux.com.cn/~suzhe/scim/
-   SOURCE_URL[0]=$WEB_SITE/sources/$SOURCE
-     SOURCE_HASH=sha512:d3bbd62e4a8ed41cf4cd0bcc86c67756e99bf2e1e0c359dd6153228a2c59102b542f19f5cc513f42ffba856f4ca74c47bddc0b4341bc2cc1e73107b198081be7
+        WEB_SITE=http://www.scim-im.org/
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:5dcd2331097ebb413bff7ad6f5fbb1e1563b80f196da3f8036ed518e87e31ac3ab3f43644dee121557602571ce2ba314345db270c459d3767b11b6b35f385e00 
       LICENSE[0]=GPL
          ENTERED=20030912
          UPDATED=20030912
-      MAINTAINER=jimmy at yen.tp
         KEYWORDS="i18n"
            SHORT="The Smart Common Input Method platform"
 cat << EOF
diff --git a/i18n/scim/HISTORY b/i18n/scim/HISTORY
index 17bd34f..fd62d89 100644
--- a/i18n/scim/HISTORY
+++ b/i18n/scim/HISTORY
@@ -1,3 +1,8 @@
+2006-04-29 Jaka Kranjc <lynx at mages.ath.cx>
+	* DETAILS: ported to BUILD_API=2, bumped version, 
+	  changed urls, removed MAINTAINER
+	* DEPENDS: commented out two depends, they don't appear to be needed
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 



More information about the SM-Commit mailing list