upgrade to 4.9.3

12 files changed, 78 insertions, 104 deletions

diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 6b64e10be76f..85c9ef63e5b0 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	centericq
-PORTVERSION=	4.9.2
+PORTVERSION=	4.9.3
 PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	http://konst.org.ua/download/
@@ -21,14 +21,13 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++"
 CONFIGURE_ARGS=	--with-openssl
 #CONFIGURE_ARGS=	--with-fribidi
 
-MAN1=	centericq.1
+MAN1=	centericq.1 cicqconv.1 cicqsync.1
 
 post-patch:
 .for file in kkconsui-0.1/include/conf.h kkstrtext-0.1/conf.h kksystr-0.1/include/conf.h
diff --git a/net-im/centericq/distinfo b/net-im/centericq/distinfo
index cf2a781bce1a..c1f92b8eecb2 100644
--- a/net-im/centericq/distinfo
+++ b/net-im/centericq/distinfo
@@ -1 +1 @@
-MD5 (centericq-4.9.2.tar.gz) = fb009228b3bc3cf29584601cc82e90df
+MD5 (centericq-4.9.3.tar.gz) = 5324a9610fa0430872ad1f851fa40283
diff --git a/net-im/centericq/files/patch-msnhook.cc b/net-im/centericq/files/patch-msnhook.cc
index 653618e18ef5..6ec55a2bacd4 100644
--- a/net-im/centericq/files/patch-msnhook.cc
+++ b/net-im/centericq/files/patch-msnhook.cc
@@ -1,24 +1,24 @@
---- src/hooks/msnhook.cc	Fri Dec 13 00:17:12 2002
-+++ src/hooks/msnhook.cc	Sun Jan  5 02:02:44 2003
-@@ -29,6 +29,7 @@
- #include "accountmanager.h"
+--- src/hooks/msnhook.cc.orig	Thu May  8 14:42:56 2003
++++ src/hooks/msnhook.cc	Thu May  8 14:47:52 2003
+@@ -30,6 +30,7 @@
  #include "eventmanager.h"
  #include "imlogger.h"
+ #include "connwrap.h"
 +#include "utf8conv.h"
  
  #include "msn_bittybits.h"
  
-@@ -225,7 +226,8 @@
+@@ -259,7 +260,8 @@
      }
  
      icqcontact *c = clist.get(ev.getcontact());
--    text = siconv(text, conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET, "utf8");
-+//    text = siconv(text, conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET, "utf8");
-+    text = StrToUtf8(text);
+-    text = siconv(text, conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET, "utf8");
++//    text = siconv(text, conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET, "utf8");
++	text = StrToUtf8(text);
  
      if(c)
      if(c->getstatus() != offline || !c->inlist()) {
-@@ -352,11 +354,11 @@
+@@ -389,11 +391,11 @@
  
  void msnhook::checkfriendly(icqcontact *c, const string friendlynick, bool forcefetch) {
      string oldnick = c->getnick();
@@ -32,17 +32,17 @@
  	c->setdispnick(newnick);
  	face.relaxedupdate();
      }
-@@ -556,7 +558,8 @@
+@@ -613,7 +615,8 @@
  
      mhook.checkinlist(ic);
  
--    string text = siconv(msg->body, "utf8", conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET);
-+//    string text = siconv(msg->body, "utf8", conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET);
-+    string text = Utf8ToStr(msg->body);
+-    string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET);
++//    string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET);
++	string text = Utf8ToStr(msg->body);
      em.store(immessage(ic, imevent::incoming, text));
  }
  
-@@ -717,3 +720,138 @@
+@@ -795,3 +798,137 @@
  	log(string("[OUT] ") + buf);
      }
  }
@@ -180,4 +180,3 @@
 +    };
 +}
 +#endif /* HAVE_ICONV_H */
