6 files changed, 106 insertions, 51 deletions

diff --git a/net/kicq/Makefile b/net/kicq/Makefile
index f551c6071273..11fd4f1b6c23 100644
--- a/net/kicq/Makefile
+++ b/net/kicq/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	kicq
-PORTVERSION=	0.3.0
+PORTVERSION=	1.0.0
 CATEGORIES=	net kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	paxvel@iname.com
+MAINTAINER=	lioux@uol.com.br
 
 LIB_DEPENDS=	icq.1:${PORTSDIR}/net/icqlib \
-		kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11 \
-		kfm.3:${PORTSDIR}/x11/kdelibs11
+		kdecore.3:${PORTSDIR}/x11/kdelibs11
 
 USE_QT=		yes
-
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/kicq/distinfo b/net/kicq/distinfo
index 97f5c72462eb..c2a242b0447d 100644
--- a/net/kicq/distinfo
+++ b/net/kicq/distinfo
@@ -1 +1 @@
-MD5 (kicq-0.3.0.tar.gz) = a0ad2fc71b06368da952d482de6d894d
+MD5 (kicq-1.0.0.tar.gz) = c96d8f3b178863e2cc0049359be25273
diff --git a/net/kicq/files/patch-aa b/net/kicq/files/patch-aa
index 794b47e1dbec..4509e9d0750a 100644
--- a/net/kicq/files/patch-aa
+++ b/net/kicq/files/patch-aa
@@ -1,27 +1,15 @@
---- configure.orig	Fri Dec  4 06:25:30 1998
-+++ configure	Tue Feb 15 01:32:08 2000
-@@ -2373,7 +2373,7 @@
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin$ac_dummy; do
-+  for ac_dir in $PATH; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_MOC="$ac_dir/$ac_word"
-@@ -2709,6 +2709,7 @@
-   echo "$ac_t""no" 1>&6
- fi
-  
-+if false; then
- echo $ac_n "checking for giflib""... $ac_c" 1>&6
- echo "configure:2714: checking for giflib" >&5
- if eval "test \"`echo '$''{'ac_cv_lib_gif'+set}'`\" = set"; then
-@@ -2755,6 +2756,7 @@
- 
- else
-   { echo "configure: error: You need giflib23. Please install the kdesupport package" 1>&2; exit 1; }
-+fi
- fi
-  echo $ac_n "checking for jpeglib""... $ac_c" 1>&6
- echo "configure:2761: checking for jpeglib" >&5
+This is to avoid a very weird compiler bug
+on -stable. Certain combinations of -O#
+and -march were making kicq core dump.
+
+--- configure.orig	Mon Aug 14 23:25:24 2000
++++ configure	Mon Aug 14 23:26:28 2000
+@@ -6406,7 +6406,7 @@
+ s%@SHELL@%$SHELL%g
+ s%@CFLAGS@%$CFLAGS%g
+ s%@CPPFLAGS@%$CPPFLAGS%g
+-s%@CXXFLAGS@%$CXXFLAGS%g
++s%@CXXFLAGS@%%g
+ s%@FFLAGS@%$FFLAGS%g
+ s%@DEFS@%$DEFS%g
+ s%@LDFLAGS@%$LDFLAGS%g
diff --git a/net/kicq/files/patch-ab b/net/kicq/files/patch-ab
new file mode 100644
index 000000000000..2d5cfad020b3
--- /dev/null
+++ b/net/kicq/files/patch-ab
@@ -0,0 +1,14 @@
+--- kicq/extra/kicq-upgrade.orig	Sun Jul 30 15:56:14 2000
++++ kicq/extra/kicq-upgrade	Tue Aug 15 12:54:27 2000
+@@ -1,9 +1,9 @@
+-#!/bin/bash
++#!/bin/sh
+ # $Id: kicq-upgrade,v 1.1 2000/07/30 18:56:36 denis Exp $
+ # This script will upgrade 0.3.0-like configuration and contact list
+ # to the new 1.0.0 version
+ 
+-AWK=/bin/awk
++AWK=/usr/bin/awk
+ MV=/bin/mv
+ RM=/bin/rm
+ MKDIR=/bin/mkdir
diff --git a/net/kicq/pkg-descr b/net/kicq/pkg-descr
index e8f5f2f64a94..8a4be5760102 100644
--- a/net/kicq/pkg-descr
+++ b/net/kicq/pkg-descr
@@ -3,6 +3,6 @@ kicq is an KDE/Qt based ICQ clone which very closely resembles Mirabilis ICQ.
 It supports sending/receiving messages and URLs, user search by nick/email/uin,
 message history and KOI8-R<>CP1251 conversion for russian users.
 
-WWW: http://www.cn.ua/~denis/kde/kicq.html
+WWW: http://kicq.sourceforge.net/
 
 -- Pavel Andreev <paxvel@iname.com>
diff --git a/net/kicq/pkg-plist b/net/kicq/pkg-plist
index c4ba4c2f0c40..229e90b81c4b 100644
--- a/net/kicq/pkg-plist
+++ b/net/kicq/pkg-plist
@@ -1,4 +1,11 @@
 bin/kicq
+bin/kicq-upgrade
+share/applnk/Internet/kicq.kdelnk
+share/apps/kicq/pics/add.xpm
+share/apps/kicq/pics/alert.xpm
+share/apps/kicq/pics/all.xpm
+share/apps/kicq/pics/auth.xpm
+share/apps/kicq/pics/authlast.xpm
 share/apps/kicq/pics/away.xpm
 share/apps/kicq/pics/chat.xpm
 share/apps/kicq/pics/connect.xpm
