6 files changed, 239 insertions, 117 deletions

diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index d9f336c52f9a..80b8222d2c6e 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qt-gui
 PORTVERSION=	${QT_LICQ_VER}
-PORTREVISION=	1
 CATEGORIES=	net-im
 PKGNAMESUFFIX?=	${KDE_SUFFIX}${PKGNAMESUFFIX2}
 
@@ -24,9 +23,13 @@ USE_KDELIBS_VER=3
 CONFIGURE_ARGS+=--with-kde
 CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
 PLIST_SUB+=	GUI_NAME=kde
+PLIST_SUB+=	WITH_KDE=""
+PLIST_SUB+=	WITH_QT="@comment "
 .else
 USE_QT_VER=	3
 PLIST_SUB+=	GUI_NAME=qt
+PLIST_SUB+=	WITH_KDE="@comment "
+PLIST_SUB+=	WITH_QT=""
 .endif
 
 pre-fetch:
diff --git a/net-im/licq-qt-gui/pkg-plist b/net-im/licq-qt-gui/pkg-plist
index b259f14d6ead..8e5eaf390763 100644
--- a/net-im/licq-qt-gui/pkg-plist
+++ b/net-im/licq-qt-gui/pkg-plist
@@ -1,6 +1,7 @@
 lib/licq/licq_%%GUI_NAME%%-gui.la
 lib/licq/licq_%%GUI_NAME%%-gui.so
-share/applications/licq.desktop
+%%WITH_KDE%%share/applications/kde/licq.desktop
+%%WITH_QT%%share/applications/licq.desktop
 share/licq/qt-gui/dock.console/away.xpm
 share/licq/qt-gui/dock.console/bothmsg.xpm
 share/licq/qt-gui/dock.console/console.dock
