- update to 1.3.2

- Translate-fix
Submitted by: NetJunior

6 files changed, 188 insertions, 11 deletions

diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile
index 77e032a7dc36..996f84053e57 100644
--- a/net-im/licq-osd/Makefile
+++ b/net-im/licq-osd/Makefile
@@ -23,10 +23,9 @@ USE_AUTOTOOLS=	libtool:15
 
 LICQ_PORT?=	net-im/licq
 
-LOCALES=	de cs es fr pt pt_BR ro ru se
+LOCALES=	de cs es fr pt pt_BR ro ru sv sk
 PLIST_FILES=	lib/licq/licq_osd.so \
 		${LOCALES:C+^.*$+share/locale/&/LC_MESSAGES/licq_osd_plugin.mo+}
-PLIST_DIRS=	share/locale/se/LC_MESSAGES share/locale/se
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
diff --git a/net-im/licq-qt-gui/pkg-plist b/net-im/licq-qt-gui/pkg-plist
index 9b575e721945..830fd5616f52 100644
--- a/net-im/licq-qt-gui/pkg-plist
+++ b/net-im/licq-qt-gui/pkg-plist
@@ -82,7 +82,116 @@ share/licq/qt-gui/emoticons/Default/sunglasses.png
 share/licq/qt-gui/emoticons/Default/tongue.png
 share/licq/qt-gui/emoticons/Default/unhappy.png
 share/licq/qt-gui/emoticons/Default/wink.png
+share/licq/qt-gui/emoticons/Mirabelis3/README
+share/licq/qt-gui/emoticons/Mirabelis3/emoticons.xml
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_annoyed.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_disgusted.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_drooling.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_giggling.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_inlove.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_jokingly.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_shocked.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_surprised1.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_surprised2.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_e_whining.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_angel.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_angry.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_bandaid.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_crying.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_embarrassed.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_glasses.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_happy.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_kiss.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_nofingidea.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_sad.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_sealed.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_surprised.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_teeth.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_tongue.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_unsure.png
+share/licq/qt-gui/emoticons/Mirabelis3/icq_s_wink.png
+share/licq/qt-gui/emoticons/Mirabelis4/README
+share/licq/qt-gui/emoticons/Mirabelis4/emoticons.xml
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_ack.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_angry.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_bomb.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_confused.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_cool.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_crying.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_drink.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_evil.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_flower.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_holy.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_jokingly.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_kiss.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_kissed.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_kissing.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_listen.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_lol.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_love.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_mutely.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_ops.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_sad.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_shocked.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_smile.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_spit.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_stop.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_tiredly.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_tongue.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_unsure.png
+share/licq/qt-gui/emoticons/Mirabelis4/icq_s_wink.png
+share/licq/qt-gui/emoticons/Mirabelis5/README
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley1.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley10.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley11.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley12.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley13.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley14.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley15.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley16.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley17.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley18.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley19.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley2.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley20.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley21.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley22.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley23.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley24.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley25.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley26.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley27.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley28.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley3.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley4.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley5.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley6.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley7.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley8.png
+share/licq/qt-gui/emoticons/Mirabelis5/Smiley9.png
+share/licq/qt-gui/emoticons/Mirabelis5/emoticons.xml
 share/licq/qt-gui/emoticons/None/emoticons.xml
+share/licq/qt-gui/emoticons/bugeyes/README
+share/licq/qt-gui/emoticons/bugeyes/bug_angel.png
+share/licq/qt-gui/emoticons/bugeyes/bug_angry.png
+share/licq/qt-gui/emoticons/bugeyes/bug_blush.png
+share/licq/qt-gui/emoticons/bugeyes/bug_cool.png
+share/licq/qt-gui/emoticons/bugeyes/bug_crossedlips.png
+share/licq/qt-gui/emoticons/bugeyes/bug_cry.png
+share/licq/qt-gui/emoticons/bugeyes/bug_foot.png
+share/licq/qt-gui/emoticons/bugeyes/bug_frown.png
+share/licq/qt-gui/emoticons/bugeyes/bug_green.png
+share/licq/qt-gui/emoticons/bugeyes/bug_kiss.png
+share/licq/qt-gui/emoticons/bugeyes/bug_laugh.png
+share/licq/qt-gui/emoticons/bugeyes/bug_moneymouth.png
+share/licq/qt-gui/emoticons/bugeyes/bug_oooh.png
+share/licq/qt-gui/emoticons/bugeyes/bug_smile.png
+share/licq/qt-gui/emoticons/bugeyes/bug_stare.png
+share/licq/qt-gui/emoticons/bugeyes/bug_thinking.png
+share/licq/qt-gui/emoticons/bugeyes/bug_tongue.png
+share/licq/qt-gui/emoticons/bugeyes/bug_wink.png
+share/licq/qt-gui/emoticons/bugeyes/bug_yell.png
+share/licq/qt-gui/emoticons/bugeyes/emoticons.xml
 share/licq/qt-gui/emoticons/ccmathteam.com/README
 share/licq/qt-gui/emoticons/ccmathteam.com/biggrin.png
 share/licq/qt-gui/emoticons/ccmathteam.com/confused.png