@@ -10,43 +17,91 @@ share/apps/kicq/pics/connect5.xpm
 share/apps/kicq/pics/connect6.xpm
 share/apps/kicq/pics/connect7.xpm
 share/apps/kicq/pics/connect8.xpm
+share/apps/kicq/pics/delete.xpm
 share/apps/kicq/pics/dnd.xpm
+share/apps/kicq/pics/exclam.xpm
+share/apps/kicq/pics/exclamlast.xpm
 share/apps/kicq/pics/file.xpm
+share/apps/kicq/pics/freechat.xpm
 share/apps/kicq/pics/gray.xpm
+share/apps/kicq/pics/history.xpm
+share/apps/kicq/pics/icq1.xpm
+share/apps/kicq/pics/icq10.xpm
+share/apps/kicq/pics/icq11.xpm
+share/apps/kicq/pics/icq12.xpm
+share/apps/kicq/pics/icq13.xpm
+share/apps/kicq/pics/icq14.xpm
+share/apps/kicq/pics/icq15.xpm
+share/apps/kicq/pics/icq16.xpm
+share/apps/kicq/pics/icq17.xpm
+share/apps/kicq/pics/icq2.xpm
+share/apps/kicq/pics/icq3.xpm
+share/apps/kicq/pics/icq4.xpm
+share/apps/kicq/pics/icq5.xpm
+share/apps/kicq/pics/icq6.xpm
+share/apps/kicq/pics/icq7.xpm
+share/apps/kicq/pics/icq8.xpm
+share/apps/kicq/pics/icq9.xpm
 share/apps/kicq/pics/info.xpm
+share/apps/kicq/pics/klipper.xpm
 share/apps/kicq/pics/message.xpm
 share/apps/kicq/pics/msglast.xpm
 share/apps/kicq/pics/na.xpm
+share/apps/kicq/pics/notall.xpm
+share/apps/kicq/pics/null.xpm
 share/apps/kicq/pics/occupied.xpm
 share/apps/kicq/pics/offline.xpm
 share/apps/kicq/pics/online.xpm
 share/apps/kicq/pics/privacy.xpm
 share/apps/kicq/pics/receive.xpm
+share/apps/kicq/pics/reg.xpm
+share/apps/kicq/pics/rename.xpm
+share/apps/kicq/pics/search.gif
 share/apps/kicq/pics/search.xpm
 share/apps/kicq/pics/sendicq.xpm
 share/apps/kicq/pics/setup.xpm
 share/apps/kicq/pics/shutdown.xpm
-share/apps/kicq/pics/url.xpm
-share/apps/kicq/pics/urllast.xpm
-share/apps/kicq/pics/wwpager.xpm
-share/apps/kicq/pics/search.gif
 share/apps/kicq/pics/uaway.xpm
-share/apps/kicq/pics/uprivacy.xpm
 share/apps/kicq/pics/udnd.xpm
+share/apps/kicq/pics/ufreechat.xpm
 share/apps/kicq/pics/una.xpm
 share/apps/kicq/pics/uoccupied.xpm
-share/apps/kicq/pics/add.xpm
-share/apps/kicq/pics/delete.xpm
-share/apps/kicq/pics/freechat.xpm
-share/apps/kicq/pics/ufreechat.xpm
-share/apps/kicq/pics/null.xpm
-share/apps/kicq/pics/alert.xpm
-share/apps/kicq/pics/auth.xpm
-share/apps/kicq/pics/authlast.xpm
-share/apps/kicq/pics/history.xpm
-share/apps/kicq/pics/rename.xpm
-share/applnk/Internet/kicq.kdelnk
+share/apps/kicq/pics/uprivacy.xpm
+share/apps/kicq/pics/url.xpm
+share/apps/kicq/pics/urllast.xpm
+share/apps/kicq/pics/wwpager.xpm
+share/apps/kicq/sounds/Auth.wav
+share/apps/kicq/sounds/Chat.wav
+share/apps/kicq/sounds/ChatAction.wav
+share/apps/kicq/sounds/ChatBeep.wav
+share/apps/kicq/sounds/ChatEmote.wav
+share/apps/kicq/sounds/Contact.wav
+share/apps/kicq/sounds/EMail.wav
+share/apps/kicq/sounds/External.wav
+share/apps/kicq/sounds/File.wav
+share/apps/kicq/sounds/FileDone.wav
+share/apps/kicq/sounds/Global.wav
+share/apps/kicq/sounds/Homepage.wav
+share/apps/kicq/sounds/Message.wav
+share/apps/kicq/sounds/MsgBack.wav
+share/apps/kicq/sounds/MsgBell.wav
+share/apps/kicq/sounds/MsgSent.wav
+share/apps/kicq/sounds/MsgType.wav
+share/apps/kicq/sounds/Notify.wav
+share/apps/kicq/sounds/Online.wav
+share/apps/kicq/sounds/Phone.wav
+share/apps/kicq/sounds/Picture.wav
+share/apps/kicq/sounds/Plugin.wav
+share/apps/kicq/sounds/Reminder.wav
+share/apps/kicq/sounds/Startup.wav
+share/apps/kicq/sounds/System.wav
+share/apps/kicq/sounds/URL.wav
+share/apps/kicq/sounds/WebSearch.wav
 share/icons/kicq.xpm
 share/icons/mini/kicq.xpm
+share/locale/de/LC_MESSAGES/kicq.mo
+share/locale/es/LC_MESSAGES/kicq.mo
+share/locale/ru/LC_MESSAGES/kicq.mo
+@dirrm share/apps/kicq/sounds
 @dirrm share/apps/kicq/pics
 @dirrm share/apps/kicq