3 files changed, 88 insertions, 75 deletions

diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 4a2adfd50d3e..ad3140a21622 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mcabber
-PORTVERSION=	0.10.0
-PORTREVISION=	2
+PORTVERSION=	0.10.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/ CENKES
 #DISTNAME=	${PORTNAME}-${PORTVERSION}-rc3
@@ -17,6 +16,8 @@ COMMENT=	Small Jabber console client
 
 LIB_DEPENDS=	loudmouth:${PORTSDIR}/net-im/loudmouth
 
+LICENSE=	GPLv2
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sigwinch
@@ -32,7 +33,8 @@ MAN1=		mcabber.1
 
 OPTIONS=	GPGME "Use security/gpgme for PGP support" off \
 		OTR "Off-the-record messaging support" off \
-		ASPELL "Use textproc/aspell for spell checking" off
+		ASPELL "Use textproc/aspell for spell checking" off \
+		ENCHANT "Use texproc/enchant for spell checking" off
 
 .include <bsd.port.pre.mk>
 
@@ -47,19 +49,28 @@ CONFIGURE_ARGS+=--enable-gpgme
 CONFIGURE_ARGS+=--disable-gpgme
 .endif
 
-.if defined(WITH_ASPELL)
+.if defined(WITH_ASPELL) && !defined(WITH_ENCHANT)
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 CONFIGURE_ARGS+=--enable-aspell
 .else
 CONFIGURE_ARGS+=--disable-aspell
 .endif
 
+.if defined(WITH_ENCHANT)
+LIB_DEPENDS+=   enchant.1:${PORTSDIR}/textproc/enchant
+CONFIGURE_ARGS+=--enable-enchant
+.else
+CONFIGURE_ARGS+=--disable-enchant
+.endif
+
 .if defined(WITH_OTR)
 LIB_DEPENDS+=	otr.4:${PORTSDIR}/security/libotr \
 		gcrypt.17:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=--enable-otr
+PLIST_SUB+=	OTR=""
 .else
 CONFIGURE_ARGS+=--disable-otr
+PLIST_SUB+=	OTR="@comment "
 .endif
 
 post-patch:
diff --git a/net-im/mcabber/distinfo b/net-im/mcabber/distinfo
index 096708952e6b..61e484469b77 100644
--- a/net-im/mcabber/distinfo
+++ b/net-im/mcabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (mcabber-0.10.0.tar.bz2) = 97faad2154a87da9329d51db957f9024
-SHA256 (mcabber-0.10.0.tar.bz2) = ef1bb95238a32f841c6e7032550b40197643843b6e459f44ad53c558f5d75c03
-SIZE (mcabber-0.10.0.tar.bz2) = 552111
+MD5 (mcabber-0.10.1.tar.bz2) = fe96beab30f535d5d6270fd1719659b4
+SHA256 (mcabber-0.10.1.tar.bz2) = 00cb9c0b272a44559c4207fe37ecd43c5cdff88d1e3a0ed2ba5eec10d9638888
+SIZE (mcabber-0.10.1.tar.bz2) = 554682
diff --git a/net-im/mcabber/pkg-plist b/net-im/mcabber/pkg-plist
index 87b7cab22561..0663497e37d7 100644
--- a/net-im/mcabber/pkg-plist
+++ b/net-im/mcabber/pkg-plist
@@ -1,52 +1,80 @@
 bin/mcabber
-share/applications/mcabber.desktop
-include/mcabber/main.h
-include/mcabber/roster.h
-include/mcabber/events.h
+include/mcabber/api.h
+include/mcabber/caps.h
 include/mcabber/commands.h
 include/mcabber/compl.h
+include/mcabber/config.h
+include/mcabber/events.h
+include/mcabber/fifo.h
 include/mcabber/hbuf.h
-include/mcabber/screen.h
+include/mcabber/help.h
+include/mcabber/hgcset.h
+include/mcabber/histolog.h
+include/mcabber/hooks.h
 include/mcabber/logprint.h
+include/mcabber/main.h
+include/mcabber/modules.h
+%%OTR%%include/mcabber/nohtml.h
+%%OTR%%include/mcabber/otr.h
+include/mcabber/pgp.h
+include/mcabber/roster.h
+include/mcabber/screen.h
 include/mcabber/settings.h