@@ -219,11 +328,14 @@ share/licq/qt-gui/extended.icons.basic/pixPhone.xpm
 share/licq/qt-gui/extended.icons.basic/pixPhoneFollowMeActive.xpm
 share/licq/qt-gui/extended.icons.basic/pixPhoneFollowMeBusy.xpm
 share/licq/qt-gui/extended.icons.basic/pixSharedFiles.xpm
+share/licq/qt-gui/extended.icons.basic/pixTyping.xpm
 share/licq/qt-gui/extended.icons.thomas/itemCollapsed.xpm
 share/licq/qt-gui/extended.icons.thomas/itemExpanded.xpm
 share/licq/qt-gui/extended.icons.thomas/pixBirthday.xpm
 share/licq/qt-gui/extended.icons.thomas/pixCellular.xpm
 share/licq/qt-gui/extended.icons.thomas/pixCustomAR.xpm
+share/licq/qt-gui/extended.icons.thomas/pixGPGKeyDisabled.xpm
+share/licq/qt-gui/extended.icons.thomas/pixGPGKeyEnabled.xpm
 share/licq/qt-gui/extended.icons.thomas/pixICQphoneActive.xpm
 share/licq/qt-gui/extended.icons.thomas/pixICQphoneBusy.xpm
 share/licq/qt-gui/extended.icons.thomas/pixInvisible.xpm
@@ -329,6 +441,7 @@ share/licq/qt-gui/icons.thomas/contact.xpm
 share/licq/qt-gui/icons.thomas/dnd.xpm
 share/licq/qt-gui/icons.thomas/ffc.xpm
 share/licq/qt-gui/icons.thomas/file.xpm
+share/licq/qt-gui/icons.thomas/gpgkey.xpm
 share/licq/qt-gui/icons.thomas/history.xpm
 share/licq/qt-gui/icons.thomas/icons.thomas.tar.bz2
 share/licq/qt-gui/icons.thomas/info.xpm
@@ -403,6 +516,7 @@ share/licq/qt-gui/skin.thomas/btnDown.png
 share/licq/qt-gui/skin.thomas/btnHighlight.png
 share/licq/qt-gui/skin.thomas/btnUp.png
 share/licq/qt-gui/skin.thomas/thomas.skin
+share/licq/qt-gui/locale/be.qm
 share/licq/qt-gui/locale/bg_BG.qm
 share/licq/qt-gui/locale/cs_CZ.qm
 share/licq/qt-gui/locale/de.qm
@@ -447,6 +561,10 @@ share/licq/qt-gui/locale/uk.qm
 @dirrm share/licq/qt-gui/emoticons/phpBB
 @dirrm share/licq/qt-gui/emoticons/msn
 @dirrm share/licq/qt-gui/emoticons/ccmathteam.com
+@dirrm share/licq/qt-gui/emoticons/bugeyes
+@dirrm share/licq/qt-gui/emoticons/Mirabelis5
+@dirrm share/licq/qt-gui/emoticons/Mirabelis4
+@dirrm share/licq/qt-gui/emoticons/Mirabelis3
 @dirrm share/licq/qt-gui/emoticons/None
 @dirrm share/licq/qt-gui/emoticons/Default
 @dirrm share/licq/qt-gui/emoticons
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index e694a4d847be..37baf5bc696e 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -19,13 +19,17 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 .endif
 
 USE_REINPLACE=	yes