@@ -83,96 +84,225 @@ 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/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.1/README
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley1.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley10.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley11.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley12.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley13.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley14.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley15.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley16.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley17.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley18.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley19.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley2.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley20.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley21.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley22.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley23.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley24.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley25.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley26.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley27.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley28.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley3.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley4.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley5.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley6.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley7.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley8.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley9.png
-share/licq/qt-gui/emoticons/Mirabelis5.1/emoticons.xml
-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/FeltTip4/LICENSE
+share/licq/qt-gui/emoticons/FeltTip4/README
+share/licq/qt-gui/emoticons/FeltTip4/alien.png
+share/licq/qt-gui/emoticons/FeltTip4/angel.png
+share/licq/qt-gui/emoticons/FeltTip4/angry-very.png
+share/licq/qt-gui/emoticons/FeltTip4/angry-very2.png
+share/licq/qt-gui/emoticons/FeltTip4/angry.png
+share/licq/qt-gui/emoticons/FeltTip4/annoyed.png
+share/licq/qt-gui/emoticons/FeltTip4/annoyed2.png
+share/licq/qt-gui/emoticons/FeltTip4/anxious.png
+share/licq/qt-gui/emoticons/FeltTip4/ashamed.png
+share/licq/qt-gui/emoticons/FeltTip4/batman.png
+share/licq/qt-gui/emoticons/FeltTip4/beautiful-female.png
+share/licq/qt-gui/emoticons/FeltTip4/beautiful-male.png
+share/licq/qt-gui/emoticons/FeltTip4/biting.png
+share/licq/qt-gui/emoticons/FeltTip4/blushing.png
+share/licq/qt-gui/emoticons/FeltTip4/bored.png
+share/licq/qt-gui/emoticons/FeltTip4/brokenheart.png
+share/licq/qt-gui/emoticons/FeltTip4/chatty.png
+share/licq/qt-gui/emoticons/FeltTip4/childish.png
+share/licq/qt-gui/emoticons/FeltTip4/childishmask.png
+share/licq/qt-gui/emoticons/FeltTip4/christmas.png
+share/licq/qt-gui/emoticons/FeltTip4/clean.png
+share/licq/qt-gui/emoticons/FeltTip4/cold.png
+share/licq/qt-gui/emoticons/FeltTip4/confused.png
+share/licq/qt-gui/emoticons/FeltTip4/cool-little.png
+share/licq/qt-gui/emoticons/FeltTip4/cool-very.png
+share/licq/qt-gui/emoticons/FeltTip4/cool.png
+share/licq/qt-gui/emoticons/FeltTip4/crazy.png
+share/licq/qt-gui/emoticons/FeltTip4/creative.png
+share/licq/qt-gui/emoticons/FeltTip4/cunning.png
+share/licq/qt-gui/emoticons/FeltTip4/dancing.png
+share/licq/qt-gui/emoticons/FeltTip4/dark.png
+share/licq/qt-gui/emoticons/FeltTip4/dead.png
+share/licq/qt-gui/emoticons/FeltTip4/depressed.png
+share/licq/qt-gui/emoticons/FeltTip4/devil.png
+share/licq/qt-gui/emoticons/FeltTip4/disguised.png
+share/licq/qt-gui/emoticons/FeltTip4/disgusted.png
+share/licq/qt-gui/emoticons/FeltTip4/dissapointed.png
+share/licq/qt-gui/emoticons/FeltTip4/dissapointed2.png
+share/licq/qt-gui/emoticons/FeltTip4/dreaming-mini.png
+share/licq/qt-gui/emoticons/FeltTip4/dreaming.png
+share/licq/qt-gui/emoticons/FeltTip4/easter.png
+share/licq/qt-gui/emoticons/FeltTip4/embarassed.png
+share/licq/qt-gui/emoticons/FeltTip4/emoticons.xml
+share/licq/qt-gui/emoticons/FeltTip4/entertaining.png
+share/licq/qt-gui/emoticons/FeltTip4/flirting.png
+share/licq/qt-gui/emoticons/FeltTip4/full.png
+share/licq/qt-gui/emoticons/FeltTip4/funny.png
+share/licq/qt-gui/emoticons/FeltTip4/furious.png
+share/licq/qt-gui/emoticons/FeltTip4/furry.png
+share/licq/qt-gui/emoticons/FeltTip4/geeky.png
+share/licq/qt-gui/emoticons/FeltTip4/givingup.png
+share/licq/qt-gui/emoticons/FeltTip4/greedy.png
+share/licq/qt-gui/emoticons/FeltTip4/halfdead.png
+share/licq/qt-gui/emoticons/FeltTip4/halloween.png
+share/licq/qt-gui/emoticons/FeltTip4/hangover.png
+share/licq/qt-gui/emoticons/FeltTip4/happy-little.png
+share/licq/qt-gui/emoticons/FeltTip4/happy-little2.png
+share/licq/qt-gui/emoticons/FeltTip4/happy-very.png
+share/licq/qt-gui/emoticons/FeltTip4/happy.png
+share/licq/qt-gui/emoticons/FeltTip4/happy2.png
+share/licq/qt-gui/emoticons/FeltTip4/headache.png
+share/licq/qt-gui/emoticons/FeltTip4/hot.png
+share/licq/qt-gui/emoticons/FeltTip4/hungry-little.png
+share/licq/qt-gui/emoticons/FeltTip4/hungry.png
+share/licq/qt-gui/emoticons/FeltTip4/ignored.png
+share/licq/qt-gui/emoticons/FeltTip4/ignoring.png
+share/licq/qt-gui/emoticons/FeltTip4/invisible.png
+share/licq/qt-gui/emoticons/FeltTip4/jumping.png
+share/licq/qt-gui/emoticons/FeltTip4/knockedout.png
+share/licq/qt-gui/emoticons/FeltTip4/laughing.png
+share/licq/qt-gui/emoticons/FeltTip4/laughing2.png
+share/licq/qt-gui/emoticons/FeltTip4/love-little.png
+share/licq/qt-gui/emoticons/FeltTip4/love-very.png
+share/licq/qt-gui/emoticons/FeltTip4/love.png
+share/licq/qt-gui/emoticons/FeltTip4/meditating.png
+share/licq/qt-gui/emoticons/FeltTip4/minus.png
+share/licq/qt-gui/emoticons/FeltTip4/naive.png
+share/licq/qt-gui/emoticons/FeltTip4/ninja.png
+share/licq/qt-gui/emoticons/FeltTip4/nostalgic-mini.png
+share/licq/qt-gui/emoticons/FeltTip4/nostalgic.png
+share/licq/qt-gui/emoticons/FeltTip4/notsure.png
+share/licq/qt-gui/emoticons/FeltTip4/party-mini.png
+share/licq/qt-gui/emoticons/FeltTip4/party.png
+share/licq/qt-gui/emoticons/FeltTip4/peaceful.png
+share/licq/qt-gui/emoticons/FeltTip4/plus.png
+share/licq/qt-gui/emoticons/FeltTip4/pouting.png
+share/licq/qt-gui/emoticons/FeltTip4/pouting2.png
+share/licq/qt-gui/emoticons/FeltTip4/praying.png
+share/licq/qt-gui/emoticons/FeltTip4/proud.png
+share/licq/qt-gui/emoticons/FeltTip4/raspberry-tounge.png
+share/licq/qt-gui/emoticons/FeltTip4/raspberry.png
+share/licq/qt-gui/emoticons/FeltTip4/reading.png
+share/licq/qt-gui/emoticons/FeltTip4/restless.png
+share/licq/qt-gui/emoticons/FeltTip4/robot.png
+share/licq/qt-gui/emoticons/FeltTip4/sad-little.png
+share/licq/qt-gui/emoticons/FeltTip4/sad-very.png
+share/licq/qt-gui/emoticons/FeltTip4/sad.png
+share/licq/qt-gui/emoticons/FeltTip4/satisfied.png
+share/licq/qt-gui/emoticons/FeltTip4/scared.png
+share/licq/qt-gui/emoticons/FeltTip4/secretive.png
+share/licq/qt-gui/emoticons/FeltTip4/sheepish.png
+share/licq/qt-gui/emoticons/FeltTip4/sick.png
+share/licq/qt-gui/emoticons/FeltTip4/singing.png
+share/licq/qt-gui/emoticons/FeltTip4/sleeping.png
+share/licq/qt-gui/emoticons/FeltTip4/smart.png
+share/licq/qt-gui/emoticons/FeltTip4/speechless.png
+share/licq/qt-gui/emoticons/FeltTip4/speechless2.png
+share/licq/qt-gui/emoticons/FeltTip4/star.png
+share/licq/qt-gui/emoticons/FeltTip4/student.png
+share/licq/qt-gui/emoticons/FeltTip4/surprised.png
+share/licq/qt-gui/emoticons/FeltTip4/sweating.png
+share/licq/qt-gui/emoticons/FeltTip4/tanned.png
+share/licq/qt-gui/emoticons/FeltTip4/teethy.png
+share/licq/qt-gui/emoticons/FeltTip4/thinking-artistic.png
+share/licq/qt-gui/emoticons/FeltTip4/thinking-ed.png
+share/licq/qt-gui/emoticons/FeltTip4/thinking-literary.png
+share/licq/qt-gui/emoticons/FeltTip4/thinking-logic.png
+share/licq/qt-gui/emoticons/FeltTip4/thinking-swears.png
+share/licq/qt-gui/emoticons/FeltTip4/thinking.png
+share/licq/qt-gui/emoticons/FeltTip4/vampire.png
+share/licq/qt-gui/emoticons/FeltTip4/weird.png
+share/licq/qt-gui/emoticons/FeltTip4/whiteflag.png
+share/licq/qt-gui/emoticons/FeltTip4/wince.png
+share/licq/qt-gui/emoticons/FeltTip4/wink-very.png
+share/licq/qt-gui/emoticons/FeltTip4/wink.png
+share/licq/qt-gui/emoticons/FeltTip4/wornout.png
+share/licq/qt-gui/emoticons/FeltTip4/yawn.png
+share/licq/qt-gui/emoticons/Mirabilis4/README
+share/licq/qt-gui/emoticons/Mirabilis4/emoticons.xml
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_ack.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_angry.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_bomb.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_confused.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_cool.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_crying.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_drink.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_evil.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_flower.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_holy.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_jokingly.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_kiss.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_kissed.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_kissing.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_listen.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_lol.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_love.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_mutely.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_ops.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_sad.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_shocked.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_smile.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_spit.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_stop.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_tiredly.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_tongue.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_unsure.png
+share/licq/qt-gui/emoticons/Mirabilis4/icq_s_wink.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/README
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley1.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley10.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley11.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley12.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley13.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley14.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley15.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley16.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley17.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley18.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley19.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley2.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley20.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley21.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley22.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley23.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley24.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley25.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley26.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley27.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley28.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley3.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley4.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley5.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley6.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley7.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley8.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/Smiley9.png
+share/licq/qt-gui/emoticons/Mirabilis5.1/emoticons.xml
+share/licq/qt-gui/emoticons/Mirabilis5/README
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley1.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley10.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley11.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley12.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley13.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley14.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley15.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley16.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley17.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley18.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley19.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley2.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley20.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley21.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley22.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley23.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley24.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley25.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley26.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley27.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley28.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley3.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley4.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley5.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley6.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley7.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley8.png
+share/licq/qt-gui/emoticons/Mirabilis5/Smiley9.png
+share/licq/qt-gui/emoticons/Mirabilis5/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
@@ -303,7 +433,6 @@ share/licq/qt-gui/emoticons/phpBB/sunglasses.png
 share/licq/qt-gui/emoticons/phpBB/tongue.png
 share/licq/qt-gui/emoticons/phpBB/unhappy.png
 share/licq/qt-gui/emoticons/phpBB/wink.png