-include/mcabber/hooks.h
 include/mcabber/utf8.c
 include/mcabber/utf8.h
-include/mcabber/histolog.h
 include/mcabber/utils.h
-include/mcabber/pgp.h
 include/mcabber/xmpp.h
-include/mcabber/xmpp_helper.h
 include/mcabber/xmpp_defines.h
+include/mcabber/xmpp_helper.h
 include/mcabber/xmpp_iq.h
 include/mcabber/xmpp_iqrequest.h
 include/mcabber/xmpp_muc.h
 include/mcabber/xmpp_s10n.h
-include/mcabber/caps.h
-include/mcabber/fifo.h
-include/mcabber/help.h
-include/mcabber/modules.h
-include/mcabber/api.h
-include/mcabber/config.h
-include/mcabber/hgcset.h
-lib/mcabber/libbeep.so
 lib/mcabber/libbeep.la
-lib/mcabber/libxttitle.so
+lib/mcabber/libbeep.so
 lib/mcabber/libxttitle.la
+lib/mcabber/libxttitle.so
 libdata/pkgconfig/mcabber.pc
+share/applications/mcabber.desktop
 %%EXAMPLESDIR%%/mcabberrc
-%%DATADIR%%/contrib/vim/mcabber_log-ftdetect.vim
-%%DATADIR%%/contrib/vim/mcabber_log-syntax.vim
-%%DATADIR%%/contrib/cicq2mcabber.pl
-%%DATADIR%%/contrib/events/eventcmd
-%%DATADIR%%/contrib/events/eventcmd.osd
-%%DATADIR%%/contrib/events/eventcmd.pastebin
-%%DATADIR%%/contrib/events/mcnotify.py
-%%DATADIR%%/contrib/filter_statusmsg.py
-%%DATADIR%%/contrib/merge_history.py
-%%DATADIR%%/contrib/themes/light.txt
-%%DATADIR%%/contrib/themes/light2.txt
-%%DATADIR%%/contrib/themes/oliver.txt
+%%DATADIR%%/help/en/hlp.txt
+%%DATADIR%%/help/en/hlp_add.txt
+%%DATADIR%%/help/en/hlp_alias.txt
+%%DATADIR%%/help/en/hlp_authorization.txt
+%%DATADIR%%/help/en/hlp_bind.txt
+%%DATADIR%%/help/en/hlp_buffer.txt
+%%DATADIR%%/help/en/hlp_chat_disable.txt
+%%DATADIR%%/help/en/hlp_clear.txt
+%%DATADIR%%/help/en/hlp_color.txt
+%%DATADIR%%/help/en/hlp_connect.txt
+%%DATADIR%%/help/en/hlp_del.txt
+%%DATADIR%%/help/en/hlp_disconnect.txt
+%%DATADIR%%/help/en/hlp_echo.txt
+%%DATADIR%%/help/en/hlp_event.txt
+%%DATADIR%%/help/en/hlp_group.txt
+%%DATADIR%%/help/en/hlp_help.txt
+%%DATADIR%%/help/en/hlp_iline.txt
+%%DATADIR%%/help/en/hlp_info.txt
+%%DATADIR%%/help/en/hlp_module.txt
+%%DATADIR%%/help/en/hlp_move.txt
+%%DATADIR%%/help/en/hlp_msay.txt
+%%DATADIR%%/help/en/hlp_otr.txt
+%%DATADIR%%/help/en/hlp_otrpolicy.txt
+%%DATADIR%%/help/en/hlp_pgp.txt
+%%DATADIR%%/help/en/hlp_quit.txt
+%%DATADIR%%/help/en/hlp_rawxml.txt
+%%DATADIR%%/help/en/hlp_rename.txt
+%%DATADIR%%/help/en/hlp_request.txt
+%%DATADIR%%/help/en/hlp_room.txt
+%%DATADIR%%/help/en/hlp_roster.txt
+%%DATADIR%%/help/en/hlp_say.txt
+%%DATADIR%%/help/en/hlp_say_to.txt
+%%DATADIR%%/help/en/hlp_screen_refresh.txt
+%%DATADIR%%/help/en/hlp_set.txt
+%%DATADIR%%/help/en/hlp_source.txt
+%%DATADIR%%/help/en/hlp_status.txt
+%%DATADIR%%/help/en/hlp_status_to.txt
+%%DATADIR%%/help/en/hlp_version.txt
 %%DATADIR%%/help/cs/hlp.txt
 %%DATADIR%%/help/cs/hlp_add.txt
 %%DATADIR%%/help/cs/hlp_alias.txt
