[pkgsrc/pkgsrc-2008Q1]: pkgsrc/chat/ejabberd pullup ticket #2348 - requested ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2008Q1]: pkgsrc/chat/ejabberd pullup ticket #2348 - requested ...
From: rtr <rtr%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:56:38 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3590a664fea
branches:  pkgsrc-2008Q1
changeset: 540288:b3590a664fea
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Fri Apr 25 01:09:18 2008 +0000

description:
pullup ticket #2348 - requested by martti
update ejabberd fixes problem with startup after reboot

Revisions pulled up:
- pkgsrc/chat/ejabberd/Makefile         1.3,1.4,1.5
- pkgsrc/chat/ejabberd/MESSAGE          1.2
- pkgsrc/chat/ejabberd/PLIST            1.2
- pkgsrc/chat/ejabberd/distinfo         1.2,1.3
- pkgsrc/chat/ejabberd/patches/patch-aa 1.2
- pkgsrc/chat/ejabberd/patches/patch-ae 1.2

   Module Name: pkgsrc
   Committed By:        martti
   Date:                Tue Apr 22 11:31:05 UTC 2008

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

   Log Message:
   Updated chat/ejabberd to 2.0.0nb1

   Fix pkg/38347 (patch provided by Daniel Horecki).
   ------------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        martti
   Date:                Thu Apr 24 08:04:13 UTC 2008

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

   Log Message:
   Fixed PLIST issues, this should not leave any files or directories behind now.
   ------------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        martti
   Date:                Thu Apr 24 08:04:59 UTC 2008

   Modified Files:
        pkgsrc/chat/ejabberd: Makefile

   Log Message:
   PKGREVISION++

diffstat:

 chat/ejabberd/MESSAGE          |  5 +----
 chat/ejabberd/Makefile         |  9 +++------
 chat/ejabberd/PLIST            |  6 +++++-
 chat/ejabberd/distinfo         |  6 +++---
 chat/ejabberd/patches/patch-aa |  4 ++--
 chat/ejabberd/patches/patch-ae |  4 ++--
 6 files changed, 16 insertions(+), 18 deletions(-)

diffs (129 lines):

diff -r 250583d6466c -r b3590a664fea chat/ejabberd/MESSAGE
--- a/chat/ejabberd/MESSAGE     Thu Apr 24 13:27:46 2008 +0000
+++ b/chat/ejabberd/MESSAGE     Fri Apr 25 01:09:18 2008 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2008/03/10 08:58:32 martti Exp $
+$NetBSD: MESSAGE,v 1.1.1.1.2.1 2008/04/25 01:09:18 rtr Exp $
 
 You will need to customize the following files to configure ejabberd for
 local use:
@@ -9,7 +9,4 @@
 Note: this package includes an unofficial patch to support multiples listeners
 on the same port number, which enables IPv4 and IPv6 concurrently.
 
-Quick start for ejabberd:
-       ejabberdctl start
-
 ===========================================================================
diff -r 250583d6466c -r b3590a664fea chat/ejabberd/Makefile
--- a/chat/ejabberd/Makefile    Thu Apr 24 13:27:46 2008 +0000
+++ b/chat/ejabberd/Makefile    Fri Apr 25 01:09:18 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/03/25 11:49:55 martti Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2008/04/25 01:09:18 rtr Exp $
 
 DISTNAME=      ejabberd-2.0.0
-#PKGREVISION=  1
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  http://www.process-one.net/downloads/ejabberd/2.0.0/
 
@@ -80,18 +80,15 @@
 INSTALLATION_DIRS+=    ${EGDIR}
 
 CONF_FILES=            ${EGDIR}/ejabberd.cfg ${PKG_SYSCONFDIR}/ejabberd.cfg
