12 files changed, 280 insertions, 64 deletions

diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index f4a878b969f4..7424d7f0dba1 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ickle
-PORTVERSION=	0.1.2
+PORTVERSION=	0.2.0
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,18 +16,10 @@ MAINTAINER=	troff@paranoia.ru
 
 LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk--
 
-.if defined(WITH_CYRILLIC)
-PATCHFILES+=	ickle-0.1.2.koi8.patch
-PATCH_SITES+=	http://kva.paranoia.ru/~troff/
-PATCH_DIST_STRIP=	-p1
-.endif
-
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-sigc-prefix=${LOCALBASE} \
 		--with-gtkmm-prefix=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I/usr/src/contrib/libstdc++" \
-		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/net-im/ickle/distinfo b/net-im/ickle/distinfo
index 143e494121fd..a202c0956957 100644
--- a/net-im/ickle/distinfo
+++ b/net-im/ickle/distinfo
@@ -1,2 +1 @@
-MD5 (ickle-0.1.2.tar.gz) = 47d11c90e4b7ba9fbae3e5fe954932ba
-MD5 (ickle-0.1.2.koi8.patch) = 1d534d0b891ea699ecd881c33ca5c043
+MD5 (ickle-0.2.0.tar.gz) = 1b100555642205cfca53cecefd432480
diff --git a/net-im/ickle/files/patch-examples::shell.cpp b/net-im/ickle/files/patch-examples::shell.cpp
deleted file mode 100644
index b811fc9a0c4a..000000000000
--- a/net-im/ickle/files/patch-examples::shell.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/shell.cpp.orig     Sat Dec  1 14:51:21 2001
-+++ examples/shell.cpp  Sat Dec  1 14:51:25 2001
-@@ -11,7 +11,6 @@
- #include <sys/wait.h>
- #include <unistd.h>
- #include <signal.h>
--#include <getopt.h>
-
- using namespace ICQ2000;
- using namespace std;
diff --git a/net-im/ickle/files/patch-ltmain.sh b/net-im/ickle/files/patch-ltmain.sh
index e71718a9f08e..d591e1c30e18 100644
--- a/net-im/ickle/files/patch-ltmain.sh
+++ b/net-im/ickle/files/patch-ltmain.sh
@@ -1,15 +1,5 @@
 --- ltmain.sh.orig	Sat Sep 22 20:10:52 2001
 +++ ltmain.sh	Tue Nov 20 21:14:55 2001
-@@ -2444,6 +2444,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
 @@ -4210,10 +4213,12 @@
  	fi
  
diff --git a/net-im/ickle/files/patch-src::Makefile.in b/net-im/ickle/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..97c7b193e15d
--- /dev/null
+++ b/net-im/ickle/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Tue Dec 18 19:19:59 2001
++++ src/Makefile.in	Tue Dec 18 19:20:11 2001
+@@ -387,7 +387,7 @@
+ 
+ install-data-am: install-pkgincludeHEADERS
+ 
+-install-exec-am: install-libLTLIBRARIES
++install-exec-am:
+ 
+ install-info: install-info-am
+ 
diff --git a/net-im/ickle/pkg-plist b/net-im/ickle/pkg-plist
index 1839fc70de7a..73fb6c7d9c09 100644
--- a/net-im/ickle/pkg-plist
+++ b/net-im/ickle/pkg-plist
@@ -1,9 +1,26 @@
 bin/ickle
