irc/quassel:

- Update to 0.11.0. This version requires compiler with c++11 support
- Сonvert to USES=execinfo
- Use options helpers as much as possible
- Fix packaging for combination of NLS/MONO_OR_CLIENT options
- drop @dirrm from plist

4 files changed, 56 insertions, 92 deletions

diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index 64d9dcec3f1c..11ec5619591a 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -2,41 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	quassel
-PORTVERSION=	0.10.0
-PORTREVISION=	1
+PORTVERSION=	0.11.0
 CATEGORIES=	irc
 MASTER_SITES=	http://www.quassel-irc.org/pub/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt 4 based distributed IRC client
 
-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
-USES=		cmake:outsource tar:bzip2
+USES=		cmake:outsource compiler:c++11-lib execinfo tar:bzip2
 USE_QT4=	corelib network script sql \
 		qmake_build moc_build rcc_build uic_build
+CMAKE_ARGS=	-DWITH_LIBINDICATE=off \
+		-DEMBED_DATA=on
 
 OPTIONS_DEFINE=	KDE NLS
 OPTIONS_MULTI=	MODULE
+MODULE_DESC=	Quassel components
 OPTIONS_MULTI_MODULE=	MONO CORE CLIENT
 OPTIONS_DEFAULT=	${OPTIONS_MULTI_MODULE}
+OPTIONS_SUB=	yes
 
 MONO_DESC=	Quassel standalone client
+MONO_CMAKE_ON=	-DWANT_MONO=on
+MONO_CMAKE_OFF=	-DWANT_MONO=off
+
 CORE_DESC=	Quassel core (for use with client)
+CORE_LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
+CORE_USE=	QT4=sql-sqlite3_run
+CORE_CMAKE_ON=	-DWANT_CORE=on
+CORE_CMAKE_OFF=	-DWANT_CORE=off
+
 CLIENT_DESC=	Quassel client (for use with core)
+CLIENT_CMAKE_ON=	-DWANT_QTCLIENT=on
+CLIENT_CMAKE_OFF=	-DWANT_QTCLIENT=off
+
 KDE_DESC=	KDE 4 integration (for clients only)
 
-CMAKE_ARGS+=	-DWANT_MONO=${QUASSEL_MONO} \
-		-DWANT_CORE=${QUASSEL_CORE} \
-		-DWANT_QTCLIENT=${QUASSEL_CLIENT} \
-		-DWITH_LIBINDICATE=OFF
+NLS_USE=	QT4=linguist_build
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USE_QT4+=	linguist_build
-.endif
-
 .if ${PORT_OPTIONS:MMONO} || ${PORT_OPTIONS:MCLIENT}
 . if ${PORT_OPTIONS:MKDE}
 USE_KDE4=	automoc4 kdelibs kdeprefix
@@ -52,40 +57,16 @@ PLIST_SUB+=	MONO_OR_CLIENT=""
 PLIST_SUB+=	MONO_OR_CLIENT="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MMONO}
-QUASSEL_MONO=	ON
-PLIST_SUB+=	MONO=""
-.else
-QUASSEL_MONO=	OFF
-PLIST_SUB+=	MONO="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MCORE}
-LIB_DEPENDS+=	libqca.so:${PORTSDIR}/devel/qca
-USE_QT4+=	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 "
-.endif
-
-.if ${PORT_OPTIONS:MCLIENT}
-QUASSEL_CLIENT=	ON
-PLIST_SUB+=	CLIENT=""
-.else
-QUASSEL_CLIENT=	OFF
-PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 pre-configure:
 .if !${PORT_OPTIONS:MNLS}
-	${REINPLACE_CMD} -e '/add_subdirectory(i18n)/d' \
+	${REINPLACE_CMD} -e '/add_subdirectory(po)/d' \
 		${WRKSRC}/CMakeLists.txt
 .endif
 
