- Use rc_subr startup script

- Unbreak on amd64/ia64

PR:		ports/92060, ports/92064
Submitted by:	Denis Shaposhnikov <dsh@vlink.ru>,
		Lapo Luchini <lapo@lapo.it>
Approved by:	maintainer timeout (2 months)

4 files changed, 39 insertions, 27 deletions

diff --git a/net-im/jit/Makefile b/net-im/jit/Makefile
index 9c5180d00f9b..8b22529fd343 100644
--- a/net-im/jit/Makefile
+++ b/net-im/jit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jit
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.penza-gsm.ru/snake/xmpp/
 DIST_SUBDIR=	jabber
@@ -15,20 +16,15 @@ MAINTAINER=	alexander.timoshenko@gmail.com
 COMMENT=	Jabber ICQ Transport
 
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
+USE_RC_SUBR=	jabber_jit.sh
 HAS_CONFIGURE=	yes
+CFLAGS+=	-fPIC
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-BROKEN=		"Does not build on amd64 or ia64"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/jit/jabber-icq.example ${WRKSRC}/jit/jit.sh
+		${WRKSRC}/jit/jabber-icq.example
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/jabber/jit
@@ -36,9 +32,8 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/xdb_file/xdb_file.so ${PREFIX}/lib/jabber/jit
 	@${INSTALL_PROGRAM} ${WRKSRC}/jabberd/jabberd-jit  ${PREFIX}/sbin/jit
 	@${INSTALL_DATA} ${WRKSRC}/jit/jabber-icq.example ${PREFIX}/etc
-	@${INSTALL_SCRIPT} ${WRKSRC}/jit/jit.sh  ${PREFIX}/etc/rc.d
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/jit/files/jabber_jit.sh.in b/net-im/jit/files/jabber_jit.sh.in
new file mode 100644
index 000000000000..46fac558baf4
--- /dev/null
+++ b/net-im/jit/files/jabber_jit.sh.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Startup script for JIT ICQ transport.
+#
+# $FreeBSD$
+#
+
+# PROVIDE: jabber_jit
+# REQUIRE: DAEMON
+
+# Define these jabber_jit_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#       /etc/rc.conf.d/jabber_jit
+#
+# jabber_jit_enable : bool
+#   Enable the transport ("YES") or not ("NO", the default).
+#
+
+. %%RC_SUBR%%
+
+name="jabber_jit"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/jit"
+command_args="-c %%PREFIX%%/etc/jabber-icq.xml -d"
+required_files="%%PREFIX%%/etc/jabber-icq.xml"
+
+load_rc_config "$name"
+
+: ${jabber_jit_enable="NO"}
+: ${jabber_jit_user="jabber"}
+
+run_rc_command "$1"
diff --git a/net-im/jit/files/patch-jit::jit.sh b/net-im/jit/files/patch-jit::jit.sh
deleted file mode 100644
index ce4c03742062..000000000000
--- a/net-im/jit/files/patch-jit::jit.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- jit/jit.sh.orig	Tue Jul 20 17:09:59 2004
-+++ jit/jit.sh	Tue Jul 20 17:10:47 2004
-@@ -0,0 +1,13 @@
-+#!/bin/sh
-+
-+PREFIX=%%PREFIX%%
-+USER="jabber"
-+
-+echo -n " jit"
-+case ${1:-start} in
-+start)
-+    su -f -m ${USER} -c "$PREFIX/sbin/jit -c $PREFIX/etc/jabber-icq.xml -d " ;;
-+
-+stop)
-+    killall -SIGKILL -u ${USER} jit;
-+esac
diff --git a/net-im/jit/pkg-plist b/net-im/jit/pkg-plist
index 693be2c4abf9..54bea6c285a4 100644
--- a/net-im/jit/pkg-plist
+++ b/net-im/jit/pkg-plist
@@ -2,6 +2,5 @@ lib/jabber/jit/jit.so
 lib/jabber/jit/xdb_file.so
 sbin/jit
 etc/jabber-icq.example
-etc/rc.d/jit.sh
 @dirrm lib/jabber/jit
 @dirrmtry lib/jabber