Attachment #95562 for bug #133981

View | Details | Raw Unified | Return to bug 133981
Collapse All | Expand All

Lines 6-12 Link Here

(-)/home/dsh/ports/net-im/ejabberd/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= ejabberd	8	PORTNAME= ejabberd
9	PORTVERSION= 2.0.3	9	PORTVERSION= 2.0.5
10	CATEGORIES= net-im	10	CATEGORIES= net-im
11	MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/ \	11	MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/ \
12	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/	12	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/

Lines 1-3 Link Here

(-)/home/dsh/ports/net-im/ejabberd/distinfo (-3 / +3 lines)
1	MD5 (ejabberd-2.0.3.tar.gz) = b647e74b0f94f030bd8747c8a8a4d0f9	1	MD5 (ejabberd-2.0.5.tar.gz) = 2d85b47df969daf0a78ed3b16562d731
2	SHA256 (ejabberd-2.0.3.tar.gz) = d34bcf6c73e8d3fd5bf3b2555b3db8f0bd8197a6303b6db17df8945a2cd339ff	2	SHA256 (ejabberd-2.0.5.tar.gz) = 37ef90e2afa2b73a620bf71a096df48d5fde8f1cd669fac83d8c143a1295198c
3	SIZE (ejabberd-2.0.3.tar.gz) = 1089870	3	SIZE (ejabberd-2.0.5.tar.gz) = 1796737




--- ejabberdctl.template.orig	2009-04-01 19:23:51.000000000 +0400
+++ ejabberdctl.template	2009-04-23 22:42:24.000000000 +0400
@@ -14,8 +14,8 @@
 ERL=@erl@
 ROOTDIR=@rootdir@

-LOGS_DIR=$ROOTDIR/var/log/ejabberd/
-EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE
+LOGS_DIR=/var/log/ejabberd/
+EJABBERD_DB=/var/spool/ejabberd
 
 # read custom configuration
 CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg

-EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs
-EJABBERD_SO_PATH=$ROOTDIR/var/lib/ejabberd/priv/lib
-EJABBERD_BIN_PATH=$ROOTDIR/var/lib/ejabberd/priv/bin
+EJABBERD_EBIN=$ROOTDIR/lib/erlang/lib/ejabberd/ebin
+EJABBERD_MSGS_PATH=$ROOTDIR/lib/erlang/lib/ejabberd/priv/msgs
+EJABBERD_SO_PATH=$ROOTDIR/lib/erlang/lib/ejabberd/priv/lib
+EJABBERD_BIN_PATH=$ROOTDIR/lib/erlang/lib/ejabberd/priv/bin
+EJABBERD_BIN_PATH=$HOME/priv/bin
 EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
 SASL_LOG_PATH=$LOGS_DIR/sasl.log
 DATETIME=`date "+%Y%m%d-%H%M%S"`
 ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
 ERL_INETRC=$ROOTDIR/etc/ejabberd/inetrc
-HOME=$ROOTDIR/var/lib/ejabberd
+HOME=$EJABBERD_DB
 
 # export global variables
 export EJABBERD_CONFIG_PATH

Return to bug 133981

Lines 1-5 Link Here

(-)/home/dsh/ports/net-im/ejabberd/files/patch-src::ejabberdctl.template (-8 / +8 lines)
1	--- ejabberdctl.template.orig 2009-01-14 12:54:15.000000000 +0300	1	--- ejabberdctl.template.orig 2009-04-01 19:23:51.000000000 +0400
2	+++ ejabberdctl.template 2009-01-24 18:32:15.000000000 +0300	2	+++ ejabberdctl.template 2009-04-23 22:42:24.000000000 +0400
3	@@ -14,8 +14,8 @@	3	@@ -14,8 +14,8 @@
4	ERL=@erl@	4	ERL=@erl@
5	ROOTDIR=@rootdir@	5	ROOTDIR=@rootdir@
Lines 7-13 Link Here
7	-LOGS_DIR=$ROOTDIR/var/log/ejabberd/	7	-LOGS_DIR=$ROOTDIR/var/log/ejabberd/
8	-EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE	8	-EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE
9	+LOGS_DIR=/var/log/ejabberd/	9	+LOGS_DIR=/var/log/ejabberd/
10	+EJABBERD_DB=/var/spool/ejabberd/$NODE	10	+EJABBERD_DB=/var/spool/ejabberd
11		11
12	# read custom configuration	12	# read custom configuration
13	CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg	13	CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg
Lines 19-35 Link Here
19	-EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs	19	-EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs
20	-EJABBERD_SO_PATH=$ROOTDIR/var/lib/ejabberd/priv/lib	20	-EJABBERD_SO_PATH=$ROOTDIR/var/lib/ejabberd/priv/lib
21	-EJABBERD_BIN_PATH=$ROOTDIR/var/lib/ejabberd/priv/bin	21	-EJABBERD_BIN_PATH=$ROOTDIR/var/lib/ejabberd/priv/bin
22	+HOME=$ROOTDIR/lib/erlang/lib/ejabberd	22	+EJABBERD_EBIN=$ROOTDIR/lib/erlang/lib/ejabberd/ebin
23	+EJABBERD_EBIN=$HOME/ebin	23	+EJABBERD_MSGS_PATH=$ROOTDIR/lib/erlang/lib/ejabberd/priv/msgs
24	+EJABBERD_MSGS_PATH=$HOME/priv/msgs	24	+EJABBERD_SO_PATH=$ROOTDIR/lib/erlang/lib/ejabberd/priv/lib
25	+EJABBERD_SO_PATH=$HOME/priv/lib	25	+EJABBERD_BIN_PATH=$ROOTDIR/lib/erlang/lib/ejabberd/priv/bin
26	+EJABBERD_BIN_PATH=$HOME/priv/bin
27	EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log	26	EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
28	SASL_LOG_PATH=$LOGS_DIR/sasl.log	27	SASL_LOG_PATH=$LOGS_DIR/sasl.log
29	DATETIME=`date "+%Y%m%d-%H%M%S"`	28	DATETIME=`date "+%Y%m%d-%H%M%S"`
30	ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump	29	ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
31	ERL_INETRC=$ROOTDIR/etc/ejabberd/inetrc	30	ERL_INETRC=$ROOTDIR/etc/ejabberd/inetrc
32	-HOME=$ROOTDIR/var/lib/ejabberd	31	-HOME=$ROOTDIR/var/lib/ejabberd
		32	+HOME=$EJABBERD_DB
33		33
34	# export global variables	34	# export global variables
35	export EJABBERD_CONFIG_PATH	35	export EJABBERD_CONFIG_PATH

Lines 132-137 Link Here

(-)/home/dsh/ports/net-im/ejabberd/pkg-plist (+3 lines)
132	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/tls.beam	132	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/tls.beam
133	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/translate.beam	133	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/translate.beam
134	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/treap.beam	134	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/treap.beam
		135	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/win32_dns.beam
135	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml.beam	136	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml.beam
136	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_stream.beam	137	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_stream.beam
137	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so	138	lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so
Lines 182-187 Link Here
182	%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.1.txt	183	%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.1.txt
183	%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.2.txt	184	%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.2.txt
184	%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.3.txt	185	%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.3.txt
		186	%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.4.txt
		187	%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.5.txt
185	%%PORTDOCS%%%%DOCSDIR%%/webadmmain.png	188	%%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
186	%%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png	189	%%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
187	%%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png	190	%%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png