3 files changed, 58 insertions, 39 deletions

diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index a84776722323..40f26460d8ee 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -7,22 +7,29 @@
 #
 
 PORTNAME=	ickle
-PORTVERSION=	0.2.2
+PORTVERSION=	0.3.1
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	troff@paranoia.ru
 
-LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk--
+LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk-- \
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		icq2000.4:${PORTSDIR}/net/libicq2000
 
 WANT_GNOME=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-sigc-prefix=${LOCALBASE} \
 		--with-gtkmm-prefix=${X11BASE}
 
+post-patch:
+	@${PERL} -pi -e 's|(#include <sys/socket.h>)|#include <sys/types.h>\n\1|' \
+		${WRKSRC}/ctrlsocket/ControlSocket.h
+
 .include <bsd.port.pre.mk>
 
 .if defined(HAVE_GNOME) || defined(WITH_GNOME)
@@ -35,9 +42,21 @@ CONFIGURE_ARGS+=	--with-gnome=no
 PLIST_SUB+=	ICKLEDATADIR="share/" GNOME="@comment " NOGNOME=""
 .endif
 
+.if defined(WITH_ICKLE_CONTROL)
+PLIST_SUB+=	ICKLECONTROL=""
+.else
+CONFIGURE_ARGS+=	--without-ickle-control
+
+PLIST_SUB+=	ICKLECONTROL="@comment "
+.endif
+
 pre-everything::
 .if !defined(HAVE_GNOME) && !defined(WITH_GNOME)
 	@${ECHO_MSG} "===> Define WITH_GNOME		to enable GNOME support"
 .endif
+.if !defined(WITH_ICKLE_CONTROL)
+	@${ECHO_MSG} "===> Define WITH_ICKLE_CONTROL	to enable external command-line"
+	@${ECHO_MSG} "===>				control for the ickle client"
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-im/ickle/distinfo b/net-im/ickle/distinfo
index c262adeae31b..36023cca0bfa 100644
--- a/net-im/ickle/distinfo
+++ b/net-im/ickle/distinfo
@@ -1 +1 @@
-MD5 (ickle-0.2.2.tar.gz) = aa509c68a1d7b2d2295a99f124d8cf02
+MD5 (ickle-0.3.1.tar.gz) = c1cb37b0264db9610cf7e8e53255db99
diff --git a/net-im/ickle/pkg-plist b/net-im/ickle/pkg-plist
index f59a3b3dc3e4..34a72a94f0fc 100644
--- a/net-im/ickle/pkg-plist
+++ b/net-im/ickle/pkg-plist
@@ -1,40 +1,7 @@
 %%NOGNOME%%bin/ickle
 %%GNOME%%bin/ickle_applet
+%%ICKLECONTROL%%bin/ickle_control
 %%GNOME%%etc/CORBA/servers/ickle_applet.gnorba
-include/ickle/Cache.h
-include/ickle/Client.h
-include/ickle/Contact.h
-include/ickle/ContactList.h
-include/ickle/DCCache.h
-include/ickle/DirectClient.h
-include/ickle/ICBMCookie.h
-include/ickle/ICBMCookieCache.h
-include/ickle/ICQ.h
-include/ickle/RequestIDCache.h
-include/ickle/SNAC-BUD.h
-include/ickle/SNAC-GEN.h
-include/ickle/SNAC-LOC.h
-include/ickle/SNAC-MSG.h
-include/ickle/SNAC-SRV.h
-include/ickle/SNAC-UIN.h
-include/ickle/SNAC-base.h
-include/ickle/SNAC.h
-include/ickle/SeqNumCache.h
-include/ickle/TLV.h
-include/ickle/Translator.h
-include/ickle/UserInfoBlock.h
-include/ickle/Xml.h
-include/ickle/buffer.h
-include/ickle/constants.h
-include/ickle/custom_marshal.h
-include/ickle/events.h
-include/ickle/exceptions.h
-include/ickle/socket.h
-include/ickle/sstream_fix.h
-include/ickle/userinfoconstants.h
-lib/libicq2000.a
-lib/libicq2000.so
-lib/libicq2000.so.2
 %%GNOME%%%%ICKLEDATADIR%%applets/Network/ickle_applet.desktop
 %%ICKLEDATADIR%%ickle/icons/doors/away.xpm
 %%ICKLEDATADIR%%ickle/icons/doors/chat.xpm
@@ -48,7 +15,22 @@ lib/libicq2000.so.2
 %%ICKLEDATADIR%%ickle/icons/doors/offline.xpm
 %%ICKLEDATADIR%%ickle/icons/doors/online.xpm
 %%ICKLEDATADIR%%ickle/icons/doors/sms.xpm