-+
diff --git a/net-im/centericq/files/patch-po:Makefile.in.in b/net-im/centericq/files/patch-po:Makefile.in.in
deleted file mode 100644
index 54aa14e36f26..000000000000
--- a/net-im/centericq/files/patch-po:Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Tue Jul 16 20:00:45 2002
-+++ po/Makefile.in.in	Tue Jul 16 20:00:57 2002
-@@ -120,7 +120,7 @@
- 	  cat=`basename $$cat`; \
- 	  case "$$cat" in \
- 	    *.gmo) destdir=$(gnulocaledir);; \
--	    *)     destdir=$(localedir);; \
-+	    *)     destdir=$(gnulocaledir);; \
- 	  esac; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/net-im/centericq/files/patch-src:Makefile.in b/net-im/centericq/files/patch-src:Makefile.in
index ef9663819ec3..413071b5991d 100644
--- a/net-im/centericq/files/patch-src:Makefile.in
+++ b/net-im/centericq/files/patch-src:Makefile.in
@@ -1,7 +1,7 @@
---- src/Makefile.in.orig	Wed Dec 18 10:32:12 2002
-+++ src/Makefile.in	Wed Dec 18 10:32:49 2002
-@@ -96,3 +96,3 @@
- centericq_LDFLAGS = -L$(top_srcdir)/kkconsui-0.1 -L$(top_srcdir)/kkstrtext-0.1 -L$(top_srcdir)/kksystr-0.1 -L$(top_srcdir)/libicq2000-0.4.0 -L$(top_srcdir)/firetalk-0.1 -L$(top_srcdir)/libyahoo2-0.1 -L$(top_srcdir)/libjabber-0.1 -L$(top_srcdir)/connwrap-0.1 -L$(top_srcdir)/blip-0.1
--centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lkkconsui -lkkstrtext -lkksystr -llibicq2000 -lfiretalk -llibyahoo2 -llibjabber -lconnwrap -lblip  @INTLLIBS@
-+centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lkkconsui -lkkstrtext -lkksystr -llibicq2000 -lfiretalk -llibyahoo2 -llibjabber -lconnwrap -lblip  @INTLLIBS@ -lintl
+--- src/Makefile.in.orig	Thu May  8 14:58:44 2003
++++ src/Makefile.in	Thu May  8 14:58:57 2003
+@@ -98,3 +98,3 @@
+ centericq_LDFLAGS = -L$(top_srcdir)/blip-0.1 -L$(top_srcdir)/firetalk-0.1 -L$(top_srcdir)/kkconsui-0.1 -L$(top_srcdir)/kkstrtext-0.1 -L$(top_srcdir)/libicq2000-0.1 -L$(top_srcdir)/libjabber-0.1 -L$(top_srcdir)/libyahoo2-0.1 -L$(top_srcdir)/kksystr-0.1 -L$(top_srcdir)/connwrap-0.1
+-centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lblip -lfiretalk -lkkconsui -lkkstrtext -llibicq2000 -llibjabber -llibyahoo2 -lkksystr -lconnwrap @INTLLIBS@
++centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lblip -lfiretalk -lkkconsui -lkkstrtext -llibicq2000 -llibjabber -llibyahoo2 -lkksystr -lconnwrap @INTLLIBS@ -lintl
  SUBDIRS = hooks
diff --git a/net-im/centericq/pkg-plist b/net-im/centericq/pkg-plist
index 092a50bf08ad..cf2569453656 100644
--- a/net-im/centericq/pkg-plist
+++ b/net-im/centericq/pkg-plist
@@ -1,19 +1,19 @@
 bin/centericq
 bin/cicqconv
 bin/cicqsync
-share/centericq/email.wav
-share/centericq/msg.wav
-share/centericq/online.wav
-share/centericq/sms.wav
-share/centericq/url.wav
-share/centericq/contrib/spanish/ChangeLog
-share/centericq/contrib/spanish/COPYING
-share/centericq/contrib/spanish/INSTALL
-share/centericq/contrib/spanish/FAQ
-share/centericq/contrib/spanish/README
-@dirrm share/centericq/contrib/spanish
-@dirrm share/centericq/contrib
-@dirrm share/centericq
+%%DATADIR%%/email.wav
+%%DATADIR%%/msg.wav
+%%DATADIR%%/online.wav
+%%DATADIR%%/sms.wav
+%%DATADIR%%/url.wav
+%%DATADIR%%/contrib/spanish/ChangeLog
+%%DATADIR%%/contrib/spanish/COPYING
+%%DATADIR%%/contrib/spanish/INSTALL
+%%DATADIR%%/contrib/spanish/FAQ
+%%DATADIR%%/contrib/spanish/README
+@dirrm %%DATADIR%%/contrib/spanish
+@dirrm %%DATADIR%%/contrib
+@dirrm %%DATADIR%%
 share/locale/cs/LC_MESSAGES/centericq.mo
 share/locale/de/LC_MESSAGES/centericq.mo
 share/locale/es/LC_MESSAGES/centericq.mo
@@ -29,6 +29,6 @@ share/locale/ru/LC_MESSAGES/centericq.mo
 share/locale/sv/LC_MESSAGES/centericq.mo
 share/locale/uk/LC_MESSAGES/centericq.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/centericq.mo