-share/licq/qt-gui/emoticons/theme.xsd
 share/licq/qt-gui/emoticons/thomas/README.txt
 share/licq/qt-gui/emoticons/thomas/biggrin.png
 share/licq/qt-gui/emoticons/thomas/confused.png
@@ -627,9 +756,10 @@ share/licq/qt-gui/locale/uk.qm
 @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.1
-@dirrm share/licq/qt-gui/emoticons/Mirabelis5
-@dirrm share/licq/qt-gui/emoticons/Mirabelis4
+@dirrm share/licq/qt-gui/emoticons/Mirabilis5.1
+@dirrm share/licq/qt-gui/emoticons/Mirabilis5
+@dirrm share/licq/qt-gui/emoticons/Mirabilis4
+@dirrm share/licq/qt-gui/emoticons/FeltTip4
 @dirrm share/licq/qt-gui/emoticons/Default
 @dirrm share/licq/qt-gui/emoticons
 @dirrm share/licq/qt-gui/dock.pli
@@ -639,4 +769,5 @@ share/licq/qt-gui/locale/uk.qm
 @dirrm share/licq/qt-gui/dock.flower
 @dirrm share/licq/qt-gui/dock.console
 @dirrm share/licq/qt-gui
-@dirrm share/applications
+%%WITH_KDE%%@dirrm share/applications/kde
+@dirrmtry share/applications
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 6a70068946f0..2b0221644913 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	base
 PORTVERSION=	${LICQ_VER}