diff --git a/irc/quassel/distinfo b/irc/quassel/distinfo
index c169748b9dad..35448ff133eb 100644
--- a/irc/quassel/distinfo
+++ b/irc/quassel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (quassel-0.10.0.tar.bz2) = 68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23
-SIZE (quassel-0.10.0.tar.bz2) = 2873233
+SHA256 (quassel-0.11.0.tar.bz2) = 99a191b8bc2a410f7020b890ec57e0be49313f539da9f4843675bb108b0f4504
+SIZE (quassel-0.11.0.tar.bz2) = 2875387
diff --git a/irc/quassel/pkg-plist b/irc/quassel/pkg-plist
index 11fa3a2667dc..b31f14309a03 100644
--- a/irc/quassel/pkg-plist
+++ b/irc/quassel/pkg-plist
@@ -6,10 +6,3 @@
 %%MONO_OR_CLIENT%%share/apps/quassel/scripts/inxi
 %%MONO_OR_CLIENT%%share/apps/quassel/scripts/mpris
 %%MONO_OR_CLIENT%%share/icons/hicolor/48x48/apps/quassel.png
-%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/48x48/apps
-%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor/48x48
-%%MONO_OR_CLIENT%%@dirrmtry share/icons/hicolor
-%%MONO_OR_CLIENT%%@dirrmtry share/icons
-%%MONO_OR_CLIENT%%@dirrm share/apps/quassel/scripts
-%%MONO_OR_CLIENT%%@dirrm share/apps/quassel
-%%MONO_OR_CLIENT%%@dirrmtry share/apps
diff --git a/irc/quassel/pkg-plist.kde b/irc/quassel/pkg-plist.kde
index 61e85115a9fa..f65d26a8f9fb 100644
--- a/irc/quassel/pkg-plist.kde
+++ b/irc/quassel/pkg-plist.kde
@@ -18,41 +18,41 @@
 %%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/hi.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/mr.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/pa.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/apps/quassel/translations/zh_TW.qm
+%%NLS%%share/apps/quassel/translations/cs.qm
+%%NLS%%share/apps/quassel/translations/da.qm
+%%NLS%%share/apps/quassel/translations/de.qm
+%%NLS%%share/apps/quassel/translations/el.qm
+%%NLS%%share/apps/quassel/translations/en_GB.qm
+%%NLS%%share/apps/quassel/translations/en_US.qm
+%%NLS%%share/apps/quassel/translations/eo.qm
+%%NLS%%share/apps/quassel/translations/es.qm
+%%NLS%%share/apps/quassel/translations/fi.qm
+%%NLS%%share/apps/quassel/translations/fr.qm
+%%NLS%%share/apps/quassel/translations/gl.qm
+%%NLS%%share/apps/quassel/translations/hi.qm
+%%NLS%%share/apps/quassel/translations/hu.qm
+%%NLS%%share/apps/quassel/translations/it.qm
+%%NLS%%share/apps/quassel/translations/ja.qm
+%%NLS%%share/apps/quassel/translations/ko.qm
+%%NLS%%share/apps/quassel/translations/lt.qm
+%%NLS%%share/apps/quassel/translations/mr.qm
+%%NLS%%share/apps/quassel/translations/nb.qm
+%%NLS%%share/apps/quassel/translations/nl.qm
+%%NLS%%share/apps/quassel/translations/oc.qm
+%%NLS%%share/apps/quassel/translations/pa.qm
+%%NLS%%share/apps/quassel/translations/pl.qm
+%%NLS%%share/apps/quassel/translations/pt.qm
+%%NLS%%share/apps/quassel/translations/pt_BR.qm
+%%NLS%%share/apps/quassel/translations/ro.qm
+%%NLS%%share/apps/quassel/translations/ru.qm
+%%NLS%%share/apps/quassel/translations/sl.qm
+%%NLS%%share/apps/quassel/translations/sq.qm
+%%NLS%%share/apps/quassel/translations/sr.qm
+%%NLS%%share/apps/quassel/translations/sv.qm
+%%NLS%%share/apps/quassel/translations/tr.qm
+%%NLS%%share/apps/quassel/translations/uk.qm
+%%NLS%%share/apps/quassel/translations/zh_CN.qm
+%%NLS%%share/apps/quassel/translations/zh_TW.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
@@ -71,13 +71,3 @@
 %%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%%@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