-%%PORTDOCS%%share/doc/centericq/FAQ
-%%PORTDOCS%%share/doc/centericq/README
-%%PORTDOCS%%@dirrm share/doc/centericq
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index 6b64e10be76f..85c9ef63e5b0 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	centericq
-PORTVERSION=	4.9.2
+PORTVERSION=	4.9.3
 PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	http://konst.org.ua/download/
@@ -21,14 +21,13 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++"
 CONFIGURE_ARGS=	--with-openssl
 #CONFIGURE_ARGS=	--with-fribidi
 
-MAN1=	centericq.1
+MAN1=	centericq.1 cicqconv.1 cicqsync.1
 
 post-patch:
 .for file in kkconsui-0.1/include/conf.h kkstrtext-0.1/conf.h kksystr-0.1/include/conf.h
diff --git a/net/centericq/distinfo b/net/centericq/distinfo
index cf2a781bce1a..c1f92b8eecb2 100644
--- a/net/centericq/distinfo
+++ b/net/centericq/distinfo
@@ -1 +1 @@
-MD5 (centericq-4.9.2.tar.gz) = fb009228b3bc3cf29584601cc82e90df
+MD5 (centericq-4.9.3.tar.gz) = 5324a9610fa0430872ad1f851fa40283
diff --git a/net/centericq/files/patch-msnhook.cc b/net/centericq/files/patch-msnhook.cc
index 653618e18ef5..6ec55a2bacd4 100644
--- a/net/centericq/files/patch-msnhook.cc
+++ b/net/centericq/files/patch-msnhook.cc
@@ -1,24 +1,24 @@
---- src/hooks/msnhook.cc	Fri Dec 13 00:17:12 2002
-+++ src/hooks/msnhook.cc	Sun Jan  5 02:02:44 2003
-@@ -29,6 +29,7 @@
- #include "accountmanager.h"
+--- src/hooks/msnhook.cc.orig	Thu May  8 14:42:56 2003
++++ src/hooks/msnhook.cc	Thu May  8 14:47:52 2003
+@@ -30,6 +30,7 @@
  #include "eventmanager.h"
  #include "imlogger.h"
+ #include "connwrap.h"
 +#include "utf8conv.h"
  
  #include "msn_bittybits.h"
  
-@@ -225,7 +226,8 @@
+@@ -259,7 +260,8 @@
      }
  
      icqcontact *c = clist.get(ev.getcontact());
--    text = siconv(text, conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET, "utf8");
-+//    text = siconv(text, conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET, "utf8");
-+    text = StrToUtf8(text);
+-    text = siconv(text, conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET, "utf8");
++//    text = siconv(text, conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET, "utf8");
++	text = StrToUtf8(text);
  
      if(c)
      if(c->getstatus() != offline || !c->inlist()) {
-@@ -352,11 +354,11 @@
+@@ -389,11 +391,11 @@
  
  void msnhook::checkfriendly(icqcontact *c, const string friendlynick, bool forcefetch) {
      string oldnick = c->getnick();
@@ -32,17 +32,17 @@
  	c->setdispnick(newnick);
  	face.relaxedupdate();
      }
-@@ -556,7 +558,8 @@
+@@ -613,7 +615,8 @@
  
      mhook.checkinlist(ic);
  
--    string text = siconv(msg->body, "utf8", conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET);
-+//    string text = siconv(msg->body, "utf8", conf.getrussian() ? "koi8-u" : DEFAULT_CHARSET);
-+    string text = Utf8ToStr(msg->body);
+-    string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET);
++//    string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : DEFAULT_CHARSET);
++	string text = Utf8ToStr(msg->body);
      em.store(immessage(ic, imevent::incoming, text));
  }
  
-@@ -717,3 +720,138 @@
+@@ -795,3 +798,137 @@
  	log(string("[OUT] ") + buf);
      }
  }
@@ -180,4 +180,3 @@
 +    };
 +}
 +#endif /* HAVE_ICONV_H */