+%%ICKLEDATADIR%%ickle/icons/doors/sysmsg.xpm
 %%ICKLEDATADIR%%ickle/icons/doors/url.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/away.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/chat.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/dnd.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/ffc.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/file.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/invisible.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/message.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/na.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/occ.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/offline.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/online.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/sms.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/sysmsg.xpm
+%%ICKLEDATADIR%%ickle/icons/eureka/url.xpm
 %%ICKLEDATADIR%%ickle/icons/gnomeicu/away.xpm
 %%ICKLEDATADIR%%ickle/icons/gnomeicu/chat.xpm
 %%ICKLEDATADIR%%ickle/icons/gnomeicu/dnd.xpm
@@ -61,6 +43,7 @@ lib/libicq2000.so.2
 %%ICKLEDATADIR%%ickle/icons/gnomeicu/offline.xpm
 %%ICKLEDATADIR%%ickle/icons/gnomeicu/online.xpm
 %%ICKLEDATADIR%%ickle/icons/gnomeicu/sms.xpm
+%%ICKLEDATADIR%%ickle/icons/gnomeicu/sysmsg.xpm
 %%ICKLEDATADIR%%ickle/icons/gnomeicu/url.xpm
 %%ICKLEDATADIR%%ickle/icons/ickle/away.xpm
 %%ICKLEDATADIR%%ickle/icons/ickle/chat.xpm
@@ -74,6 +57,7 @@ lib/libicq2000.so.2
 %%ICKLEDATADIR%%ickle/icons/ickle/offline.xpm
 %%ICKLEDATADIR%%ickle/icons/ickle/online.xpm
 %%ICKLEDATADIR%%ickle/icons/ickle/sms.xpm
+%%ICKLEDATADIR%%ickle/icons/ickle/sysmsg.xpm
 %%ICKLEDATADIR%%ickle/icons/ickle/url.xpm
 %%ICKLEDATADIR%%ickle/icons/icq/away.xpm
 %%ICKLEDATADIR%%ickle/icons/icq/chat.xpm
@@ -87,7 +71,22 @@ lib/libicq2000.so.2
 %%ICKLEDATADIR%%ickle/icons/icq/offline.xpm
 %%ICKLEDATADIR%%ickle/icons/icq/online.xpm
 %%ICKLEDATADIR%%ickle/icons/icq/sms.xpm
+%%ICKLEDATADIR%%ickle/icons/icq/sysmsg.xpm
 %%ICKLEDATADIR%%ickle/icons/icq/url.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/away.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/chat.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/dnd.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/ffc.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/file.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/invisible.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/message.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/na.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/occ.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/offline.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/online.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/sms.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/sysmsg.xpm
+%%ICKLEDATADIR%%ickle/icons/kit/url.xpm
 %%ICKLEDATADIR%%ickle/icons/new/away.xpm
 %%ICKLEDATADIR%%ickle/icons/new/chat.xpm
 %%ICKLEDATADIR%%ickle/icons/new/dnd.xpm
@@ -100,6 +99,7 @@ lib/libicq2000.so.2
 %%ICKLEDATADIR%%ickle/icons/new/offline.xpm
 %%ICKLEDATADIR%%ickle/icons/new/online.xpm
 %%ICKLEDATADIR%%ickle/icons/new/sms.xpm
+%%ICKLEDATADIR%%ickle/icons/new/sysmsg.xpm
 %%ICKLEDATADIR%%ickle/icons/new/url.xpm
 %%ICKLEDATADIR%%ickle/translations/ASCII
 %%ICKLEDATADIR%%ickle/translations/CP437
@@ -138,15 +138,15 @@ lib/libicq2000.so.2
 %%ICKLEDATADIR%%ickle/translations/UNITED_KINGDOM_COM
 @dirrm %%ICKLEDATADIR%%ickle/translations
 @dirrm %%ICKLEDATADIR%%ickle/icons/new
+@dirrm %%ICKLEDATADIR%%ickle/icons/kit
 @dirrm %%ICKLEDATADIR%%ickle/icons/icq
 @dirrm %%ICKLEDATADIR%%ickle/icons/ickle
 @dirrm %%ICKLEDATADIR%%ickle/icons/gnomeicu
+@dirrm %%ICKLEDATADIR%%ickle/icons/eureka
 @dirrm %%ICKLEDATADIR%%ickle/icons/doors
 @dirrm %%ICKLEDATADIR%%ickle/icons
 @dirrm %%ICKLEDATADIR%%ickle
 @unexec rmdir %D/%%ICKLEDATADIR%%applets/Network 2>/dev/null || true
 @unexec rmdir %D/%%ICKLEDATADIR%%applets 2>/dev/null || true
-@unexec rmdir %D/%%ICKLEDATADIR%% 2>/dev/null || true
-@dirrm include/ickle
 @unexec rmdir %D/etc/CORBA/servers 2>/dev/null || true
 @unexec rmdir %D/etc/CORBA 2>/dev/null || true