Date: Mon, 17 Oct 2005 11:33:07 +0400 (MSD) From: Denis Shaposhnikov <dsh@vlink.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dsh@neva.vlink.ru Subject: ports/87560: Update port: net/sulci (to 0.5.a.20050918) Message-ID: <200510170733.j9H7X7qI059294@neva.vlink.ru> Resent-Message-ID: <200510170740.j9H7eIME095457@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87560 >Category: ports >Synopsis: Update port: net/sulci (to 0.5.a.20050918) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Oct 17 07:40:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Denis Shaposhnikov >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD neva.vlink.ru 7.0-CURRENT FreeBSD 7.0-CURRENT #21: Sun Aug 14 15:59:53 MSD 2005 dsh@neva.vlink.ru:/var/FreeBSD/obj/var/FreeBSD/src/sys/NEVA i386 >Description: Upgrade to 0.5.a.20050918 version. >How-To-Repeat: >Fix: diff -Nru sulci.orig/Makefile sulci/Makefile --- sulci.orig/Makefile Mon Oct 17 11:30:04 2005 +++ sulci/Makefile Mon Oct 17 11:30:20 2005 @@ -6,10 +6,11 @@ # PORTNAME= sulci -PORTVERSION= 0.5.a.20050723 +PORTVERSION= 0.5.a.20050918 PORTEPOCH= 1 CATEGORIES= net -MASTER_SITES= http://neva.vlink.ru/distfiles/ +MASTER_SITES= http://www.jabber.ru/files/sulci/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a./-alpha-/} MAINTAINER= dsh@vlink.ru COMMENT= A Jabber bot @@ -19,20 +20,22 @@ ${OCAML_SITELIBDIR}/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex \ ocamlfind:${PORTSDIR}/devel/ocaml-findlib \ ${OCAML_SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net \ + ${OCAML_SITELIBDIR}/netclient/netclient.a:${PORTSDIR}/net/ocaml-netclient \ ${OCAML_SITELIBDIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 \ pcre.0:${PORTSDIR}/devel/pcre-utf8 RUN_DEPENDS= ${OCAML_SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net \ - ${OCAML_SITELIBDIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre \ mueller:${PORTSDIR}/russian/mueller-dic -OCAML_SITELIBDIR= ${LOCALBASE}/lib/ocaml/site-lib - USE_BZIP2= yes USE_GMAKE= yes USE_RC_SUBR= ${PORTNAME}.sh ALL_TARGET= subdirs +PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_FILES= pkg-message + +OCAML_SITELIBDIR= ${LOCALBASE}/lib/ocaml/site-lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${PORTNAME} ${PREFIX}/sbin @@ -47,12 +50,12 @@ .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} -. for i in COPYING ChangeLog +. for i in COPYING ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} . endfor . for i in cmdlist.en.txt cmdlist.ru.txt - ${INSTALL_DATA} ${WRKSRC}/doc/sulci/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/sulci/${i} ${DOCSDIR} . endfor .endif diff -Nru sulci.orig/distinfo sulci/distinfo --- sulci.orig/distinfo Mon Oct 17 11:30:04 2005 +++ sulci/distinfo Tue Sep 20 15:19:45 2005 @@ -1,2 +1,2 @@ -MD5 (sulci-0.5.a.20050723.tar.bz2) = 5aec17e5dea265c25e0819d19bc96ad0 -SIZE (sulci-0.5.a.20050723.tar.bz2) = 156778 +MD5 (sulci-0.5-alpha-20050918.tar.bz2) = cfcb70be47815ebb54e9722469d5403d +SIZE (sulci-0.5-alpha-20050918.tar.bz2) = 351692 diff -Nru sulci.orig/files/patch-doc-sulci-cmdlist.en.txt sulci/files/patch-doc-sulci-cmdlist.en.txt --- sulci.orig/files/patch-doc-sulci-cmdlist.en.txt Thu Jan 1 03:00:00 1970 +++ sulci/files/patch-doc-sulci-cmdlist.en.txt Tue Sep 20 14:21:00 2005 @@ -0,0 +1,20 @@ +--- 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 -Nru sulci.orig/files/patch-doc-sulci-cmdlist.ru.txt sulci/files/patch-doc-sulci-cmdlist.ru.txt --- sulci.orig/files/patch-doc-sulci-cmdlist.ru.txt Thu Jan 1 03:00:00 1970 +++ sulci/files/patch-doc-sulci-cmdlist.ru.txt Tue Sep 20 14:21:07 2005 @@ -0,0 +1,21 @@ +--- 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 -Nru sulci.orig/files/patch-sulci-plugin_cerberus.ml sulci/files/patch-sulci-plugin_cerberus.ml --- sulci.orig/files/patch-sulci-plugin_cerberus.ml Thu Jan 1 03:00:00 1970 +++ sulci/files/patch-sulci-plugin_cerberus.ml Tue Sep 20 16:25:11 2005 @@ -0,0 +1,20 @@ +--- 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 -Nru sulci.orig/files/patch-sulci-sulci.conf.example sulci/files/patch-sulci-sulci.conf.example --- sulci.orig/files/patch-sulci-sulci.conf.example Mon Oct 17 11:30:04 2005 +++ sulci/files/patch-sulci-sulci.conf.example Tue Sep 20 16:02:16 2005 @@ -1,5 +1,5 @@ ---- sulci/sulci.conf.example.orig Mon Jul 25 12:52:33 2005 -+++ sulci/sulci.conf.example Mon Jul 25 14:34:06 2005 +--- sulci/sulci.conf.example.orig Sun Sep 18 18:32:13 2005 ++++ sulci/sulci.conf.example Tue Sep 20 16:02:07 2005 @@ -1,6 +1,6 @@ <sulci> <jabber> @@ -8,9 +8,9 @@ <port>5222</port> <user>sxxxx</user> <resource>Ocaml</resource> -@@ -14,20 +14,22 @@ - --> - <reconnect interval='10' count='3' /> +@@ -15,13 +15,13 @@ + + <lifelog>./sulci_life.log</lifelog> - <lang dir="./lang" default="ru"/> + <lang dir="/usr/local/share/sulci/lang" default="ru"/> @@ -25,30 +25,15 @@ <chatlogs>./chatlogs</chatlogs> </muc> - -+ <!-- - <debug> - <logfile>log.log</logfile> - </debug> -+ --> - - <plugins> - -@@ -37,7 +39,7 @@ +@@ -40,9 +40,9 @@ <vocabulary name="vocabulary"/> - <mueller file="/path/to/Mueller24.koi" hashext=".hash" /> + <mueller file="/usr/local/share/mueller-dic/Mueller7accentGPL.koi" hashext=".h" /> - <markov dir="./markov_db" msg_limit="20" /> - -@@ -59,7 +61,7 @@ - --> - - <cerberus kick="true"> -- <notify jid="jid@jabber.server"/> -+ <notify jid="admin@localhost"/> - </cerberus> +- <markov dir="./markov_db" msg_limit="20" /> ++ <markov dir="./markov_db/" msg_limit="20" /> - </plugins> + <!-- it used on http://ejabberd.jabber.ru/ to display total registered users + and users online using ejabberd --> diff -Nru sulci.orig/files/pkg-message.in sulci/files/pkg-message.in --- sulci.orig/files/pkg-message.in Thu Jan 1 03:00:00 1970 +++ sulci/files/pkg-message.in Tue Sep 20 14:26:49 2005 @@ -0,0 +1,23 @@ +You have to do something like bellow before starting up the bot. + + # mkdir home/of/the/sulci/the/bot + # cd home/of/the/sulci/the/bot + # cp %%PREFIX%%/share/examples/sulci/sulci.conf.example sulci.conf + # vi sulci.conf + # ln -s %%PREFIX%%/share/sulci/tlds.db . + + # echo sulci_enable=\"YES\" >> /etc/rc.conf + # echo sulci_chdir=\"home/of/the/sulci/the/bot\" >> /etc/rc.conf + + +Also, you could add rc.subr's vars like this: + + sulci_user="sulci" + sulci_nice="20" + sulci_precmd="eval `/usr/bin/limits -U sulci -e`" + +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. diff -Nru sulci.orig/files/sulci.sh.in sulci/files/sulci.sh.in --- sulci.orig/files/sulci.sh.in Mon Oct 17 11:30:04 2005 +++ sulci/files/sulci.sh.in Thu Aug 4 17:10:41 2005 @@ -21,7 +21,7 @@ name="sulci" rcvar=`set_rcvar` command="%%PREFIX%%/sbin/sulci" -command_args="> /dev/null 2>&1 &" +command_args="&" load_rc_config $name diff -Nru sulci.orig/pkg-message sulci/pkg-message --- sulci.orig/pkg-message Mon Oct 17 11:30:04 2005 +++ sulci/pkg-message Thu Jan 1 03:00:00 1970 @@ -1,23 +0,0 @@ -You have to do something like bellow before starting up the bot. - - # mkdir home/of/the/sulci/the/bot - # cd home/of/the/sulci/the/bot - # cp ${PREFIX}/share/examples/sulci/sulci.conf.example sulci.conf - # vi sulci.conf - # ln -s ${PREFIX}/share/sulci/tlds.db . - - # echo sulci_enable=\"YES"\ >> /etc/rc.conf - # echo sulci_chdir=\"home/of/the/sulci/the/bot\" >> /etc/rc.conf - - -Also, you could add rc.subr's vars like this: - - sulci_user="sulci" - sulci_nice="20" - sulci_precmd="eval `/usr/bin/limits -U sulci -e`" - -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. diff -Nru sulci.orig/pkg-plist sulci/pkg-plist --- sulci.orig/pkg-plist Mon Oct 17 11:30:04 2005 +++ sulci/pkg-plist Tue Sep 20 14:40:21 2005 @@ -13,7 +13,6 @@ %%DATADIR%%/lang/ru_time.ml %%EXAMPLESDIR%%/sulci.conf.example %%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/cmdlist.en.txt %%PORTDOCS%%%%DOCSDIR%%/cmdlist.ru.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510170733.j9H7X7qI059294>