@@ -123,44 +151,6 @@ libdata/pkgconfig/mcabber.pc
 %%DATADIR%%/help/de/hlp_status.txt
 %%DATADIR%%/help/de/hlp_status_to.txt
 %%DATADIR%%/help/de/hlp_version.txt
-%%DATADIR%%/help/en/hlp.txt
-%%DATADIR%%/help/en/hlp_add.txt
-%%DATADIR%%/help/en/hlp_alias.txt
-%%DATADIR%%/help/en/hlp_authorization.txt
-%%DATADIR%%/help/en/hlp_bind.txt
-%%DATADIR%%/help/en/hlp_buffer.txt
-%%DATADIR%%/help/en/hlp_chat_disable.txt
-%%DATADIR%%/help/en/hlp_clear.txt
-%%DATADIR%%/help/en/hlp_color.txt
-%%DATADIR%%/help/en/hlp_connect.txt
-%%DATADIR%%/help/en/hlp_del.txt
-%%DATADIR%%/help/en/hlp_disconnect.txt
-%%DATADIR%%/help/en/hlp_echo.txt
-%%DATADIR%%/help/en/hlp_event.txt
-%%DATADIR%%/help/en/hlp_group.txt
-%%DATADIR%%/help/en/hlp_help.txt
-%%DATADIR%%/help/en/hlp_iline.txt
-%%DATADIR%%/help/en/hlp_info.txt
-%%DATADIR%%/help/en/hlp_module.txt
-%%DATADIR%%/help/en/hlp_move.txt
-%%DATADIR%%/help/en/hlp_msay.txt
-%%DATADIR%%/help/en/hlp_otr.txt
-%%DATADIR%%/help/en/hlp_otrpolicy.txt
-%%DATADIR%%/help/en/hlp_pgp.txt
-%%DATADIR%%/help/en/hlp_quit.txt
-%%DATADIR%%/help/en/hlp_rawxml.txt
-%%DATADIR%%/help/en/hlp_rename.txt
-%%DATADIR%%/help/en/hlp_request.txt
-%%DATADIR%%/help/en/hlp_room.txt
-%%DATADIR%%/help/en/hlp_roster.txt
-%%DATADIR%%/help/en/hlp_say.txt
-%%DATADIR%%/help/en/hlp_say_to.txt
-%%DATADIR%%/help/en/hlp_screen_refresh.txt
-%%DATADIR%%/help/en/hlp_set.txt
-%%DATADIR%%/help/en/hlp_source.txt
-%%DATADIR%%/help/en/hlp_status.txt
-%%DATADIR%%/help/en/hlp_status_to.txt
-%%DATADIR%%/help/en/hlp_version.txt
 %%DATADIR%%/help/fr/hlp.txt
 %%DATADIR%%/help/fr/hlp_add.txt
 %%DATADIR%%/help/fr/hlp_alias.txt
@@ -389,6 +379,18 @@ libdata/pkgconfig/mcabber.pc
 %%DATADIR%%/help/uk/hlp_status.txt
 %%DATADIR%%/help/uk/hlp_status_to.txt
 %%DATADIR%%/help/uk/hlp_version.txt
+%%DATADIR%%/contrib/events/eventcmd.osd
+%%DATADIR%%/contrib/events/eventcmd
+%%DATADIR%%/contrib/events/eventcmd.pastebin
+%%DATADIR%%/contrib/events/mcnotify.py
+%%DATADIR%%/contrib/themes/light.txt
+%%DATADIR%%/contrib/themes/light2.txt
+%%DATADIR%%/contrib/themes/oliver.txt
+%%DATADIR%%/contrib/vim/mcabber_log-ftdetect.vim
+%%DATADIR%%/contrib/vim/mcabber_log-syntax.vim
+%%DATADIR%%/contrib/cicq2mcabber.pl
+%%DATADIR%%/contrib/filter_statusmsg.py
+%%DATADIR%%/contrib/merge_history.py
 @dirrm %%EXAMPLESDIR%%
 @dirrm include/mcabber
 @dirrm lib/mcabber