diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2014-07-31 11:27:40 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2014-07-31 11:27:40 +0000 |
| commit | c47c14f35137b114b05c1b8fc6152277ec65b524 (patch) | |
| tree | f79b92aa0655f722cb7dba7ab98fecb34646bd15 /net-im/ejabberd/files | |
| parent | devel/p5-Exporter-Lite: 0.05 -> 0.06 (diff) | |
- Update to 14.07
- Remove STUN option, as it is removed upstream
- Clean up CONFIGURE_ARGS, as some of the arguments are not supported
- Do not display pkg-message in post-install[1]
- Strip libraries[1]
- Add missing @dirrmtry entries to pkg-plist[1]
- Replace /var/lock (not in mtree) with /var/run[1]
PR: 192011[1]
Submitted by: olgeni[1]
Diffstat (limited to 'net-im/ejabberd/files')
| -rw-r--r-- | net-im/ejabberd/files/patch-Makefile.in | 20 | ||||
| -rw-r--r-- | net-im/ejabberd/files/patch-ejabberdctl.template | 23 |
2 files changed, 24 insertions, 19 deletions
diff --git a/net-im/ejabberd/files/patch-Makefile.in b/net-im/ejabberd/files/patch-Makefile.in index a3e6157a6db0..1df921834af8 100644 --- a/net-im/ejabberd/files/patch-Makefile.in +++ b/net-im/ejabberd/files/patch-Makefile.in @@ -12,15 +12,20 @@ $FreeBSD$ # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ -@@ -41,7 +41,7 @@ +@@ -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/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 @@ -54,15 +59,6 @@ $FreeBSD$ # # Init script $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \ -@@ -151,6 +148,8 @@ - # Binary C programs - $(INSTALL) -d $(PBINDIR) - $(INSTALL) -m 750 $(O_USER) tools/captcha.sh $(PBINDIR) -+ -[ -f deps/p1_pam/priv/bin/epam ] \ -+ && $(INSTALL) -m 750 $(O_USER) deps/p1_pam/priv/bin/epam $(PBINDIR) - # - # Binary system libraries - $(INSTALL) -d $(SODIR) @@ -177,6 +176,7 @@ chmod -R 750 $(LOGDIR) # diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template index 4b49be468b60..98a1dc839cee 100644 --- a/net-im/ejabberd/files/patch-ejabberdctl.template +++ b/net-im/ejabberd/files/patch-ejabberdctl.template @@ -3,20 +3,20 @@ $FreeBSD$ --- ejabberdctl.template.orig +++ ejabberdctl.template -@@ -68,10 +68,10 @@ - EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.yml +@@ -67,10 +67,10 @@ + EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml fi if [ "$LOGS_DIR" = "" ] ; then - LOGS_DIR={{localstatedir}}/log/ejabberd -+ LOGS_DIR=/var/log/ejabberd ++ LOGS_DIR=/var/log/ejabberd fi - if [ "$SPOOLDIR" = "" ] ; then -- SPOOLDIR={{localstatedir}}/lib/ejabberd -+ SPOOLDIR=/var/spool/ejabberd + if [ "$SPOOL_DIR" = "" ] ; then +- SPOOL_DIR={{localstatedir}}/lib/ejabberd ++ SPOOLDIR=/var/spool/ejabberd fi if [ "$EJABBERD_DOC_PATH" = "" ] ; then EJABBERD_DOC_PATH={{docdir}} -@@ -85,10 +85,10 @@ +@@ -84,10 +84,10 @@ EJABBERDDIR={{libdir}}/ejabberd fi if [ "$EJABBERD_EBIN_PATH" = "" ] ; then @@ -29,3 +29,12 @@ $FreeBSD$ fi if [ "$EJABBERD_BIN_PATH" = "" ] ; then EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin +@@ -281,7 +281,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' |