-+
diff --git a/net/centericq/files/patch-po:Makefile.in.in b/net/centericq/files/patch-po:Makefile.in.in
deleted file mode 100644
index 54aa14e36f26..000000000000
--- a/net/centericq/files/patch-po:Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Tue Jul 16 20:00:45 2002
-+++ po/Makefile.in.in	Tue Jul 16 20:00:57 2002
-@@ -120,7 +120,7 @@
- 	  cat=`basename $$cat`; \
- 	  case "$$cat" in \
- 	    *.gmo) destdir=$(gnulocaledir);; \
--	    *)     destdir=$(localedir);; \
-+	    *)     destdir=$(gnulocaledir);; \
- 	  esac; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/net/centericq/files/patch-src:Makefile.in b/net/centericq/files/patch-src:Makefile.in
index ef9663819ec3..413071b5991d 100644
--- a/net/centericq/files/patch-src:Makefile.in
+++ b/net/centericq/files/patch-src:Makefile.in
@@ -1,7 +1,7 @@
---- src/Makefile.in.orig	Wed Dec 18 10:32:12 2002
-+++ src/Makefile.in	Wed Dec 18 10:32:49 2002
-@@ -96,3 +96,3 @@
- centericq_LDFLAGS = -L$(top_srcdir)/kkconsui-0.1 -L$(top_srcdir)/kkstrtext-0.1 -L$(top_srcdir)/kksystr-0.1 -L$(top_srcdir)/libicq2000-0.4.0 -L$(top_srcdir)/firetalk-0.1 -L$(top_srcdir)/libyahoo2-0.1 -L$(top_srcdir)/libjabber-0.1 -L$(top_srcdir)/connwrap-0.1 -L$(top_srcdir)/blip-0.1
--centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lkkconsui -lkkstrtext -lkksystr -llibicq2000 -lfiretalk -llibyahoo2 -llibjabber -lconnwrap -lblip  @INTLLIBS@
-+centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lkkconsui -lkkstrtext -lkksystr -llibicq2000 -lfiretalk -llibyahoo2 -llibjabber -lconnwrap -lblip  @INTLLIBS@ -lintl
+--- src/Makefile.in.orig	Thu May  8 14:58:44 2003
++++ src/Makefile.in	Thu May  8 14:58:57 2003
+@@ -98,3 +98,3 @@
+ centericq_LDFLAGS = -L$(top_srcdir)/blip-0.1 -L$(top_srcdir)/firetalk-0.1 -L$(top_srcdir)/kkconsui-0.1 -L$(top_srcdir)/kkstrtext-0.1 -L$(top_srcdir)/libicq2000-0.1 -L$(top_srcdir)/libjabber-0.1 -L$(top_srcdir)/libyahoo2-0.1 -L$(top_srcdir)/kksystr-0.1 -L$(top_srcdir)/connwrap-0.1
+-centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lblip -lfiretalk -lkkconsui -lkkstrtext -llibicq2000 -llibjabber -llibyahoo2 -lkksystr -lconnwrap @INTLLIBS@
++centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lblip -lfiretalk -lkkconsui -lkkstrtext -llibicq2000 -llibjabber -llibyahoo2 -lkksystr -lconnwrap @INTLLIBS@ -lintl
  SUBDIRS = hooks
diff --git a/net/centericq/pkg-plist b/net/centericq/pkg-plist
index 092a50bf08ad..cf2569453656 100644
--- a/net/centericq/pkg-plist
+++ b/net/centericq/pkg-plist
@@ -1,19 +1,19 @@
 bin/centericq
 bin/cicqconv
 bin/cicqsync
-share/centericq/email.wav
-share/centericq/msg.wav
-share/centericq/online.wav
-share/centericq/sms.wav
-share/centericq/url.wav
-share/centericq/contrib/spanish/ChangeLog
-share/centericq/contrib/spanish/COPYING
-share/centericq/contrib/spanish/INSTALL
-share/centericq/contrib/spanish/FAQ
-share/centericq/contrib/spanish/README
-@dirrm share/centericq/contrib/spanish
-@dirrm share/centericq/contrib
-@dirrm share/centericq
+%%DATADIR%%/email.wav
+%%DATADIR%%/msg.wav
+%%DATADIR%%/online.wav
+%%DATADIR%%/sms.wav
+%%DATADIR%%/url.wav
+%%DATADIR%%/contrib/spanish/ChangeLog
+%%DATADIR%%/contrib/spanish/COPYING
+%%DATADIR%%/contrib/spanish/INSTALL
+%%DATADIR%%/contrib/spanish/FAQ
+%%DATADIR%%/contrib/spanish/README
+@dirrm %%DATADIR%%/contrib/spanish
+@dirrm %%DATADIR%%/contrib
+@dirrm %%DATADIR%%
 share/locale/cs/LC_MESSAGES/centericq.mo
 share/locale/de/LC_MESSAGES/centericq.mo
 share/locale/es/LC_MESSAGES/centericq.mo
@@ -29,6 +29,6 @@ share/locale/ru/LC_MESSAGES/centericq.mo
 share/locale/sv/LC_MESSAGES/centericq.mo
 share/locale/uk/LC_MESSAGES/centericq.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/centericq.mo
-%%PORTDOCS%%share/doc/centericq/FAQ
-%%PORTDOCS%%share/doc/centericq/README
-%%PORTDOCS%%@dirrm share/doc/centericq
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%