Update to 0.7.3

Add run dependency on Qt4 sqlite3 plugin
Remove needless CMAKE_USE_PTHREAD
Add rc script for quasselcore (reviewed by dougb)
Add "quick start" info to pkg-message

4 files changed, 104 insertions, 5 deletions

diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index 3da43c7dc71b..7b6437c7d2d5 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	quassel
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.3
 CATEGORIES=	irc
 MASTER_SITES=	http://www.quassel-irc.org/pub/
 
@@ -19,7 +19,6 @@ USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
-CMAKE_USE_PTHREAD=	yes
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	MONO "Quassel standalone client" on \
@@ -57,9 +56,14 @@ PLIST_SUB+=	MONO="@comment "
 .endif
 
 .if !defined(WITHOUT_CORE)
-QT_COMPONENTS+=	network script sql
+QT_COMPONENTS+=	network script sql sql-sqlite3_run
 QUASSEL_CORE=	ON
 PLIST_SUB+=	CORE=""
+
+USE_RC_SUBR=	quasselcore
+USERS=		quasselcore
+GROUPS=		${USERS}
+SUB_FILES=	pkg-message
 .else
 QUASSEL_CORE=	OFF
 PLIST_SUB+=	CORE="@comment "
@@ -80,4 +84,9 @@ pre-configure:
 		${WRKSRC}/CMakeLists.txt
 .endif
 
+post-install:
+.if !defined(WITHOUT_CORE)
+	@${CAT} ${PKGMESSAGE}
+.endif
+
 .include <bsd.port.mk>
diff --git a/irc/quassel/distinfo b/irc/quassel/distinfo
index 9cf3f362fae2..02b3db09cd4c 100644
--- a/irc/quassel/distinfo
+++ b/irc/quassel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (quassel-0.7.1.tar.bz2) = 914a9cd21bfe4be1f78b2f6c96e54b52db7ed3c0adc4dce6bfabec38a30f7ecd
-SIZE (quassel-0.7.1.tar.bz2) = 2714990
+SHA256 (quassel-0.7.3.tar.bz2) = 9e78dbc28bfeda2ed66fa3082392951cbd002f851ef1a7f1228988bb18c7c98d
+SIZE (quassel-0.7.3.tar.bz2) = 2714969
diff --git a/irc/quassel/files/pkg-message.in b/irc/quassel/files/pkg-message.in
new file mode 100644
index 000000000000..878458515b6c
--- /dev/null
+++ b/irc/quassel/files/pkg-message.in
@@ -0,0 +1,17 @@
+=============================================================================
+To run quasselcore at system start-up, add quasselcore_enable="YES"
+to /etc/rc.conf.
+
+Quassel can use SSL connection between client and core parts. At first start
+quasselcore will ask you to enter some information that will be incorporated
+into generated SSL certificate. You can generate a new certificate by running
+the following command as root:
+
+# service quasselcore keygen
+or 
+# %%PREFIX%%/etc/rc.d/quasselcore keygen
+
+By default quasselcore listens on 4242 port at localhost.
+To change default behavior set quasselcore_args variable in /etc/rc.conf.
+See 'quasselcore --help' for available arguments.
+=============================================================================
diff --git a/irc/quassel/files/quasselcore.in b/irc/quassel/files/quasselcore.in
new file mode 100644
index 000000000000..1039d04f5a1f
--- /dev/null
+++ b/irc/quassel/files/quasselcore.in
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: quasselcore
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable quasselcore:
+#
+# quasselcore_enable="YES"
+# # optional
+# quasselcore_data="/var/db/quasselcore"
+# quasselcore_log="/var/log/quasselcore.log"
+# quasselcore_args="--configdir=${quasselcore_data} --logfile=${quasselcore_log}"
+# quasselcore_user="quasselcore"
+# quasselcore_group="quasselcore"
+
+. /etc/rc.subr
+
+name=quasselcore
+rcvar=`set_rcvar`
+
+load_rc_config ${name}
+
+: ${quasselcore_enable:="NO"}
+: ${quasselcore_data="/var/db/quasselcore"}
+: ${quasselcore_log="/var/log/quasselcore.log"}
+: ${quasselcore_args="--configdir=${quasselcore_data} --logfile=${quasselcore_log}"}
+: ${quasselcore_user="quasselcore"}
+: ${quasselcore_group="${quasselcore_user}"}
+
+procname="%%PREFIX%%/bin/quasselcore"
+pidfile="/var/run/${name}.pid"
+
+command="/usr/sbin/daemon"
+command_args="-p ${pidfile} ${procname} ${quasselcore_args}"
+
+start_precmd="${name}_prestart"
+stop_postcmd="${name}_poststop"
+keygen_cmd="${name}_keygen"
+extra_commands="keygen"
+
+quasselcore_keygen()
+{
+	openssl req -x509 -nodes -days 365 -newkey rsa:1024 \
+	    -keyout "${quasselcore_data}/quasselCert.pem" \
+	    -out "${quasselcore_data}/quasselCert.pem"
+	chown ${quasselcore_user}:${quasselcore_group} "${quasselcore_data}/quasselCert.pem"
+	chmod 400 "${quasselcore_data}/quasselCert.pem"
+}
+
+quasselcore_prestart()
+{
+	install -d -o ${quasselcore_user} -g ${quasselcore_group} ${quasselcore_data}
+
+	if [ ! -f "${quasselcore_log}" ]; then
+		install -o ${quasselcore_user} -g ${quasselcore_group} /dev/null ${quasselcore_log}
+	fi
+	if [ ! -f "${pidfile}" ]; then
+		install -o ${quasselcore_user} -g ${quasselcore_group} /dev/null ${pidfile}
+	fi
+	if [ ! -f "${quasselcore_data}/quasselCert.pem" ]; then
+		quasselcore_keygen
+	fi
+}
+
+quasselcore_poststop()
+{
+    rm -f "${pidfile}"
+}
+
+run_rc_command "$1"