8 files changed, 32 insertions, 74 deletions

diff --git a/net-im/sulci/Makefile b/net-im/sulci/Makefile
index 4e3ab6450cb8..125f25e21c6d 100644
--- a/net-im/sulci/Makefile
+++ b/net-im/sulci/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sulci
-PORTVERSION=	0.5.a.20050918
-PORTREVISION=	1
+PORTVERSION=	0.5.a.20060221
 PORTEPOCH=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.jabber.ru/files/sulci/
@@ -41,9 +40,17 @@ OCAML_SITELIBDIR=	${LOCALBASE}/lib/ocaml/site-lib
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${PORTNAME} ${PREFIX}/sbin
 
+	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
+.for i in lang/langcompile tlds/createtlds utils/wtf/wtf_convert
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${i} ${PREFIX}/libexec/${PORTNAME}
+.endfor
+
 	${MKDIR} ${DATADIR}/lang
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/lang/*.htbl ${WRKSRC}/${PORTNAME}/lang/*.ml ${WRKSRC}/${PORTNAME}/lang/*.msg ${DATADIR}/lang
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/tlds.db ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/lang/*.htbl ${WRKSRC}/${PORTNAME}/lang/*.msg ${DATADIR}/lang
+
+.for i in tlds.db tlds.txt
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/tlds/${i} ${DATADIR}
+.endfor
 
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${PORTNAME}.conf.example ${EXAMPLESDIR}
diff --git a/net-im/sulci/distinfo b/net-im/sulci/distinfo
index b8ef16c40d1e..d38dd254b3b1 100644
--- a/net-im/sulci/distinfo
+++ b/net-im/sulci/distinfo
@@ -1,3 +1,3 @@
-MD5 (sulci-0.5-alpha-20050918.tar.bz2) = cfcb70be47815ebb54e9722469d5403d
-SHA256 (sulci-0.5-alpha-20050918.tar.bz2) = 22526d853c1fd24a3d6ccab410d98efb776a2d5331d66113dd93ad33e418425a
-SIZE (sulci-0.5-alpha-20050918.tar.bz2) = 351692
+MD5 (sulci-0.5-alpha-20060221.tar.bz2) = f7ee71356e56e37bc5739598f2d058e4
+SHA256 (sulci-0.5-alpha-20060221.tar.bz2) = a089755a8f59073068b0b9ea81122c9c04d24b009985907dc76e5bde6d0c0f94
+SIZE (sulci-0.5-alpha-20060221.tar.bz2) = 580361
diff --git a/net-im/sulci/files/patch-doc-sulci-cmdlist.en.txt b/net-im/sulci/files/patch-doc-sulci-cmdlist.en.txt
deleted file mode 100644
index 8d37819075d0..000000000000
--- a/net-im/sulci/files/patch-doc-sulci-cmdlist.en.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- docs/sulci/cmdlist.en.txt.orig	Thu Aug  4 17:10:21 2005
-+++ docs/sulci/cmdlist.en.txt	Fri Aug  5 12:17:58 2005
-@@ -157,3 +157,17 @@
- 
-   Show wheater status from http://weather.noaa.gov/ for city by given
-   4 symbols code.
-+
-+
-+* tr list
-+
-+  Show list of language codes for translating.
-+
-+* tr lang text
-+
-+  Translate text via http://www.translate.ru/ as language code say.
-+
-+
-+* vcard nick
-+
-+  Show nick's vCard, if any.
diff --git a/net-im/sulci/files/patch-doc-sulci-cmdlist.ru.txt b/net-im/sulci/files/patch-doc-sulci-cmdlist.ru.txt
deleted file mode 100644
index 13c0e8025bd9..000000000000
--- a/net-im/sulci/files/patch-doc-sulci-cmdlist.ru.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- docs/sulci/cmdlist.ru.txt.orig	Thu Aug  4 17:10:22 2005
-+++ docs/sulci/cmdlist.ru.txt	Fri Aug  5 12:17:27 2005
-@@ -169,3 +169,18 @@
- 
-   Выводит прогноз погоды с http://weather.noaa.gov/ для города,
-   обозначенного 4-х буквенным кодом code.
-+
-+
-+* tr list
-+
-+  Выводит список кодов языков, для перевода.
-+
-+* tr lang text
-+
-+  Переводит указанный текст через http://www.translate.ru/ в
-+  соответствии с кодом языка.
-+
-+
-+* vcard nick
-+
-+  Выводит vCard указанного ника, если есть.
diff --git a/net-im/sulci/files/patch-sulci-plugin_cerberus.ml b/net-im/sulci/files/patch-sulci-plugin_cerberus.ml
deleted file mode 100644
index dbd2dbfe1934..000000000000
--- a/net-im/sulci/files/patch-sulci-plugin_cerberus.ml
+++ /dev/null
@@ -1,20 +0,0 @@
---- sulci/plugin_cerberus.ml.orig	Sun Sep 18 16:10:16 2005
-+++ sulci/plugin_cerberus.ml	Tue Sep 20 16:23:52 2005
-@@ -10,7 +10,7 @@
- open Hooks
- 
- let regexp ca          = 0x430 | 0x410 | 'a' | 'A'
--let regexp cb          = 0x431 | 0x411 | '6'
-+let regexp cb          = 0x431 | 0x411
- let regexp cv          = 0x432 | 0x412 | 'B' 
- let regexp cg          = 0x433 | 0x413
- let regexp cd          = 0x434 | 0x414
-@@ -45,7 +45,7 @@
- 
- let regexp cyrillic = [0x410-0x44F 0x451 0x401 '0' '3' 'a''A' 'e' 'E' 'H' 
- 			  'o' 'O' 'c' 'C' 'k' 'K' 'T' 'x' 'X' 'y' 'Y' 'p' 
--			  'P' '6' '0'] | "|/|" | "bl" | "bI"
-+			  'P' '0'] | "|/|" | "bl" | "bI"
- 
- let regexp ci_ie_io = ci | cie | cio
- let regexp cie_io = cie | cio
diff --git a/net-im/sulci/files/patch-sulci-sulci.conf.example b/net-im/sulci/files/patch-sulci-sulci.conf.example
index 48aa0b4d8b40..43c9ff3509a8 100644
--- a/net-im/sulci/files/patch-sulci-sulci.conf.example
+++ b/net-im/sulci/files/patch-sulci-sulci.conf.example
@@ -1,5 +1,5 @@
---- sulci/sulci.conf.example.orig	Sun Sep 18 18:32:13 2005
-+++ sulci/sulci.conf.example	Tue Sep 20 16:02:07 2005
+--- sulci/sulci.conf.example.orig	Mon Feb  6 23:13:27 2006
++++ sulci/sulci.conf.example	Tue Feb 21 17:29:45 2006
 @@ -1,6 +1,6 @@
  <sulci>
   <jabber>
@@ -27,7 +27,7 @@
   </muc>
 @@ -40,9 +40,9 @@
  
-   <vocabulary name="vocabulary"/>
+   <vocabulary db="vocabulary.db"/>
  
 -  <mueller file="/path/to/Mueller24.koi" hashext=".hash" />
 +  <mueller file="/usr/local/share/mueller-dic/Mueller7accentGPL.koi" hashext=".h" />
diff --git a/net-im/sulci/files/pkg-message.in b/net-im/sulci/files/pkg-message.in
index 34422d382941..8ecc339f21a2 100644
--- a/net-im/sulci/files/pkg-message.in
+++ b/net-im/sulci/files/pkg-message.in
@@ -21,3 +21,13 @@ and don't forget to chown home/of/the/sulci/the/bot
 
 Note: you have to get the key from Google before using the "google"
 plug-in. See http://api.google.com/ for how to.
+
+WARNING!!! After upgrading from 0.5.a.20050918 version you have to
+convert you vocabulary database to sqlite using
+
+  %%PREFIX%%/libexec/sulci/wtf_convert
+
+and change sulci's configuration file in "vocabulary" directive, see
+
+  %%PREFIX%%/%%EXAMPLESDIR%%/sulci.conf.example
+
diff --git a/net-im/sulci/pkg-plist b/net-im/sulci/pkg-plist
index 1fde11e85fe6..24193530a4f5 100644
--- a/net-im/sulci/pkg-plist
+++ b/net-im/sulci/pkg-plist
@@ -1,16 +1,17 @@
+libexec/sulci/createtlds
+libexec/sulci/langcompile
+libexec/sulci/wtf_convert
 sbin/sulci
 %%DATADIR%%/tlds.db
+%%DATADIR%%/tlds.txt
 %%DATADIR%%/lang/en.htbl
 %%DATADIR%%/lang/en.msg
-%%DATADIR%%/lang/en_time.ml
 %%DATADIR%%/lang/es.htbl
 %%DATADIR%%/lang/es.msg
-%%DATADIR%%/lang/es_time.ml
 %%DATADIR%%/lang/nl.htbl
 %%DATADIR%%/lang/nl.msg
 %%DATADIR%%/lang/ru.htbl
 %%DATADIR%%/lang/ru.msg
-%%DATADIR%%/lang/ru_time.ml
 %%EXAMPLESDIR%%/sulci.conf.example
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/cmdlist.en.txt
@@ -19,3 +20,4 @@ sbin/sulci
 @dirrm %%DATADIR%%/lang
 @dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%
+@dirrm libexec/sulci