upgrade to 4.9.7

4 files changed, 55 insertions, 28 deletions

diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 9499218d91f0..220f53ec494f 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -7,25 +7,57 @@
 #
 
 PORTNAME=	centericq
-PORTVERSION=	4.9.6
+PORTVERSION=	4.9.7
 PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	http://konst.org.ua/download/
 
 MAINTAINER=	ijliao@FreeBSD.org
-COMMENT=	A ncurses based interface for ICQ, Yahoo!, AIM, MSN and IRC
+COMMENT=	A text mode menu- and window-driven IM interface
 
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
-		iconv.3:${PORTSDIR}/converters/libiconv \
-#		fribidi.0:${PORTSDIR}/converters/fribidi
+		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		CXXFLAGS="-I${LOCALBASE}/include"
 LDFLAGS+=	-L${LOCALBASE}/lib -lstdc++
 CONFIGURE_ARGS=	--with-openssl --disable-konst
-#CONFIGURE_ARGS=	--with-fribidi
+
+.if defined(WITH_FRIBIDI)
+LIB_DEPENDS+=	fribidi.0:${PORTSDIR}/converters/fribidi
+CONFIGURE_ARGS+=	--with-fribidi
+.endif
+
+.if !defined(WITH_MSN)
+CONFIGURE_ARGS+=	--disable-msn
+.endif
+
+.if !defined(WITH_YAHOO)
+CONFIGURE_ARGS+=	--disable-yahoo
+.endif
+
+.if !defined(WITH_AIM)
+CONFIGURE_ARGS+=	--disable-aim
+.endif
+
+.if !defined(WITH_IRC)
+CONFIGURE_ARGS+=	--disable-irc
+.endif
+
+.if !defined(WITH_JABBER)
+CONFIGURE_ARGS+=	--disable-jabber
+.endif
+
+.if !defined(WITH_RSS)
+CONFIGURE_ARGS+=	--disable-rss
+.endif
+
+.if !defined(WITH_LJ)
+CONFIGURE_ARGS+=	--disable-lj
+.endif
 
 MAN1=	centericq.1 cicqconv.1 cicqsync.1
 
diff --git a/net-im/centericq/distinfo b/net-im/centericq/distinfo
index 735c775b85a8..0bdd0aebb983 100644
--- a/net-im/centericq/distinfo
+++ b/net-im/centericq/distinfo
@@ -1 +1 @@
-MD5 (centericq-4.9.6.tar.gz) = d7708b3de102992ac6757d1e9a699c77
+MD5 (centericq-4.9.7.tar.gz) = 09c1672c0c2e5ef7e8a94052a71c58cc
diff --git a/net-im/centericq/files/patch-msnhook.cc b/net-im/centericq/files/patch-msnhook.cc
index 6ec55a2bacd4..a99dce40718e 100644
--- a/net-im/centericq/files/patch-msnhook.cc
+++ b/net-im/centericq/files/patch-msnhook.cc
@@ -1,24 +1,16 @@
---- 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"
- 
-@@ -259,7 +260,8 @@
+--- src/hooks/msnhook.cc.orig	Mon Oct  6 01:01:52 2003
++++ src/hooks/msnhook.cc	Mon Oct  6 01:05:37 2003
+@@ -248,7 +248,8 @@
      }
  
      icqcontact *c = clist.get(ev.getcontact());
--    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);
+-    text = siconv(text, conf.getrussian(msn) ? "koi8-u" : conf.getdefcharset(), "utf8");
++//    text = siconv(text, conf.getrussian(msn) ? "koi8-u" : conf.getdefcharset(), "utf8");
++    text = StrToUtf8(text);
  
      if(c)
      if(c->getstatus() != offline || !c->inlist()) {
-@@ -389,11 +391,11 @@
+@@ -378,11 +379,11 @@
  
  void msnhook::checkfriendly(icqcontact *c, const string friendlynick, bool forcefetch) {
      string oldnick = c->getnick();
@@ -28,21 +20,21 @@
      c->setnick(newnick);
  
 -    if(forcefetch || (oldnick != newnick && c->getdispnick() == oldnick) || oldnick.empty()) {
-+    if(forcefetch || (oldnick != newnick && c->getdispnick() != newnick) || oldnick.empty()) {
++    if(forcefetch || (oldnick != newnick && c->getdispnick() != oldnick) || oldnick.empty()) {
  	c->setdispnick(newnick);
  	face.relaxedupdate();
      }
-@@ -613,7 +615,8 @@
+@@ -602,7 +603,8 @@
  
      mhook.checkinlist(ic);
  
--    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);
+-    string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : conf.getdefcharset());
++//    string text = siconv(msg->body, "utf8", conf.getrussian(msn) ? "koi8-u" : conf.getdefcharset());
++    string text = Utf8ToStr(msg->body);
      em.store(immessage(ic, imevent::incoming, text));
  }
  
-@@ -795,3 +798,137 @@
+@@ -779,5 +781,139 @@
  	log(string("[OUT] ") + buf);
      }
  }
@@ -180,3 +172,5 @@
 +    };
 +}
 +#endif /* HAVE_ICONV_H */
+ 
+ #endif
diff --git a/net-im/centericq/pkg-plist b/net-im/centericq/pkg-plist
index cf2569453656..a3e891710483 100644
--- a/net-im/centericq/pkg-plist
+++ b/net-im/centericq/pkg-plist
@@ -14,6 +14,7 @@ bin/cicqsync
 @dirrm %%DATADIR%%/contrib/spanish
 @dirrm %%DATADIR%%/contrib
 @dirrm %%DATADIR%%
+share/locale/bg/LC_MESSAGES/centericq.mo
 share/locale/cs/LC_MESSAGES/centericq.mo
 share/locale/de/LC_MESSAGES/centericq.mo
 share/locale/es/LC_MESSAGES/centericq.mo