4 files changed, 133 insertions, 24 deletions

diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index ee33c7a08b40..92bc5e6f4c3f 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	quassel
-# Date created:		2008-08-10
-# Whom:			Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	quassel
-PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTVERSION=	0.9.0
 CATEGORIES=	irc
 MASTER_SITES=	http://www.quassel-irc.org/pub/
 
@@ -17,18 +12,20 @@ COMMENT=	Qt4 based distributed IRC client
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 
 USE_BZIP2=	yes
-USES=		cmake
-USE_QT4=	qmake_build moc_build rcc_build uic_build
+USES=		cmake:outsource
+USE_QT4=	corelib network script sql \
+		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	KDE NLS
 OPTIONS_MULTI=	MODULE
 OPTIONS_MULTI_MODULE=	MONO CORE CLIENT
 OPTIONS_DEFAULT=	${OPTIONS_MULTI_MODULE}
 
 MONO_DESC=	Quassel standalone client
-CORE_DESC=	Quassel core
-CLIENT_DESC=	Quassel client
+CORE_DESC=	Quassel core (for use with client)
+CLIENT_DESC=	Quassel client (for use with core)
+KDE_DESC=	KDE 4 integration (for clients only)
 
 CMAKE_ARGS+=	-DWANT_MONO=${QUASSEL_MONO} \
 		-DWANT_CORE=${QUASSEL_CORE} \
@@ -41,14 +38,22 @@ CMAKE_ARGS+=	-DWANT_MONO=${QUASSEL_MONO} \
 USE_QT4+=	linguist_build
 .endif
 
-.if !${PORT_OPTIONS:MMONO} && !${PORT_OPTIONS:MCLIENT}
-PLIST_SUB+=	MONO_OR_CLIENT="@comment "
-.else
+.if ${PORT_OPTIONS:MMONO} || ${PORT_OPTIONS:MCLIENT}
+. if ${PORT_OPTIONS:MKDE}
+USE_KDE4=	automoc4 kdelibs
+CMAKE_ARGS+=	-DWITH_KDE=ON
+PLIST=		${PKGDIR}/pkg-plist.kde
+. else
+CMAKE_ARGS+=	-DWITH_KDE=OFF
+. endif
+USE_QT4+=	dbus gui phonon webkit xml xmlpatterns
+LIB_DEPENDS+=	dbusmenu-qt:${PORTSDIR}/devel/libdbusmenu-qt
 PLIST_SUB+=	MONO_OR_CLIENT=""
+.else
+PLIST_SUB+=	MONO_OR_CLIENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMONO}
-USE_QT4+=	dbus gui network script sql xml webkit
 QUASSEL_MONO=	ON
 PLIST_SUB+=	MONO=""
 .else
@@ -57,7 +62,8 @@ PLIST_SUB+=	MONO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCORE}
-USE_QT4+=	network script sql sql-sqlite3_run
+LIB_DEPENDS+=	qca.2:${PORTSDIR}/devel/qca
+USE_QT4+=	sql-sqlite3_run
 QUASSEL_CORE=	ON
 PLIST_SUB+=	CORE=""
 
@@ -71,7 +77,6 @@ PLIST_SUB+=	CORE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCLIENT}
-USE_QT4+=	dbus gui network xml webkit
 QUASSEL_CLIENT=	ON
 PLIST_SUB+=	CLIENT=""
 .else
@@ -84,6 +89,8 @@ pre-configure:
 	${REINPLACE_CMD} -e '/add_subdirectory(i18n)/d' \
 		${WRKSRC}/CMakeLists.txt
 .endif
+	${REINPLACE_CMD} -e 's,knotifyconfig,$${KDE4_KNOTIFYCONFIG_LIBRARY},' \
+		${WRKSRC}/CMakeLists.txt
 
 post-install:
 .if ${PORT_OPTIONS:MCORE}
diff --git a/irc/quassel/distinfo b/irc/quassel/distinfo
index e6be341485d3..d21df8311283 100644
--- a/irc/quassel/distinfo
+++ b/irc/quassel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (quassel-0.8.0.tar.bz2) = a3515bd18e2b100eb9a72480e76b1faefaa5e84cdb236b6af1f05b477a1e9071
-SIZE (quassel-0.8.0.tar.bz2) = 2663465
+SHA256 (quassel-0.9.0.tar.bz2) = 2e3fe06ae3731c829aa3c2f6bb5320619bad264c831f322985c3aa3fe58b6027
+SIZE (quassel-0.9.0.tar.bz2) = 2751143
diff --git a/irc/quassel/pkg-descr b/irc/quassel/pkg-descr
index d4e483464292..aac36d1e759f 100644
--- a/irc/quassel/pkg-descr
+++ b/irc/quassel/pkg-descr
@@ -1,10 +1,10 @@
 Quassel IRC is a modern, cross-platform, distributed IRC client