+CONF_FILES+=           ${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg
 CONF_FILES+=           ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc
 
 post-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/src/ejabberd.cfg.example ${EGDIR}/ejabberd.cfg
-       ${INSTALL_DATA} ${WRKSRC}/src/inetrc ${EGDIR}/inetrc
        ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/${DISTNAME}
        ${INSTALL_DATA} ${WRKSRC}/doc/Makefile ${PREFIX}/share/doc/${DISTNAME}
        ${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${PREFIX}/share/doc/${DISTNAME}
        ${INSTALL_DATA} ${WRKSRC}/doc/api/* ${PREFIX}/share/doc/${DISTNAME}/api
 
-
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Localizing paths
 SUBST_STAGE.paths=     pre-configure
diff -r 250583d6466c -r b3590a664fea chat/ejabberd/PLIST
--- a/chat/ejabberd/PLIST       Thu Apr 24 13:27:46 2008 +0000
+++ b/chat/ejabberd/PLIST       Fri Apr 25 01:09:18 2008 +0000
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/10 08:58:32 martti Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2008/04/25 01:09:18 rtr Exp $
 ${EJABBERD_EXDIR}/ejabberd.cfg
+${EJABBERD_EXDIR}/ejabberdctl.cfg
+${EJABBERD_EXDIR}/inetrc
 lib/erlang/lib/${DISTNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${DISTNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${DISTNAME}/ebin/acl.beam
@@ -189,6 +191,7 @@
 share/doc/${DISTNAME}/api/process-one.css
 share/doc/${DISTNAME}/api/overview.edoc
 share/examples/rc.d/ejabberd
+@dirrm share/examples/ejabberd
 @dirrm share/doc/${DISTNAME}/api
 @dirrm share/doc/${DISTNAME}
 @dirrm lib/erlang/lib/${DISTNAME}/priv/msgs
@@ -196,3 +199,4 @@
 @dirrm lib/erlang/lib/${DISTNAME}/priv
 @dirrm lib/erlang/lib/${DISTNAME}/ebin
 @dirrm lib/erlang/lib/${DISTNAME}
+@unexec ${RMDIR} %D/etc/ejabberd 2>/dev/null || ${TRUE}
diff -r 250583d6466c -r b3590a664fea chat/ejabberd/distinfo
--- a/chat/ejabberd/distinfo    Thu Apr 24 13:27:46 2008 +0000
+++ b/chat/ejabberd/distinfo    Fri Apr 25 01:09:18 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/10 08:58:32 martti Exp $
+$NetBSD: distinfo,v 1.1.1.1.2.1 2008/04/25 01:09:18 rtr Exp $
 
 SHA1 (ejabberd-2.0.0.tar.gz) = d70257c1e75f59b7284d52c038431664cfd53e08
 RMD160 (ejabberd-2.0.0.tar.gz) = 9e7bb30825f2d480d75516136fcc62a49d871255
 Size (ejabberd-2.0.0.tar.gz) = 1387404 bytes
-SHA1 (patch-aa) = 31040b992246471dd27c6097e76e9ad007618c12
+SHA1 (patch-aa) = 32f4609471f189284baac2ae51522558be080e19
 SHA1 (patch-ab) = a083116beb37cd19a011993e009b57a0a4b202bf
 SHA1 (patch-ac) = 23a7528ac5f3c9f1e7e89062e43482b8bf103e0e
 SHA1 (patch-ad) = ece5a64b4beacd967bdb24d42cf105cd3bb1b7b6
-SHA1 (patch-ae) = bbdd79cfac761c862d4d70d037990c3c3b99d57e
+SHA1 (patch-ae) = 32b4a66b4ca4b329abae632f0b7a4e62509237c6
diff -r 250583d6466c -r b3590a664fea chat/ejabberd/patches/patch-aa
--- a/chat/ejabberd/patches/patch-aa    Thu Apr 24 13:27:46 2008 +0000
+++ b/chat/ejabberd/patches/patch-aa    Fri Apr 25 01:09:18 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/03/10 08:58:32 martti Exp $
+$NetBSD: patch-aa,v 1.1.1.1.2.1 2008/04/25 01:09:18 rtr Exp $
 
 Modified for pkgsrc
 
@@ -17,7 +17,7 @@
 -LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd
 -ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
 +LOGDIR = $(DESTDIR)/@JABBERD_LOGDIR@
-+ETCDIR = $(DESTDIR)/@PKG_SYSCONFDIR@
++ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
  SBINDIR = $(DESTDIR)@prefix@/sbin
  
  ifeq ($(shell uname),Darwin)
diff -r 250583d6466c -r b3590a664fea chat/ejabberd/patches/patch-ae
--- a/chat/ejabberd/patches/patch-ae    Thu Apr 24 13:27:46 2008 +0000
+++ b/chat/ejabberd/patches/patch-ae    Fri Apr 25 01:09:18 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/03/10 08:58:32 martti Exp $
+$NetBSD: patch-ae,v 1.1.1.1.2.1 2008/04/25 01:09:18 rtr Exp $
 
 Keep things tidy (nothing under /usr/pkg/var)
 
@@ -31,7 +31,7 @@
  ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
  ERL_INETRC=$ROOTDIR/etc/ejabberd/inetrc
 -HOME=$ROOTDIR/var/lib/ejabberd
-+HOME=@EJABBERD_VARDIR@/run/ejabberd
++HOME=@EJABBERD_VARDIR@/spool/ejabberd/db/$NODE
  
  # export global variables
  export EJABBERD_CONFIG_PATH
Prev by Date: [pkgsrc/pkgsrc-2008Q1]: pkgsrc/misc/openoffice2-bin pullup ticket #2345 - req...
Next by Date: [pkgsrc/pkgsrc-2008Q1]: pkgsrc/doc ticket #2336
Previous by Thread: [pkgsrc/pkgsrc-2008Q1]: pkgsrc/misc/openoffice2-bin pullup ticket #2345 - req...
Next by Thread: [pkgsrc/pkgsrc-2008Q1]: pkgsrc/doc ticket #2336
Indexes:
Home | Main Index | Thread Index | Old Index