-PORTREVISION=	2
 CATEGORIES=	net-im
 PKGNAMESUFFIX=	${SOCKS_SUFFIX}${PKGNAMESUFFIX2}
 
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index 63f2f1ff6981..26b3ad54ad42 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=		licq-
-LICQ_VER=		1.3.4
-QT_LICQ_VER=		1.3.4
-OSD_LICQ_VER=		1.3.4
-RMS_LICQ_VER=		0.33
-CONSOLE_LICQ_VER=	1.3.4
-JONS_GTK_LICQ_VER=	0.20.2
+LICQ_VER=		1.3.5
+QT_LICQ_VER=		1.3.5
+OSD_LICQ_VER=		1.3.2.1
+RMS_LICQ_VER=		1.3.2
+CONSOLE_LICQ_VER=	1.3.5
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${PORTSDIR}/${LICQ_PORT}
 .endif
diff --git a/net-im/licq/distinfo b/net-im/licq/distinfo
index f8eec4d6c823..948e3714d22e 100644
--- a/net-im/licq/distinfo
+++ b/net-im/licq/distinfo
@@ -1,3 +1,3 @@
-MD5 (licq-1.3.4.tar.bz2) = 3bab0c9d1977f9b14421d36110e17e0c
-SHA256 (licq-1.3.4.tar.bz2) = eed39b1fa78d6c03655babc6cb03155ed71391ec1422752d0611bd2583c2f608
-SIZE (licq-1.3.4.tar.bz2) = 3088438
+MD5 (licq-1.3.5.tar.bz2) = 842a73c82980721961fe824f40377292
+SHA256 (licq-1.3.5.tar.bz2) = ca6692026e87459082b33ebb6480cc5c600001c93e1d9e2bbde65f3cf2238d3e
+SIZE (licq-1.3.5.tar.bz2) = 3260471
diff --git a/net-im/licq/files/patch-licq_message.h b/net-im/licq/files/patch-licq_message.h
deleted file mode 100644
index bbe630e28424..000000000000
--- a/net-im/licq/files/patch-licq_message.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/licq_message.h.orig	Sun Oct 15 14:10:53 2006
-+++ include/licq_message.h	Sun Nov  5 09:27:35 2006
-@@ -3,6 +3,7 @@
- 
- #include <list>
- #include <time.h>
-+#include <stdio.h>
- 
- #include "licq_buffer.h"
- #include "licq_constants.h"