+USE_ICONV=	yes
+#USE_GCC=	3.3+
 WRKSRC=		${WRKDIR}/${DISTNAME}
 LICQ_PORT?=	net-im/licq
 
 # workaround for installed autoconf/automake
 CONFIGURE_ARGS+=--program-transform-name=s,y,y,
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-LDFLAGS+=	${PTHREAD_LIBS}
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
+CPPFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
 
 .if defined(WITH_SOCKS)
 SOCKS_SUFFIX=	-socks
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index 944a7756c91d..7a68751d47c7 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=		licq-
-LICQ_VER=		1.3.0
-QT_LICQ_VER=		1.3.0
-OSD_LICQ_VER=		1.3.0
+LICQ_VER=		1.3.2
+QT_LICQ_VER=		1.3.2
+OSD_LICQ_VER=		1.3.2
 RMS_LICQ_VER=		0.33
-CONSOLE_LICQ_VER=	1.3.0
+CONSOLE_LICQ_VER=	1.3.2
 JONS_GTK_LICQ_VER=	0.20.2
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${PORTSDIR}/${LICQ_PORT}
diff --git a/net-im/licq/distinfo b/net-im/licq/distinfo
index 2a8097c69ad0..e21e8e9f2e3d 100644
--- a/net-im/licq/distinfo
+++ b/net-im/licq/distinfo
@@ -1,3 +1,3 @@
-MD5 (licq-1.3.0.tar.bz2) = c1b05d1078b9826273191c05d0d1a969
-SHA256 (licq-1.3.0.tar.bz2) = f7d6574f5ee6fea5234da269ab09756c26f05d725580f72e482d53d40e1bd47c
-SIZE (licq-1.3.0.tar.bz2) = 4284325
+MD5 (licq-1.3.2.tar.bz2) = 0471bb8fed91eefb23dfe153c9a4a806
+SHA256 (licq-1.3.2.tar.bz2) = 3c6ec77d42973c93a9d1926a3aa444ff0388263f38a19c9b51e1337cde60f8bc
+SIZE (licq-1.3.2.tar.bz2) = 3980117
diff --git a/net-im/licq/files/patch-translate.cpp b/net-im/licq/files/patch-translate.cpp
new file mode 100644
index 000000000000..836fce3920b5
--- /dev/null
+++ b/net-im/licq/files/patch-translate.cpp
@@ -0,0 +1,56 @@
+--- src/translate.cpp.orig	Thu Oct 13 17:09:23 2005
++++ src/translate.cpp	Sun Dec 11 16:46:24 2005
+@@ -223,7 +223,8 @@
+   char *szNewStr = new char[nLen + 1];
+   size_t nInSize, nOutSize;
+ 
+-  char *szIn = _sz, *szOut = szNewStr;
++  const char *szIn = _sz;
++  char *szOut = szNewStr;
+   iconv_t tr;
+ 
+   nInSize = nLen;
+@@ -268,7 +269,8 @@
+   char *szNewStr = new char[nLen + 1];
+   size_t nInSize, nOutSize;
+ 
+-  char *szIn = _sz, *szOut = szNewStr;
++  const char *szIn = _sz;
++  char *szOut = szNewStr;
+   iconv_t tr;
+ 
+   nInSize = nLen;
+@@ -312,7 +314,8 @@
+   char *szNewStr = new char[nLen * 2];
+   size_t nInSize, nOutSize;
+   
+-  char *szIn = _sz, *szOut = szNewStr;
++  const char *szIn = _sz;
++  char *szOut = szNewStr;
+   iconv_t tr;
+   
+   nInSize = nLen;
+@@ -339,11 +342,21 @@
+   unsigned short nLen = strlen(_sz) * 3;
+   char *szNewStr = new char[nLen + 1];
+   size_t nInSize, nOutSize;
+-  char *szOut = szNewStr, *szIn = _sz;
++  const char *szIn = _sz;
++  char *szOut = szNewStr;
+   iconv_t tr;
+   
+   nInSize = strlen(szIn);
+   nOutSize = nLen;
++  //--- deleting ' ' from _szEncoding ---
++  char *_szEnc_tmp = _szEncoding, *_szEnc_tmp2 = _szEncoding;
++  int _szflag = 0;
++  while (*_szEnc_tmp)
++  {
++    if (*_szEnc_tmp == ' ') {*_szEnc_tmp++; _szflag++;}
++    *_szEnc_tmp2++ = *_szEnc_tmp++;
++  }
++  while(_szflag--) --(*_szEnc_tmp2) = '\0';
+   
+   tr = iconv_open("UCS-2BE", _szEncoding);
+   size_t ret = iconv(tr, &szIn, &nInSize, &szOut, &nOutSize);
+