+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
@@ -11,7 +28,116 @@ 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.1
+lib/libicq2000.so.2
+share/ickle/icons/doors/away.xpm
+share/ickle/icons/doors/chat.xpm
+share/ickle/icons/doors/dnd.xpm
+share/ickle/icons/doors/ffc.xpm
+share/ickle/icons/doors/file.xpm
+share/ickle/icons/doors/invisible.xpm
+share/ickle/icons/doors/message.xpm
+share/ickle/icons/doors/na.xpm
+share/ickle/icons/doors/occ.xpm
+share/ickle/icons/doors/offline.xpm
+share/ickle/icons/doors/online.xpm
+share/ickle/icons/doors/sms.xpm
+share/ickle/icons/doors/url.xpm
+share/ickle/icons/gnomeicu/away.xpm
+share/ickle/icons/gnomeicu/chat.xpm
+share/ickle/icons/gnomeicu/dnd.xpm
+share/ickle/icons/gnomeicu/ffc.xpm
+share/ickle/icons/gnomeicu/file.xpm
+share/ickle/icons/gnomeicu/invisible.xpm
+share/ickle/icons/gnomeicu/message.xpm
+share/ickle/icons/gnomeicu/na.xpm
+share/ickle/icons/gnomeicu/occ.xpm
+share/ickle/icons/gnomeicu/offline.xpm
+share/ickle/icons/gnomeicu/online.xpm
+share/ickle/icons/gnomeicu/sms.xpm
+share/ickle/icons/gnomeicu/url.xpm
+share/ickle/icons/ickle/away.xpm
+share/ickle/icons/ickle/chat.xpm
+share/ickle/icons/ickle/dnd.xpm
+share/ickle/icons/ickle/ffc.xpm
+share/ickle/icons/ickle/file.xpm
+share/ickle/icons/ickle/invisible.xpm
+share/ickle/icons/ickle/message.xpm
+share/ickle/icons/ickle/na.xpm
+share/ickle/icons/ickle/occ.xpm
+share/ickle/icons/ickle/offline.xpm
+share/ickle/icons/ickle/online.xpm
+share/ickle/icons/ickle/sms.xpm
+share/ickle/icons/ickle/url.xpm
+share/ickle/icons/icq/away.xpm
+share/ickle/icons/icq/chat.xpm
+share/ickle/icons/icq/dnd.xpm
+share/ickle/icons/icq/ffc.xpm
+share/ickle/icons/icq/file.xpm
+share/ickle/icons/icq/invisible.xpm
+share/ickle/icons/icq/message.xpm
+share/ickle/icons/icq/na.xpm
+share/ickle/icons/icq/occ.xpm
+share/ickle/icons/icq/offline.xpm
+share/ickle/icons/icq/online.xpm
+share/ickle/icons/icq/sms.xpm
+share/ickle/icons/icq/url.xpm
+share/ickle/icons/new/away.xpm
+share/ickle/icons/new/chat.xpm
+share/ickle/icons/new/dnd.xpm
+share/ickle/icons/new/ffc.xpm
+share/ickle/icons/new/file.xpm
+share/ickle/icons/new/invisible.xpm
+share/ickle/icons/new/message.xpm
+share/ickle/icons/new/na.xpm
+share/ickle/icons/new/occ.xpm
+share/ickle/icons/new/offline.xpm
+share/ickle/icons/new/online.xpm
+share/ickle/icons/new/sms.xpm
+share/ickle/icons/new/url.xpm
+share/ickle/translations/ASCII
+share/ickle/translations/CP437
+share/ickle/translations/CP850
+share/ickle/translations/DANISH
+share/ickle/translations/DEC_MCS
+share/ickle/translations/DG_MCS
+share/ickle/translations/DUTCH
+share/ickle/translations/FINNISH
+share/ickle/translations/FRENCH
+share/ickle/translations/FRENCH_CANADIAN
+share/ickle/translations/GERMAN
+share/ickle/translations/HP_MCS
+share/ickle/translations/IRV
+share/ickle/translations/ITALIAN
+share/ickle/translations/JIS
+share/ickle/translations/LATIN_2
+share/ickle/translations/MACINTOSH
+share/ickle/translations/NEXT
+share/ickle/translations/NORWEGIAN_1
+share/ickle/translations/NORWEGIAN_2
+share/ickle/translations/POLISH
+share/ickle/translations/POLISH_NOPL
+share/ickle/translations/PORTUGUESE
+share/ickle/translations/PORTUGUESE_COM
+share/ickle/translations/RUSSIAN
+share/ickle/translations/RUSSIAN_ALT
+share/ickle/translations/RUSSIAN_WIN
+share/ickle/translations/SPANISH
+share/ickle/translations/SWEDISH
+share/ickle/translations/SWEDISH_NAMES
+share/ickle/translations/SWEDISH_NAMES_COM
+share/ickle/translations/SWISS
+share/ickle/translations/UNITED_KINGDOM
+share/ickle/translations/UNITED_KINGDOM_COM
+@dirrm share/ickle/translations
+@dirrm share/ickle/icons/new
+@dirrm share/ickle/icons/icq
+@dirrm share/ickle/icons/ickle
+@dirrm share/ickle/icons/gnomeicu
+@dirrm share/ickle/icons/doors
+@dirrm share/ickle/icons
+@dirrm share/ickle
 @dirrm include/ickle
