Fix rpath linking & typo in patch file, add a rc.d script (thanks ewdafa)

This fixes PR pkg/45357. Bump PKGREVISION.

5 files changed, 40 insertions, 9 deletions

diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index ab653619831..d855b1bab0c 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2011/06/21 13:03:39 schnoebe Exp $
+# $NetBSD: Makefile,v 1.5 2011/09/30 08:33:54 fhajny Exp $
 #
 
 DISTNAME=		prosody-0.8.2
+PKGREVISION=		1
 CATEGORIES=		chat
 MASTER_SITES=		http://prosody.im/downloads/source/
 
@@ -21,6 +22,8 @@ HAS_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 BUILD_DEFS+=		VARBASE
 
+RCD_SCRIPTS=		prosody
+
 .include "../../mk/bsd.prefs.mk"
 
 PROSODY_USER?=		prosody
@@ -35,11 +38,13 @@ OWN_DIRS_PERMS+=	${PROSODY_LOG} ${PROSODY_USER} ${PROSODY_GROUP} 0770
 OWN_DIRS_PERMS+=	${PROSODY_RUN} ${PROSODY_USER} ${PROSODY_GROUP} 0770
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/certs
 
-PKG_GROUPS+=		${PROSODY_GROUP}
-PKG_USERS+=		${PROSODY_USER}:${PROSODY_GROUP}
+PKG_USERS_VARS+=	PROSODY_USER
+PKG_GROUPS_VARS+=	PROSODY_GROUP
+PKG_GROUPS?=		${PROSODY_GROUP}
+PKG_USERS?=		${PROSODY_USER}:${PROSODY_GROUP}
 PKG_GECOS.${PROSODY_USER}=	Prosody daemon user
 PKG_HOME.${PROSODY_USER}=	${PROSODY_DATA}
-PKG_SHELL.${PROSODY_USER}=	${SH}
+PKG_SHELL.${PROSODY_USER}=	${NOLOGIN}
 
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
@@ -55,6 +60,7 @@ REPLACE_FILES.lua=	prosody prosodyctl
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--datadir=${PROSODY_DATA}
+CONFIGURE_ARGS+=	--ldflags="${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared"
 
 SUBST_CLASSES+=		eg
 SUBST_MESSAGE.eg=	Fixing examples/configuration directories
diff --git a/chat/prosody/PLIST b/chat/prosody/PLIST
index 4fbefb41b16..4655bd58929 100644
--- a/chat/prosody/PLIST
+++ b/chat/prosody/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/06/06 14:41:48 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/09/30 08:33:54 fhajny Exp $
 bin/prosody
 bin/prosodyctl
 lib/prosody/core/certmanager.lua
@@ -115,3 +115,4 @@ share/examples/prosody/certs/localhost.cert
 share/examples/prosody/certs/localhost.key
 share/examples/prosody/certs/openssl.cnf
 share/examples/prosody/prosody.cfg.lua
+share/examples/rc.d/prosody
diff --git a/chat/prosody/distinfo b/chat/prosody/distinfo
index 3c4662c11c6..9c7812ec21e 100644
--- a/chat/prosody/distinfo
+++ b/chat/prosody/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2011/06/21 13:03:39 schnoebe Exp $
+$NetBSD: distinfo,v 1.4 2011/09/30 08:33:54 fhajny Exp $
 
 SHA1 (prosody-0.8.2.tar.gz) = a029c4e69f6daaf3320061e69c9f86390d7e845a
 RMD160 (prosody-0.8.2.tar.gz) = 908a04f5daa7733c66ab4f09fd54fb52175cb70c
 Size (prosody-0.8.2.tar.gz) = 212170 bytes
 SHA1 (patch-aa) = 241c01dbd8de2821c0988032db50b01cc61c548c
-SHA1 (patch-ab) = e8816af363cc452d43dd860f161f1735e6d2e301
+SHA1 (patch-ab) = cb48a22114e99fc1832f86067cd1ba9d8de999ac
 SHA1 (patch-ad) = 5cd22cb93895b6f60b4f910d6aab09e6f1f22712
diff --git a/chat/prosody/files/prosody.sh b/chat/prosody/files/prosody.sh
new file mode 100644
index 00000000000..7b22581d719
--- /dev/null
+++ b/chat/prosody/files/prosody.sh
@@ -0,0 +1,24 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: prosody
+# REQUIRE: DAEMON
+
+if [ -f /etc/rc.subr ]; then
+  . /etc/rc.subr
+fi
+
+name="prosody"
+rcvar=${name}
+ctl_command="@PREFIX@/bin/${name}ctl"
+required_files="@PKG_SYSCONFDIR@/${name}.cfg.lua"
+pidfile="@VARBASE@/run/${name}.pid"
+#start_precmd="ulimit -n 2048"
+extra_commands="reload status"
+
+start_cmd="${ctl_command} start"
+stop_cmd="${ctl_command} stop"
+reload_cmd="${ctl_command} reload"
+status_cmd="${ctl_command} status"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/chat/prosody/patches/patch-ab b/chat/prosody/patches/patch-ab
index fdc465fd2f5..1a29dde19d8 100644
--- a/chat/prosody/patches/patch-ab
+++ b/chat/prosody/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2011/06/06 14:41:48 schnoebe Exp $
+$NetBSD: patch-ab,v 1.3 2011/09/30 08:33:54 fhajny Exp $
 
 enable POSIX functionality by default
 set the logging paths
@@ -11,7 +11,7 @@ set up the pid files
  
  	-- Other specific functionality
 -		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-+		posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
++		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
  		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
  		--"httpserver"; -- Serve static files from a directory over HTTP
  		--"groups"; -- Shared roster support