From a3ff8ade70acded8bac7a90a5b4688f6f375c4b3 Mon Sep 17 00:00:00 2001
From: Jean-Yves Lefort <jylefort@FreeBSD.org>
Date: Thu, 28 Apr 2005 14:16:46 +0000
Subject: [PATCH] - Update to 2.0.8 - Do not manually install jabberd.sh nor
 list it in pkg-list, as that   is done by USE_RC_SUBR - Use @unexec rmdir
 rather than @rmdir for configuration directories,   as they might still
 contain files at uninstall time - Polish the Makefile and packing list

PR:		ports/80370
Submitted by:	Vsevolod Stakhov <vsevolod@highsecure.ru>
Approved by:	maintainer
---
 net-im/jabberd/Makefile  | 12 +++++-------
 net-im/jabberd/distinfo  |  4 ++--
 net-im/jabberd/pkg-plist | 11 +++++------
 net/jabberd/Makefile     | 12 +++++-------
 net/jabberd/distinfo     |  4 ++--
 net/jabberd/pkg-plist    | 11 +++++------
 6 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index ad2cbd4612c8..505d697e997d 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jabberd
-PORTVERSION=	2.0.7
+PORTVERSION=	2.0.8
 CATEGORIES=	net
 MASTER_SITES=	http://files.jabberstudio.org/jabberd2/
-DISTNAME=	${PORTNAME}-2.0s7
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}s${PORTVERSION:E}
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	kirk@strauser.com
@@ -85,13 +85,11 @@ pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${ECHO} "Installing ${PREFIX}/etc/rc.d/jabberd.sh startup file."
-	${INSTALL_SCRIPT} -m 751 ${WRKDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh
 	@${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd
 	@${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
 	@${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660
-	@${MKDIR} ${PREFIX}/share/jabberd
-	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${PREFIX}/share/jabberd
-	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${PREFIX}/share/jabberd
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/net-im/jabberd/distinfo b/net-im/jabberd/distinfo
index b35682d75506..545ace704c9e 100644
--- a/net-im/jabberd/distinfo
+++ b/net-im/jabberd/distinfo
@@ -1,2 +1,2 @@
-MD5 (jabber/jabberd-2.0s7.tar.gz) = 1f10641964d257944eae2f8f295cfcba
-SIZE (jabber/jabberd-2.0s7.tar.gz) = 749170
+MD5 (jabber/jabberd-2.0s8.tar.gz) = 96753c5e74676ace0841a4cee9f13fdb
+SIZE (jabber/jabberd-2.0s8.tar.gz) = 757149
diff --git a/net-im/jabberd/pkg-plist b/net-im/jabberd/pkg-plist
index 36f4c75932f0..09318e987800 100644
--- a/net-im/jabberd/pkg-plist
+++ b/net-im/jabberd/pkg-plist
@@ -20,9 +20,8 @@ etc/jabberd/s2s.xml.dist
 etc/jabberd/sm.xml.dist
 @unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi
 etc/jabberd/templates/roster.xml.dist
-etc/rc.d/jabberd.sh
-share/jabberd/db-setup.mysql
-share/jabberd/db-setup.pgsql
-@dirrm share/jabberd
-@dirrm etc/jabberd/templates
-@dirrm etc/jabberd
+%%DATADIR%%/db-setup.mysql
+%%DATADIR%%/db-setup.pgsql
+@dirrm %%DATADIR%%
+@unexec rmdir %D/etc/jabberd/templates 2> /dev/null || true
+@unexec rmdir %D/etc/jabberd 2> /dev/null || true
diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile
index ad2cbd4612c8..505d697e997d 100644
--- a/net/jabberd/Makefile
+++ b/net/jabberd/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jabberd
-PORTVERSION=	2.0.7
+PORTVERSION=	2.0.8
 CATEGORIES=	net
 MASTER_SITES=	http://files.jabberstudio.org/jabberd2/
-DISTNAME=	${PORTNAME}-2.0s7
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}s${PORTVERSION:E}
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	kirk@strauser.com
@@ -85,13 +85,11 @@ pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${ECHO} "Installing ${PREFIX}/etc/rc.d/jabberd.sh startup file."
-	${INSTALL_SCRIPT} -m 751 ${WRKDIR}/jabberd.sh ${PREFIX}/etc/rc.d/jabberd.sh
 	@${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd
 	@${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
 	@${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660
-	@${MKDIR} ${PREFIX}/share/jabberd
-	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${PREFIX}/share/jabberd
-	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${PREFIX}/share/jabberd
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/net/jabberd/distinfo b/net/jabberd/distinfo
index b35682d75506..545ace704c9e 100644
--- a/net/jabberd/distinfo
+++ b/net/jabberd/distinfo
@@ -1,2 +1,2 @@
-MD5 (jabber/jabberd-2.0s7.tar.gz) = 1f10641964d257944eae2f8f295cfcba
-SIZE (jabber/jabberd-2.0s7.tar.gz) = 749170
+MD5 (jabber/jabberd-2.0s8.tar.gz) = 96753c5e74676ace0841a4cee9f13fdb
+SIZE (jabber/jabberd-2.0s8.tar.gz) = 757149
diff --git a/net/jabberd/pkg-plist b/net/jabberd/pkg-plist
index 36f4c75932f0..09318e987800 100644
--- a/net/jabberd/pkg-plist
+++ b/net/jabberd/pkg-plist
@@ -20,9 +20,8 @@ etc/jabberd/s2s.xml.dist
 etc/jabberd/sm.xml.dist
 @unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi
 etc/jabberd/templates/roster.xml.dist
-etc/rc.d/jabberd.sh
-share/jabberd/db-setup.mysql
-share/jabberd/db-setup.pgsql
-@dirrm share/jabberd
-@dirrm etc/jabberd/templates
-@dirrm etc/jabberd
+%%DATADIR%%/db-setup.mysql
+%%DATADIR%%/db-setup.pgsql
+@dirrm %%DATADIR%%
+@unexec rmdir %D/etc/jabberd/templates 2> /dev/null || true
+@unexec rmdir %D/etc/jabberd 2> /dev/null || true