diff options
Diffstat (limited to 'net-im/ejabberd/files')
| -rw-r--r-- | net-im/ejabberd/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | net-im/ejabberd/files/patch-ejabberdctl.template | 16 | ||||
| -rw-r--r-- | net-im/ejabberd/files/pkg-install.in | 2 |
3 files changed, 20 insertions, 9 deletions
diff --git a/net-im/ejabberd/files/patch-Makefile.in b/net-im/ejabberd/files/patch-Makefile.in index af3fa522ebe0..d51553691661 100644 --- a/net-im/ejabberd/files/patch-Makefile.in +++ b/net-im/ejabberd/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2017-07-06 11:49:21 UTC +--- Makefile.in.orig 2017-09-28 13:21:11 UTC +++ Makefile.in @@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@ LIBDIR = $(DESTDIR)@libdir@ @@ -32,6 +32,15 @@ MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1) TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1)))) TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path))))) +@@ -123,7 +123,7 @@ FILES_WILDCARD=$(call FILTER_DIRS,$(fore + + ifeq ($(MAKECMDGOALS),copy-files-sub) + +-DEPS:=$(sort $(shell $(REBAR) -q list-deps|$(SED) -e '/[a-z0-9_-]+\s/d;s/ .*//')) ++DEPS:=$(sort $(shell $(REBAR) -q list-deps|$(SED) -rne '/^[a-zA-Z0-9_-]{1,} (TAG|REV)/s/^([^ ]*).*/\1/p')) + + DEPS_FILES=$(call FILES_WILDCARD,$(foreach DEP,$(DEPS),deps/$(DEP)/ebin/*.beam deps/$(DEP)/ebin/*.app deps/$(DEP)/priv/* deps/$(DEP)/priv/lib/* deps/$(DEP)/priv/bin/* deps/$(DEP)/include/*.hrl deps/$(DEP)/COPY* deps/$(DEP)/LICENSE* deps/$(DEP)/lib/*/ebin/*.beam deps/$(DEP)/lib/*/ebin/*.app)) + DEPS_FILES_FILTERED=$(filter-out %/epam deps/elixir/ebin/elixir.app,$(DEPS_FILES)) @@ -170,9 +170,7 @@ install: all copy-files # # Configuration files diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template index fc5116916ee3..0632d8bcff97 100644 --- a/net-im/ejabberd/files/patch-ejabberdctl.template +++ b/net-im/ejabberd/files/patch-ejabberdctl.template @@ -1,17 +1,17 @@ ---- ejabberdctl.template.orig 2017-09-17 17:17:31 UTC +--- ejabberdctl.template.orig 2017-11-16 13:10:22 UTC +++ ejabberdctl.template -@@ -56,8 +56,8 @@ done +@@ -57,8 +57,8 @@ done # define ejabberd variables if not already defined from the command line - : ${ETC_DIR:={{sysconfdir}}/ejabberd} --: ${LOGS_DIR:={{localstatedir}}/log/ejabberd} --: ${SPOOL_DIR:={{localstatedir}}/lib/ejabberd} + : "${ETC_DIR:="{{sysconfdir}}/ejabberd"}" +-: "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}" +-: "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}" +: ${LOGS_DIR:=/var/log/ejabberd} +: ${SPOOL_DIR:=/var/spool/ejabberd} - : ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml} - : ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg} + : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}" + : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}" [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" -@@ -77,7 +77,8 @@ if [ "$INET_DIST_INTERFACE" != "" ] ; th +@@ -78,7 +78,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2" fi fi diff --git a/net-im/ejabberd/files/pkg-install.in b/net-im/ejabberd/files/pkg-install.in index e380cc0207a9..d764305a9e86 100644 --- a/net-im/ejabberd/files/pkg-install.in +++ b/net-im/ejabberd/files/pkg-install.in @@ -19,4 +19,6 @@ find %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 %%PAM%%chown root:%%GROUPS%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/epam-1.0.3/priv/bin/epam \ %%PAM%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam +%%GRAPHICS%%chmod +x %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-1.0.1/priv/bin/eimp + exit 0 |