-based on the Qt4 framework. Distributed means that one (or multiple)
+based on the Qt 4 framework.  Distributed means that one (or multiple)
 client(s) can attach to and detach from a central core that stays
-permanently online. Re-attaching your client will show your IRC
+permanently online.  Re-attaching your client will show your IRC
 session in the same state as you left it in (plus whatever happened
 while you were gone), and this even when you re-attach from a
-different location. An optional Beginner's Mode completely hides
+different location.  An optional Beginner's Mode completely hides
 this feature, so Quassel IRC can be used like a traditional client.
 
-WWW:	http://www.quassel-irc.org/
+WWW: http://www.quassel-irc.org/
diff --git a/irc/quassel/pkg-plist.kde b/irc/quassel/pkg-plist.kde
new file mode 100644
index 000000000000..ed1ad403fb34
--- /dev/null
+++ b/irc/quassel/pkg-plist.kde
@@ -0,0 +1,102 @@
+%%MONO%%bin/quassel
+%%CLIENT%%bin/quasselclient
+%%CORE%%bin/quasselcore
+%%MONO%%share/applications/kde4/quassel.desktop
+%%CLIENT%%share/applications/kde4/quasselclient.desktop
+%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/16x16/status/irc-channel-active.png
+%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/16x16/status/irc-channel-inactive.png
+%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/AUTHORS
+%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/CONTRIBUTING
+%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/COPYING
+%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/scalable/status/irc-channel-active.svgz
+%%MONO_OR_CLIENT%%share/apps/quassel/icons/oxygen/scalable/status/irc-channel-inactive.svgz
+%%MONO_OR_CLIENT%%share/apps/quassel/networks.ini
+%%MONO_OR_CLIENT%%share/apps/quassel/quassel.notifyrc
+%%MONO_OR_CLIENT%%share/apps/quassel/scripts/inxi
+%%MONO_OR_CLIENT%%share/apps/quassel/scripts/mpris
+%%MONO_OR_CLIENT%%share/apps/quassel/stylesheets/LinuxDolt-bluestheme.qss
+%%MONO_OR_CLIENT%%share/apps/quassel/stylesheets/default.qss
+%%MONO_OR_CLIENT%%share/apps/quassel/stylesheets/jussi01-darktheme.qss
+%%MONO_OR_CLIENT%%share/apps/quassel/stylesheets/m4yer.qss
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/cs.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/da.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/de.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/el.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/en_GB.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/en_US.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/eo.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/es.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/fi.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/fr.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/gl.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/hu.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/it.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/ja.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/ko.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/lt.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/nb.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/nl.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/oc.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/pl.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/pt.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/pt_BR.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/ro.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/ru.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/sl.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/sq.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/sr.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/sv.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/tr.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/uk.qm
+%%MONO_OR_CLIENT%%share/apps/quassel/translations/zh_CN.qm
+%%MONO_OR_CLIENT%%share/icons/hicolor/128x128/apps/quassel.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/128x128/status/quassel-inactive.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/128x128/status/quassel-message.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/16x16/apps/quassel.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/16x16/status/quassel-inactive.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/16x16/status/quassel-message.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/22x22/apps/quassel.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/22x22/status/quassel-inactive.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/22x22/status/quassel-message.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/32x32/apps/quassel.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/32x32/status/quassel-inactive.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/32x32/status/quassel-message.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/48x48/apps/quassel.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/48x48/status/quassel-inactive.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/48x48/status/quassel-message.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/64x64/apps/quassel.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/64x64/status/quassel-inactive.png
+%%MONO_OR_CLIENT%%share/icons/hicolor/64x64/status/quassel-message.png
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/64x64/status
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/64x64/apps
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/64x64
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/48x48/status
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/48x48/apps
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/48x48
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/32x32/status
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/32x32/apps
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/32x32
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/22x22/status
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/22x22/apps
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/22x22
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/16x16/status
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/16x16/apps
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/16x16
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/128x128/status
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/128x128/apps
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/128x128
+%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor
+%%MONO_OR_CLIENT%%@dirrmtry share/icons
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/translations
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/stylesheets
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/scripts
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen/scalable/status
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen/scalable
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen/16x16/status
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen/16x16
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons/oxygen
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/icons
+%%MONO_OR_CLIENT%%@dirrm share/apps/quassel
+%%MONO_OR_CLIENT%%@dirrmtry share/apps
+%%MONO_OR_CLIENT%%@dirrmtry share/applications/kde4
+%%MONO_OR_CLIENT%%@dirrmtry share/applications