$NetBSD: patch-aa,v 1.21 2025/04/28 12:38:17 gdt Exp $

  - Split etcdir into where the config is installed and where it is
    used from, to align with pkgsrc CONF_FILES.
    \todo Consider patching installation instead of here, or at least
    leaving ETCDIR correct.

  - Point SPOOL and LOG at pkgsrc-chosen locations.

  - Don't set user/group on installed files; just because we are
    running the daemon as ejabberd doesn't mean that the files in
    e.g. /usr/pkg/bin should be installed as ejabberd.

  - Patch own CHOWN that is redundant with install and O_USER.
    \todo File upstream.

--- Makefile.in.orig	2025-04-16 15:58:37.000000000 +0000
+++ Makefile.in
@@ -25,7 +25,8 @@ exec_prefix = @exec_prefix@
 DESTDIR =
 
 # /etc/ejabberd/
-ETCDIR = @sysconfdir@/ejabberd
+ETCDIR = @prefix@/share/examples/ejabberd
+SYSCONFDIR_ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
 
 # /bin/
 BINDIR = @bindir@
@@ -81,34 +82,20 @@ SQLDIR = $(PRIVDIR)/sql
 LUADIR = $(PRIVDIR)/lua
 
 # /var/lib/ejabberd/
-SPOOLDIR = @localstatedir@/lib/ejabberd
+SPOOLDIR = @EJABBERD_DB@
 
 # /var/log/ejabberd/
-LOGDIR = @localstatedir@/log/ejabberd
+LOGDIR = @EJABBERD_LOGDIR@
 
 #.
 #' install user
 #
 
-# if no user was enabled, don't set privileges or ownership
-ifeq ($(INSTALLUSER),)
   O_USER=
   G_USER=
   CHOWN_COMMAND=echo
   CHOWN_OUTPUT=/dev/null
   INIT_USER=root
-else
-  O_USER=-o $(INSTALLUSER)
-  G_USER=-g $(INSTALLUSER)
-  CHOWN_COMMAND=chown
-  CHOWN_OUTPUT=&1
-  INIT_USER=$(INSTALLUSER)
-endif
-
-# if no group was enabled, don't set privileges or ownership
-ifneq ($(INSTALLGROUP),)
-  G_USER=-g $(INSTALLGROUP)
-endif
 
 #.
 #' rebar / rebar3 / mix
@@ -429,7 +416,7 @@ ejabberd.service:
 
 ejabberdctl.example: vars.config
 	$(SED)  -e "s*{{installuser}}*${INSTALLUSER}*g" \
-		-e "s*{{config_dir}}*${ETCDIR}*g" \
+		-e "s*{{config_dir}}*${SYSCONFDIR_ETCDIR}*g" \
 		-e "s*{{logs_dir}}*${LOGDIR}*g" \
 		-e "s*{{spool_dir}}*${SPOOLDIR}*g" \
 		-e "s*{{bindir}}*${BINDIR}*g" \
@@ -473,12 +460,12 @@ install-main:
 	#
 	# Spool directory
 	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(SPOOLDIR)
-	$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(SPOOLDIR) >$(CHOWN_OUTPUT)
+	#$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(SPOOLDIR) >$(CHOWN_OUTPUT)
 	chmod -R 750 $(DESTDIR)$(SPOOLDIR)
 	#
 	# Log directory
 	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(LOGDIR)
-	$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(LOGDIR) >$(CHOWN_OUTPUT)
+	#$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(LOGDIR) >$(CHOWN_OUTPUT)
 	chmod -R 750 $(DESTDIR)$(LOGDIR)
 	#
 	# Documentation