CVS commit: [pkgsrc-2023Q2] pkgsrc/chat/ejabberd

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Aug 15 19:12:24 UTC 2023

Modified Files:
        pkgsrc/chat/ejabberd [pkgsrc-2023Q2]: Makefile distinfo
        pkgsrc/chat/ejabberd/patches [pkgsrc-2023Q2]: patch-aa

Log Message:
Pullup ticket #6789 - requested by gdt
chat/ejabberd: functionality fix

Revisions pulled up:
- chat/ejabberd/Makefile                                        1.99
- chat/ejabberd/distinfo                                        1.69
- chat/ejabberd/patches/patch-aa                                1.18

---
   Module Name: pkgsrc
   Committed By:        manu
   Date:                Fri Aug 11 13:50:30 UTC 2023

   Modified Files:
        pkgsrc/chat/ejabberd: Makefile distinfo
        pkgsrc/chat/ejabberd/patches: patch-aa

   Log Message:
   Fix the paths in ejabberdctl

   - Remove ${DESTDIR}
   - Use config from /usr/pkg/etc/ejabberd and not /usr/pkg/share/examples/ejabberd


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.98.4.1 pkgsrc/chat/ejabberd/Makefile
cvs rdiff -u -r1.68 -r1.68.4.1 pkgsrc/chat/ejabberd/distinfo
cvs rdiff -u -r1.17 -r1.17.6.1 pkgsrc/chat/ejabberd/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/ejabberd/Makefile
diff -u pkgsrc/chat/ejabberd/Makefile:1.98 pkgsrc/chat/ejabberd/Makefile:1.98.4.1
--- pkgsrc/chat/ejabberd/Makefile:1.98  Wed Jan 11 22:07:46 2023
+++ pkgsrc/chat/ejabberd/Makefile       Tue Aug 15 19:12:24 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2023/01/11 22:07:46 nikita Exp $
+# $NetBSD: Makefile,v 1.98.4.1 2023/08/15 19:12:24 bsiegert Exp $
 
 DISTNAME=      ejabberd-22.05
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/
 

Index: pkgsrc/chat/ejabberd/distinfo
diff -u pkgsrc/chat/ejabberd/distinfo:1.68 pkgsrc/chat/ejabberd/distinfo:1.68.4.1
--- pkgsrc/chat/ejabberd/distinfo:1.68  Sun Jan  8 16:19:05 2023
+++ pkgsrc/chat/ejabberd/distinfo       Tue Aug 15 19:12:24 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.68 2023/01/08 16:19:05 gdt Exp $
+$NetBSD: distinfo,v 1.68.4.1 2023/08/15 19:12:24 bsiegert Exp $
 
 BLAKE2s (ejabberd-22.05.tar.gz) = 657dcfe4ee9f78fbba344588c255c8d3be8ee155e55c702b125fd0626673b908
 SHA512 (ejabberd-22.05.tar.gz) = 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
 Size (ejabberd-22.05.tar.gz) = 2527957 bytes
-SHA1 (patch-aa) = c48f1b242777a4610cdbecb32791ce614e0ef80d
+SHA1 (patch-aa) = 8544545d6a858a4853d339743d9f35c9506af241
 SHA1 (patch-ae) = de7536dbafab8d14430faa5fcbd767c238a151e5
 SHA1 (patch-m4_erlang-extra.m4) = 3b89c1a8212e8a45ae319b30606a41429762e2fe
 SHA1 (patch-tools_ejabberdctl.bc) = 167f542c95f8e25ba601076ad717a85bfd456dc7

Index: pkgsrc/chat/ejabberd/patches/patch-aa
diff -u pkgsrc/chat/ejabberd/patches/patch-aa:1.17 pkgsrc/chat/ejabberd/patches/patch-aa:1.17.6.1
--- pkgsrc/chat/ejabberd/patches/patch-aa:1.17  Sat Oct 15 18:20:40 2022
+++ pkgsrc/chat/ejabberd/patches/patch-aa       Tue Aug 15 19:12:24 2023
@@ -1,19 +1,23 @@
-$NetBSD: patch-aa,v 1.17 2022/10/15 18:20:40 triaxx Exp $
+$NetBSD: patch-aa,v 1.17.6.1 2023/08/15 19:12:24 bsiegert Exp $
 
 Fix locations; don't mess with ownership.
 
---- Makefile.in.orig   2022-05-06 13:12:22.000000000 +0000
-+++ Makefile.in
-@@ -10,7 +10,7 @@ exec_prefix = @exec_prefix@
+--- Makefile.in.orig   2022-05-06 15:12:22.000000000 +0200
++++ Makefile.in        2023-08-11 09:08:52.337637204 +0200
+@@ -9,9 +9,10 @@
+ 
  DESTDIR =
  
  # /etc/ejabberd/
 -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
 +ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
++SYSCONFDIR_ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
  
  # /bin/
  BINDIR = $(DESTDIR)@bindir@
-@@ -22,7 +22,7 @@ SBINDIR = $(DESTDIR)@sbindir@
+ 
+@@ -21,9 +22,9 @@
+ # /lib/
  LIBDIR =  $(DESTDIR)@libdir@
  
  # /lib/ejabberd/
@@ -22,7 +26,9 @@ Fix locations; don't mess with ownership
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -66,31 +66,18 @@ SQLDIR = $(PRIVDIR)/sql
+ datarootdir = @datarootdir@
+@@ -65,33 +66,20 @@
+ # /usr/lib/ejabberd/priv/lua
  LUADIR = $(PRIVDIR)/lua
  
  # /var/lib/ejabberd/
@@ -56,3 +62,31 @@ Fix locations; don't mess with ownership
  
  ifeq "$(MIX)" "mix"
  REBAR_VER:=6
+ REBAR_VER_318:=0
+@@ -293,21 +281,21 @@
+               -e "s*{{bindir}}/iex*$(iexpath)*g" \
+               -e "s*{{bindir}}*@bindir@*g" \
+               -e "s*{{libdir}}*${relivelibdir}*g" \
+               -e "s*{{erl}}*@ERL@*g" \
+-              -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
+-              > ejabberdctl.relive
++              -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \
++      $(SED)  -e "s*\${DESTDIR}**g" > ejabberdctl.relive
+ 
+ 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" \
+               -e "s*{{libdir}}*@libdir@*g" \
+               -e "s*{{erl}}*@ERL@*g" \
+-              -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
+-              > ejabberdctl.example
++              -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \
++      $(SED)  -e "s*\${DESTDIR}**g" > ejabberdctl.example
+ 
+ install: copy-files ejabberdctl.example
+       #
+       # Configuration files