From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 26 10:30:05 2007
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
X-Original-To: freebsd-ports-bugs@hub.freebsd.org
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 1625316A400
for <freebsd-ports-bugs@hub.freebsd.org>;
Mon, 26 Mar 2007 10:30:05 +0000 (UTC)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40])
by mx1.freebsd.org (Postfix) with ESMTP id E199F13C487
for <freebsd-ports-bugs@hub.freebsd.org>;
Mon, 26 Mar 2007 10:30:04 +0000 (UTC)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2QAU4xg042419
for <freebsd-ports-bugs@freefall.freebsd.org>;
Mon, 26 Mar 2007 10:30:04 GMT
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2QAU4ii042418;
Mon, 26 Mar 2007 10:30:04 GMT (envelope-from gnats)
Resent-Date: Mon, 26 Mar 2007 10:30:04 GMT
Resent-Message-Id: <200703261030.l2QAU4ii042418@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
Denis Shaposhnikov <dsh@vlink.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 3CD7B16A404
for <FreeBSD-gnats-submit@freebsd.org>;
Mon, 26 Mar 2007 10:22:06 +0000 (UTC) (envelope-from dsh@vlink.ru)
Received: from sagitta.internal.vlink.ru (sagitta.internal.vlink.ru
[85.172.168.1])
by mx1.freebsd.org (Postfix) with ESMTP id 9FE4A13C458
for <FreeBSD-gnats-submit@freebsd.org>;
Mon, 26 Mar 2007 10:22:05 +0000 (UTC) (envelope-from dsh@vlink.ru)
Received: from sagitta.internal.vlink.ru (localhost [127.0.0.1])
by sagitta.internal.vlink.ru (Postfix) with ESMTP id 8C2401F45A4;
Mon, 26 Mar 2007 14:22:04 +0400 (MSD)
Received: from neva.vlink.ru (neva.vlink.ru [85.172.168.250])
by sagitta.internal.vlink.ru (Postfix) with ESMTP id 4A0D71F4563;
Mon, 26 Mar 2007 14:22:04 +0400 (MSD)
Received: from neva.vlink.ru (localhost [127.0.0.1])
by neva.vlink.ru (8.13.8/8.13.8) with ESMTP id l2QAM3qr054354;
Mon, 26 Mar 2007 14:22:03 +0400 (MSD)
(envelope-from dsh@neva.vlink.ru)
Received: (from dsh@localhost)
by neva.vlink.ru (8.13.8/8.13.8/Submit) id l2QAM3r9054350;
Mon, 26 Mar 2007 14:22:03 +0400 (MSD) (envelope-from dsh)
Message-Id: <200703261022.l2QAM3r9054350@neva.vlink.ru>
Date: Mon, 26 Mar 2007 14:22:03 +0400 (MSD)
From: Denis Shaposhnikov <dsh@vlink.ru>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Cc:
Subject: ports/110845: Update port: net-im/sulci (add option to disable MUC
logging)
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Denis Shaposhnikov <dsh@vlink.ru>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Mar 2007 10:30:05 -0000
>Number: 110845
>Category: ports
>Synopsis: Update port: net-im/sulci (add option to disable MUC logging)
>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 Mar 26 10:30:04 GMT 2007
>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 #1: Fri Mar 16 09:20:13 MSK 2007 dsh@neva.vlink.ru:/var/FreeBSD/obj/var/FreeBSD/src/sys/MYNERIC i386
>Description:
This patch adds ports OPTION to disable MUC logging.
>How-To-Repeat:
>Fix:
diff -Nru --exclude=.svn sulci.orig/Makefile sulci/Makefile
--- sulci.orig/Makefile Mon Mar 26 14:19:49 2007
+++ sulci/Makefile Mon Mar 26 08:34:48 2007
@@ -15,27 +15,28 @@
MAINTAINER= dsh@vlink.ru
COMMENT= A Jabber bot
-BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
- ${LOCALBASE}/lib/ocaml/cryptokit.cma:${PORTSDIR}/security/ocaml-cryptokit \
- ${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
+BUILD_DEPENDS= ${LOCALBASE}/lib/ocaml/cryptokit.cma:${PORTSDIR}/security/ocaml-cryptokit \
+ ${PREFIX}/${OCAML_SITELIBDIR}/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex \
+ ${PREFIX}/${OCAML_SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net \
+ ${PREFIX}/${OCAML_SITELIBDIR}/netclient/netclient.a:${PORTSDIR}/net/ocaml-netclient \
+ ${PREFIX}/${OCAML_SITELIBDIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 \
pcre.0:${PORTSDIR}/devel/pcre
-RUN_DEPENDS= ${OCAML_SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net \
+RUN_DEPENDS= ${PREFIX}/${OCAML_SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net \
mueller:${PORTSDIR}/russian/mueller-dic
USE_BZIP2= yes
USE_GMAKE= yes
+USE_OCAML= yes
+NO_OCAML_RUNDEPENDS= yes
+USE_OCAML_FINDLIB= yes
USE_RC_SUBR= ${PORTNAME}.sh
ALL_TARGET= subdirs
PKGMESSAGE= ${WRKDIR}/pkg-message
SUB_FILES= pkg-message
-OCAML_SITELIBDIR= ${LOCALBASE}/lib/ocaml/site-lib
+OPTIONS= MUC_LOG "with muc_log plugin" on
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${PORTNAME} ${PREFIX}/sbin
@@ -70,4 +71,11 @@
post-install:
${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
+
+.if defined(WITHOUT_MUC_LOG)
+EXTRA_PATCHES+= ${FILESDIR}/without-muc-log.patch
+.endif
+
+.include <bsd.port.post.mk>
diff -Nru --exclude=.svn sulci.orig/files/without-muc-log.patch sulci/files/without-muc-log.patch
--- sulci.orig/files/without-muc-log.patch Thu Jan 1 03:00:00 1970
+++ sulci/files/without-muc-log.patch Mon Mar 26 08:34:48 2007
@@ -0,0 +1,21 @@
+--- sulci/Makefile.orig Tue Feb 21 16:05:07 2006
++++ sulci/Makefile Wed Apr 26 18:11:29 2006
+@@ -5,7 +5,7 @@
+ include Makefile.conf
+
+ SOURCES = version.ml config.ml logger.ml common.ml types.ml lang.ml muc.ml \
+- find_url.ml muc_log.ml hooks.ml iq.ml http_suck.ml
++ find_url.ml hooks.ml iq.ml http_suck.ml
+
+ SUBDIRS = lang
+
+--- sulci/hooks.ml.orig Sat Feb 4 20:00:48 2006
++++ sulci/hooks.ml Wed Apr 26 18:10:59 2006
+@@ -167,7 +167,6 @@
+ in
+ (try
+ let event = get_event () in
+- Muc_log.process_log event from xml;
+ List.iter (fun proc -> proc event from xml out) !filters;
+ (match event with
+ | Iq _ ->
diff -Nru --exclude=.svn sulci.orig/pkg-descr sulci/pkg-descr
--- sulci.orig/pkg-descr Mon Mar 26 14:19:49 2007
+++ sulci/pkg-descr Mon Sep 11 17:02:15 2006
@@ -1,3 +1,4 @@
-Sulci, an Jabber bot.
+Sulci is a free (GPL) Jabber bot that provides functionalities for
+individuals and chatrooms.
-WWW: http://home.ermine.pp.ru/svn/ocaml/trunk/
+WWW: http://ejabberd.jabber.ru/sulci
>Release-Note:
>Audit-Trail:
>Unformatted: