Attachment #144847 for bug #192011

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

Lines 78-83 Link Here

(-)Makefile (-1 / +3 lines)
78	.if ${PORT_OPTIONS:MPAM}	78	.if ${PORT_OPTIONS:MPAM}
79	${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${STAGEDIR}${PREFIX}/etc/pam.d/ejabberd	79	${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${STAGEDIR}${PREFIX}/etc/pam.d/ejabberd
80	.endif	80	.endif
81	@${CAT} ${PKGMESSAGE}	81	.for _file in p1_tls_drv.so expat_erl.so p1_yaml.so esip_drv.so p1_sha.so ezlib_drv.so iconv.so stringprep.so
		82	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/erlang/lib/ejabberd-${PORTVERSION}/priv/lib/${_file}
		83	.endfor
82		84
83	.include <bsd.port.post.mk>	85	.include <bsd.port.post.mk>




 
 # /share/doc/ejabberd
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -41,10 +41,10 @@
 MSGSDIR = $(PRIVDIR)/msgs
 
 # /var/lib/ejabberd/

-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
+SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd
 
-# /var/lock/ejabberdctl
-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
+# /var/run/ejabberdctl
+CTLLOCKDIR = $(DESTDIR)@localstatedir@/run/ejabberdctl
 
 # /var/lib/ejabberd/.erlang.cookie
 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
@@ -109,25 +109,22 @@
 	#
 	# Configuration files




     fi
     if [ "$EJABBERD_BIN_PATH" = "" ] ; then
         EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
@@ -261,7 +261,7 @@
     # using flock if available. Expects a linux-style
     # flock that can lock a file descriptor.
     MAXCONNID=100
-    CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
+    CONNLOCKDIR={{localstatedir}}/run/ejabberdctl
     FLOCK='/usr/bin/flock'
     if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
         JOT='/usr/bin/jot'

Lines 416-418 Link Here

(-)pkg-plist (+3 lines)
416	@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin	416	@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin
417	@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%	417	@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
418	@dirrmtry %%ETCDIR%%	418	@dirrmtry %%ETCDIR%%
		419	@dirrmtry /var/spool/ejabberd
		420	@dirrmtry /var/run/ejabberdctl
		421	@dirrmtry /var/log/ejabberd

Return to bug 192011

Lines 29-31 Link Here

(-)files/patch-ejabberdctl.template (+9 lines)
29	fi	29	fi
30	if [ "$EJABBERD_BIN_PATH" = "" ] ; then	30	if [ "$EJABBERD_BIN_PATH" = "" ] ; then
31	EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin	31	EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
		32	@@ -261,7 +261,7 @@
		33	# using flock if available. Expects a linux-style
		34	# flock that can lock a file descriptor.
		35	MAXCONNID=100
		36	- CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
		37	+ CONNLOCKDIR={{localstatedir}}/run/ejabberdctl
		38	FLOCK='/usr/bin/flock'
		39	if [ ! -x "$FLOCK" ] \|\| [ ! -d "$CONNLOCKDIR" ] ; then
		40	JOT='/usr/bin/jot'

Lines 12-18 Link Here

(-)files/patch-Makefile.in (-3 / +8 lines)
12		12
13	# /share/doc/ejabberd	13	# /share/doc/ejabberd
14	PACKAGE_TARNAME = @PACKAGE_TARNAME@	14	PACKAGE_TARNAME = @PACKAGE_TARNAME@
15	@@ -41,7 +41,7 @@	15	@@ -41,10 +41,10 @@
16	MSGSDIR = $(PRIVDIR)/msgs	16	MSGSDIR = $(PRIVDIR)/msgs
17		17
18	# /var/lib/ejabberd/	18	# /var/lib/ejabberd/
Lines 19-26 Link Here
19	-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd	19	-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
20	+SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd	20	+SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd
21		21
22	# /var/lock/ejabberdctl	22	-# /var/lock/ejabberdctl
23	CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl	23	-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
		24	+# /var/run/ejabberdctl
		25	+CTLLOCKDIR = $(DESTDIR)@localstatedir@/run/ejabberdctl
		26
		27	# /var/lib/ejabberd/.erlang.cookie
		28	COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
24	@@ -109,25 +109,22 @@	29	@@ -109,25 +109,22 @@
25	#	30	#
26	# Configuration files	31	# Configuration files