diff --git a/net/ickle/Makefile b/net/ickle/Makefile
index f4a878b969f4..7424d7f0dba1 100644
--- a/net/ickle/Makefile
+++ b/net/ickle/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ickle
-PORTVERSION=	0.1.2
+PORTVERSION=	0.2.0
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,18 +16,10 @@ MAINTAINER=	troff@paranoia.ru
 
 LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk--
 
-.if defined(WITH_CYRILLIC)
-PATCHFILES+=	ickle-0.1.2.koi8.patch
-PATCH_SITES+=	http://kva.paranoia.ru/~troff/
-PATCH_DIST_STRIP=	-p1
-.endif
-
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-sigc-prefix=${LOCALBASE} \
 		--with-gtkmm-prefix=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I/usr/src/contrib/libstdc++" \
-		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/net/ickle/distinfo b/net/ickle/distinfo
index 143e494121fd..a202c0956957 100644
--- a/net/ickle/distinfo
+++ b/net/ickle/distinfo
@@ -1,2 +1 @@
-MD5 (ickle-0.1.2.tar.gz) = 47d11c90e4b7ba9fbae3e5fe954932ba
-MD5 (ickle-0.1.2.koi8.patch) = 1d534d0b891ea699ecd881c33ca5c043
+MD5 (ickle-0.2.0.tar.gz) = 1b100555642205cfca53cecefd432480
diff --git a/net/ickle/files/patch-examples::shell.cpp b/net/ickle/files/patch-examples::shell.cpp
deleted file mode 100644
index b811fc9a0c4a..000000000000
--- a/net/ickle/files/patch-examples::shell.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/shell.cpp.orig     Sat Dec  1 14:51:21 2001
-+++ examples/shell.cpp  Sat Dec  1 14:51:25 2001
-@@ -11,7 +11,6 @@
- #include <sys/wait.h>
- #include <unistd.h>
- #include <signal.h>
--#include <getopt.h>
-
- using namespace ICQ2000;
- using namespace std;
diff --git a/net/ickle/files/patch-ltmain.sh b/net/ickle/files/patch-ltmain.sh
index e71718a9f08e..d591e1c30e18 100644
--- a/net/ickle/files/patch-ltmain.sh
+++ b/net/ickle/files/patch-ltmain.sh
@@ -1,15 +1,5 @@
 --- ltmain.sh.orig	Sat Sep 22 20:10:52 2001
 +++ ltmain.sh	Tue Nov 20 21:14:55 2001
-@@ -2444,6 +2444,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
 @@ -4210,10 +4213,12 @@
  	fi
  
diff --git a/net/ickle/files/patch-src::Makefile.in b/net/ickle/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..97c7b193e15d
--- /dev/null
+++ b/net/ickle/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Tue Dec 18 19:19:59 2001
++++ src/Makefile.in	Tue Dec 18 19:20:11 2001
+@@ -387,7 +387,7 @@
+ 
+ install-data-am: install-pkgincludeHEADERS
+ 
+-install-exec-am: install-libLTLIBRARIES
++install-exec-am:
+ 
+ install-info: install-info-am
+ 
diff --git a/net/ickle/pkg-plist b/net/ickle/pkg-plist
index 1839fc70de7a..73fb6c7d9c09 100644
--- a/net/ickle/pkg-plist
+++ b/net/ickle/pkg-plist
@@ -1,9 +1,26 @@
 bin/ickle
