mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 21:30:31 -04:00
- Fix portlint warning - Add a message about known build problem via pre-everything target when ejabberd is already installed. [1] PR: 234123
80 lines
3.4 KiB
Text
80 lines
3.4 KiB
Text
--- Makefile.in.orig 2018-12-21 09:44:15 UTC
|
|
+++ Makefile.in
|
|
@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
|
|
LIBDIR = $(DESTDIR)@libdir@
|
|
|
|
# /lib/ejabberd/
|
|
-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
|
|
+EJABBERDDIR = $(DESTDIR)@libdir@/erlang/lib/ejabberd-$(PORTVERSION)
|
|
|
|
# /share/doc/ejabberd
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
@@ -62,10 +62,10 @@ SQLDIR = $(PRIVDIR)/sql
|
|
LUADIR = $(PRIVDIR)/lua
|
|
|
|
# /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
|
|
@@ -132,7 +132,7 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(
|
|
VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
|
|
|
|
ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
|
|
-DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
|
|
+DEPS_TO_DEST=$(LIBDIR)/ejabberd-$(PORTVERSION)/lib $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
|
|
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)))))
|
|
@@ -202,9 +202,7 @@ install: all copy-files
|
|
#
|
|
# Configuration files
|
|
$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
|
|
- [ -f $(ETCDIR)/ejabberd.yml ] \
|
|
- && $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
|
|
- || $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
|
|
+ $(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)
|
|
$(SED) -e "s*{{rootdir}}*@prefix@*g" \
|
|
-e "s*{{installuser}}*@INSTALLUSER@*g" \
|
|
-e "s*{{bindir}}*@bindir@*g" \
|
|
@@ -213,16 +211,15 @@ install: all copy-files
|
|
-e "s*{{localstatedir}}*@localstatedir@*g" \
|
|
-e "s*{{docdir}}*@docdir@*g" \
|
|
-e "s*{{erl}}*@ERL@*g" \
|
|
+ -e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
|
|
-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
|
|
> ejabberdctl.example
|
|
- [ -f $(ETCDIR)/ejabberdctl.cfg ] \
|
|
- && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
|
|
- || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
|
|
- $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
|
|
+ $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
|
|
+ $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example
|
|
#
|
|
# Administration script
|
|
[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
|
|
- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
|
|
+ $(INSTALL) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
|
|
# Elixir binaries
|
|
[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
|
|
[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
|
|
@@ -257,11 +254,13 @@ install: all copy-files
|
|
chmod -R 750 $(LOGDIR)
|
|
#
|
|
# Documentation
|
|
+ifndef NOPORTDOCS
|
|
$(INSTALL) -d $(DOCDIR)
|
|
[ -f doc/guide.html ] \
|
|
&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
|
|
|| echo "Documentation not included in sources"
|
|
$(INSTALL) -m 644 COPYING $(DOCDIR)
|
|
+endif
|
|
|
|
uninstall: uninstall-binary
|
|
|