[pkgsrc/trunk]: pkgsrc/chat/ejabberd Fixed PLIST issues, this should not leav...

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac975073fed4
branches:  trunk
changeset: 541662:ac975073fed4
user:      martti <martti%pkgsrc.org@localhost>
date:      Thu Apr 24 08:04:13 2008 +0000

description:
Fixed PLIST issues, this should not leave any files or directories behind now.

diffstat:

 chat/ejabberd/MESSAGE          |  5 +----
 chat/ejabberd/Makefile         |  7 ++-----
 chat/ejabberd/PLIST            |  6 +++++-
 chat/ejabberd/distinfo         |  4 ++--
 chat/ejabberd/patches/patch-aa |  4 ++--
 5 files changed, 12 insertions(+), 14 deletions(-)

diffs (105 lines):

diff -r 90eed96d919a -r ac975073fed4 chat/ejabberd/MESSAGE
--- a/chat/ejabberd/MESSAGE     Thu Apr 24 07:55:00 2008 +0000
+++ b/chat/ejabberd/MESSAGE     Thu Apr 24 08:04:13 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.2 2008/04/24 08:04:13 martti 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 90eed96d919a -r ac975073fed4 chat/ejabberd/Makefile
--- a/chat/ejabberd/Makefile    Thu Apr 24 07:55:00 2008 +0000
+++ b/chat/ejabberd/Makefile    Thu Apr 24 08:04:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/04/22 11:31:05 martti Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/24 08:04:13 martti Exp $
 
 DISTNAME=      ejabberd-2.0.0
 PKGREVISION=   1
@@ -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 90eed96d919a -r ac975073fed4 chat/ejabberd/PLIST
--- a/chat/ejabberd/PLIST       Thu Apr 24 07:55:00 2008 +0000
+++ b/chat/ejabberd/PLIST       Thu Apr 24 08:04:13 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.2 2008/04/24 08:04:13 martti 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 90eed96d919a -r ac975073fed4 chat/ejabberd/distinfo
--- a/chat/ejabberd/distinfo    Thu Apr 24 07:55:00 2008 +0000
+++ b/chat/ejabberd/distinfo    Thu Apr 24 08:04:13 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2008/04/22 11:31:05 martti Exp $
+$NetBSD: distinfo,v 1.3 2008/04/24 08:04:13 martti 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
diff -r 90eed96d919a -r ac975073fed4 chat/ejabberd/patches/patch-aa
--- a/chat/ejabberd/patches/patch-aa    Thu Apr 24 07:55:00 2008 +0000
+++ b/chat/ejabberd/patches/patch-aa    Thu Apr 24 08:04:13 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.2 2008/04/24 08:04:13 martti 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)