+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
@@ -11,7 +28,116 @@ 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.1
+lib/libicq2000.so.2
+share/ickle/icons/doors/away.xpm
+share/ickle/icons/doors/chat.xpm
+share/ickle/icons/doors/dnd.xpm
+share/ickle/icons/doors/ffc.xpm
+share/ickle/icons/doors/file.xpm
+share/ickle/icons/doors/invisible.xpm
+share/ickle/icons/doors/message.xpm
+share/ickle/icons/doors/na.xpm
+share/ickle/icons/doors/occ.xpm
+share/ickle/icons/doors/offline.xpm
+share/ickle/icons/doors/online.xpm
+share/ickle/icons/doors/sms.xpm
+share/ickle/icons/doors/url.xpm
+share/ickle/icons/gnomeicu/away.xpm
+share/ickle/icons/gnomeicu/chat.xpm
+share/ickle/icons/gnomeicu/dnd.xpm
+share/ickle/icons/gnomeicu/ffc.xpm
+share/ickle/icons/gnomeicu/file.xpm
+share/ickle/icons/gnomeicu/invisible.xpm
+share/ickle/icons/gnomeicu/message.xpm
+share/ickle/icons/gnomeicu/na.xpm
+share/ickle/icons/gnomeicu/occ.xpm
+share/ickle/icons/gnomeicu/offline.xpm
+share/ickle/icons/gnomeicu/online.xpm
+share/ickle/icons/gnomeicu/sms.xpm
+share/ickle/icons/gnomeicu/url.xpm
+share/ickle/icons/ickle/away.xpm
+share/ickle/icons/ickle/chat.xpm
+share/ickle/icons/ickle/dnd.xpm
+share/ickle/icons/ickle/ffc.xpm
+share/ickle/icons/ickle/file.xpm
+share/ickle/icons/ickle/invisible.xpm
+share/ickle/icons/ickle/message.xpm
+share/ickle/icons/ickle/na.xpm
+share/ickle/icons/ickle/occ.xpm
+share/ickle/icons/ickle/offline.xpm
+share/ickle/icons/ickle/online.xpm
+share/ickle/icons/ickle/sms.xpm
+share/ickle/icons/ickle/url.xpm
+share/ickle/icons/icq/away.xpm
+share/ickle/icons/icq/chat.xpm
+share/ickle/icons/icq/dnd.xpm
+share/ickle/icons/icq/ffc.xpm
+share/ickle/icons/icq/file.xpm
+share/ickle/icons/icq/invisible.xpm
+share/ickle/icons/icq/message.xpm
+share/ickle/icons/icq/na.xpm
+share/ickle/icons/icq/occ.xpm
+share/ickle/icons/icq/offline.xpm
+share/ickle/icons/icq/online.xpm
+share/ickle/icons/icq/sms.xpm
+share/ickle/icons/icq/url.xpm
+share/ickle/icons/new/away.xpm
+share/ickle/icons/new/chat.xpm
+share/ickle/icons/new/dnd.xpm
+share/ickle/icons/new/ffc.xpm
+share/ickle/icons/new/file.xpm
+share/ickle/icons/new/invisible.xpm
+share/ickle/icons/new/message.xpm
+share/ickle/icons/new/na.xpm
+share/ickle/icons/new/occ.xpm
+share/ickle/icons/new/offline.xpm
+share/ickle/icons/new/online.xpm
+share/ickle/icons/new/sms.xpm
+share/ickle/icons/new/url.xpm
+share/ickle/translations/ASCII
+share/ickle/translations/CP437
+share/ickle/translations/CP850
+share/ickle/translations/DANISH
+share/ickle/translations/DEC_MCS
+share/ickle/translations/DG_MCS
+share/ickle/translations/DUTCH
+share/ickle/translations/FINNISH
+share/ickle/translations/FRENCH
+share/ickle/translations/FRENCH_CANADIAN
+share/ickle/translations/GERMAN
+share/ickle/translations/HP_MCS
+share/ickle/translations/IRV
+share/ickle/translations/ITALIAN
+share/ickle/translations/JIS
+share/ickle/translations/LATIN_2
+share/ickle/translations/MACINTOSH
+share/ickle/translations/NEXT
+share/ickle/translations/NORWEGIAN_1
+share/ickle/translations/NORWEGIAN_2
+share/ickle/translations/POLISH
+share/ickle/translations/POLISH_NOPL
+share/ickle/translations/PORTUGUESE
+share/ickle/translations/PORTUGUESE_COM
+share/ickle/translations/RUSSIAN
+share/ickle/translations/RUSSIAN_ALT
+share/ickle/translations/RUSSIAN_WIN
+share/ickle/translations/SPANISH
+share/ickle/translations/SWEDISH
+share/ickle/translations/SWEDISH_NAMES
+share/ickle/translations/SWEDISH_NAMES_COM
+share/ickle/translations/SWISS
+share/ickle/translations/UNITED_KINGDOM
+share/ickle/translations/UNITED_KINGDOM_COM
+@dirrm share/ickle/translations
+@dirrm share/ickle/icons/new
+@dirrm share/ickle/icons/icq
+@dirrm share/ickle/icons/ickle
+@dirrm share/ickle/icons/gnomeicu
+@dirrm share/ickle/icons/doors
+@dirrm share/ickle/icons
+@dirrm share/ickle
 @dirrm include/ickle