8 files changed, 128 insertions, 95 deletions

diff --git a/net/licq/Makefile b/net/licq/Makefile
index 63781488eba7..b0c74116c92b 100644
--- a/net/licq/Makefile
+++ b/net/licq/Makefile
@@ -3,14 +3,16 @@
 # Date created:                         2 July 1998
 # Whom:                                 Brian Feldman
 #
-# $Id: Makefile,v 1.3 1998/08/09 01:25:53 steve Exp $
+# $Id: Makefile,v 1.4 1998/08/12 06:29:32 asami Exp $
 #
 
-DISTNAME=	licq-0.34
+DISTNAME=	licq-0.44
 CATEGORIES=	net
 MASTER_SITES=	http://pages.infinit.net/fairoff/licq/
 
-MAINTAINER=	brianfeldman@hotmail.com
+MAINTAINER=	green@unixhelp.org
+
+FETCH_BEFORE_ARGS=	-b
 
 USE_QT=		yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -19,4 +21,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/X11/qt --with-qt-libs=${X11BASE}/lib
 
+MAN1=		licq.1
+
 .include <bsd.port.mk>
diff --git a/net/licq/distinfo b/net/licq/distinfo
index 65e9b8b12aad..bf002ad32194 100644
--- a/net/licq/distinfo
+++ b/net/licq/distinfo
@@ -1 +1 @@
-MD5 (licq-0.34.tar.gz) = f4f3e39b116dc2a2a20c590136a7a362
+MD5 (licq-0.44.tar.gz) = d98f04a8e788516f4f2d7fe467880577
diff --git a/net/licq/files/patch-aa b/net/licq/files/patch-aa
index 7a310c4a078d..a48b995d42f2 100644
--- a/net/licq/files/patch-aa
+++ b/net/licq/files/patch-aa
@@ -1,16 +1,29 @@
---- src/Makefile.in	Tue Jul 14 16:18:02 1998
-+++ src/Makefile.in	Wed Aug  5 18:05:00 1998
-@@ -15,11 +15,11 @@
+--- misc/Makefile.in.orig	Fri Oct 30 13:29:28 1998
++++ misc/Makefile.in	Sun Nov  1 21:22:45 1998
+@@ -17,6 +17,7 @@
+ INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = ${INSTALL} -c -o bin -g bin -m 555
  
- CXX	= @CXX@
--CXXFLAGS= @CXXFLAGS@
-+CXXFLAGS= @CXXFLAGS@ -I.
- CPPFLAGS= -DPACKAGE=\"@PACKAGE@\" -DVERSION=\"@VERSION@\" \
- 	  @QT_INCLUDES@ @X_INCLUDES@
- LDFLAGS	= @QT_LDFLAGS@ @X_LDFLAGS@
--LDLIBS	= -lqt
-+LDLIBS	= -lqt -lX11
- MOC	= @MOC@
+ CONF_FILES = sample.uin users.conf licq.conf
+ 
+@@ -31,9 +32,9 @@
+ 	$(RM) Makefile
+ 
+ install:
+-	${INSTALL_PROGRAM} licq.javaconvert ${bindir}
+-	${INSTALL_PROGRAM} licq.micqconvert ${bindir}
+-	${INSTALL_PROGRAM} licq.winconvert ${bindir}
++	${INSTALL_SCRIPT} licq.javaconvert ${bindir}
++	${INSTALL_SCRIPT} licq.micqconvert ${bindir}
++	${INSTALL_SCRIPT} licq.winconvert ${bindir}
+ 	${INSTALL} -d ${pkgdatadir}/data
+ 	${INSTALL} -d ${pkgdatadir}/conf
+ 	${INSTALL} -d ${pkgdatadir}/translations
+@@ -46,4 +47,5 @@
+ 	for i in translations/*; do \
+ 	  ${INSTALL_DATA} $$i ${pkgdatadir}/translations; \
+ 	done
++	${INSTALL} licq.1 ${prefix}/man/man1
  
- OBJECTS	= file.o message.o packet.o socket.o icqfunctions.o user.o \
diff --git a/net/licq/files/patch-ab b/net/licq/files/patch-ab
index 5596382280d7..3c941d751f53 100644
--- a/net/licq/files/patch-ab
+++ b/net/licq/files/patch-ab
@@ -1,4 +1,11 @@
---- /dev/null	Wed Aug  5 18:00:59 1998
-+++ src/qmetaobject.h	Wed Aug  5 18:03:45 1998
-@@ -0,0 +1 @@
-+#include <qmetaobj.h>
+--- src/adduserdlg.cpp	Fri Oct 30 14:29:03 1998
++++ src/adduserdlg.cpp	Fri Oct 30 19:23:23 1998
+@@ -13,7 +13,7 @@
+    edtUin->setGeometry(100, 15, 120, 20);
+    edtUin->setValidator(new QIntValidator(0, 2147483647, edtUin));
+    chkAlert = new QCheckBox("Alert User", this);
+-   chkAlert->setStyle(WindowsStyle);
++   chkAlert->setStyle(MotifStyle);
+    chkAlert->setGeometry(10, 50, 80, 20);
+    chkAlert->setEnabled(false);  //for now
+    btnOk = new QPushButton("Ok", this);
diff --git a/net/licq/files/patch-ac b/net/licq/files/patch-ac
index a9b84b2ec4eb..b688b8f3c3d4 100644
--- a/net/licq/files/patch-ac
+++ b/net/licq/files/patch-ac
@@ -1,17 +1,11 @@
---- src/icq.cpp	Mon Jul 13 20:53:45 1998
-+++ src/icq.cpp	Wed Aug  5 18:02:39 1998
-@@ -338,7 +338,13 @@
-    case ICQ_CMD_PING: if (!gotAck) emit doneOwnerFcn(false, cmd); break;
-    case ICQ_CMD_ADDUSER: if (!gotAck) emit doneOwnerFcn(false, cmd); break;
-    case ICQ_CMD_AUTHORIZE: emit doneOwnerFcn(false, cmd); break;
--   case ICQ_CMD_LOGON: if (!gotAck) emit doneOwnerFcn(false, cmd); break;
-+   case ICQ_CMD_LOGON: 
-+      if (!gotAck) 
-+      {
-+         emit doneOwnerFcn(false, cmd);
-+         logoff(false); 
-+      }
-+      break;
-    case ICQ_CMD_USERLIST: if (!gotAck) emit doneOwnerFcn(false, cmd); break;
-    case ICQ_CMD_REQ_SYSMESG: if (!gotAck) emit doneOwnerFcn(false, cmd); break;
-    case ICQ_CMD_END_SM_ACK: if (!gotAck) emit doneOwnerFcn(false, cmd); break;
+--- src/licq.cpp	Fri Oct 30 14:29:03 1998
++++ src/licq.cpp	Fri Oct 30 19:23:35 1998
+@@ -67,7 +67,7 @@
+       cout << "Done installation, continuing load." << endl << endl;
+    }
+    
+-   setStyle(WindowsStyle);
++   setStyle(MotifStyle);
+    // create the main widgets
+    if (DEBUG_LEVEL >= 1) cout << "\n=> Setting up Licq daemon." << endl;
+    icq = new ICQ;
diff --git a/net/licq/files/patch-ad b/net/licq/files/patch-ad
index 57d036b7e38e..14bc458a7612 100644
--- a/net/licq/files/patch-ad
+++ b/net/licq/files/patch-ad
@@ -1,13 +1,11 @@
---- src/socket.cpp	Mon Jul 13 20:53:45 1998
-+++ src/socket.cpp	Wed Aug  5 18:02:18 1998
-@@ -69,8 +69,8 @@
-    // find local connection
-    hostent *localHost;
-    char hn[128];
--   gethostname(hn, 128);
--   localHost = gethostbyname(hn);
-+   //gethostname(hn, 128);
-+   localHost = gethostbyname("127.0.0.1");
-    localIPVal = *((unsigned long *)localHost->h_addr);
+--- src/messagebox.cpp	Fri Oct 30 14:29:24 1998
++++ src/messagebox.cpp	Fri Oct 30 19:23:42 1998
+@@ -56,7 +56,7 @@
+    QColorGroup newNormal(normal.foreground(), normal.background(), normal.light(), normal.dark(),
+                          normal.mid(), normal.text(), QColor(192, 192, 192));
+    setPalette(QPalette(newNormal, pal.disabled(), newNormal));
+-   setStyle(WindowsStyle);
++   setStyle(MotifStyle);
+    setFrameStyle(QFrame::Panel | QFrame::Sunken);
  
-    // set up remote connection
+ }
diff --git a/net/licq/files/patch-ae b/net/licq/files/patch-ae
index 520256117bbc..b3eaa9409a16 100644
--- a/net/licq/files/patch-ae
+++ b/net/licq/files/patch-ae
@@ -1,35 +1,11 @@
---- src/mledit.cpp.orig	Mon Jul 13 20:53:46 1998
-+++ src/mledit.cpp	Wed Aug  5 18:12:05 1998
-@@ -6,18 +6,25 @@
- {
-    // add word wrap here
-    char *newText = new char[strlen(s) + 1];
--   int j = 0;
--   for (int i = 0; i < strlen(s); i++) 
-+   int j, m, n;
-+   j = 0;
-+   for (unsigned long i = 0; i < strlen(s); i++) 
-    {
-       //if (s[i] == '\t') j += 3;  // add whatever the length of a tab is (broken)
-       if (j > fill_column_value)
-       {
-          // backup until we get to a space or a newline
--         while (s[i] != ' ' && s[i] != '\n') { i--; j--; }
--         newText[j] = '\0';
--         QMultiLineEdit::append(newText);
--         j = 0;
--         i++;  // get past the space or newline
-+         m = i;
-+         n = j;
-+         while (m >= 0 && s[m] != ' ' && s[m] != '\n') { m--; n--; }
-+         if (s[m] == ' ')  // space found
-+         {
-+            i = m;
-+            newText[n] = '\0';
-+            QMultiLineEdit::append(newText);
-+            j = 0;
-+            i++;  // get past the space or newline
-+         }
-       }
-       if (s[i] == '\n') 
-       {
+--- src/searchuserdlg.cpp	Fri Oct 30 14:29:22 1998
++++ src/searchuserdlg.cpp	Fri Oct 30 19:23:46 1998
+@@ -109,7 +109,7 @@
+    QColorGroup normal(pal.normal());
+    QColorGroup newNormal(normal.foreground(), normal.background(), normal.light(), normal.dark(), normal.mid(), normal.text(), QColor(192, 192, 192));
+    foundView->setPalette(QPalette(newNormal, pal.disabled(), newNormal));*/
+-   foundView->setStyle(WindowsStyle);
++   foundView->setStyle(MotifStyle);
+    foundView->setFrameStyle(QFrame::Box | QFrame::Raised);
+  
+    connect (btnCancelSearch, SIGNAL(clicked()), this, SLOT(reject()));
diff --git a/net/licq/pkg-plist b/net/licq/pkg-plist
index afb05be70375..56fcd10a0cf0 100644
--- a/net/licq/pkg-plist
+++ b/net/licq/pkg-plist
@@ -1,19 +1,60 @@
 bin/licq
-bin/licq.inst
 bin/licq.javaconvert
 bin/licq.micqconvert
-share/Licq/data/online.ppm
+bin/licq.winconvert
+share/Licq/conf/licq.conf
+share/Licq/conf/sample.uin
+share/Licq/conf/users.conf
 share/Licq/data/away.ppm
-share/Licq/data/na.ppm
-share/Licq/data/occupied.ppm
-share/Licq/data/offline.ppm
 share/Licq/data/bg.ppm
+share/Licq/data/chat.wav
+share/Licq/data/dnd.ppm
+share/Licq/data/file.wav
+share/Licq/data/message-orig.wav
 share/Licq/data/message.ppm
 share/Licq/data/message.wav
-share/Licq/conf/2127503.uin
-share/Licq/conf/sample.uin
-share/Licq/conf/users.conf
-share/Licq/conf/licq.conf
-@dirrm share/Licq/data
+share/Licq/data/na.ppm
+share/Licq/data/notify.wav
+share/Licq/data/occupied.ppm
+share/Licq/data/offline.ppm
+share/Licq/data/online.ppm
+share/Licq/data/private.ppm
+share/Licq/data/status-icq.tar.gz
+share/Licq/data/url.wav
+share/Licq/translations/ASCII
+share/Licq/translations/CP437
+share/Licq/translations/CP850
+share/Licq/translations/DANISH
+share/Licq/translations/DEC_MCS
+share/Licq/translations/DG_MCS
+share/Licq/translations/DUTCH
+share/Licq/translations/FINNISH
+share/Licq/translations/FRENCH
+share/Licq/translations/FRENCH_CANADIAN
+share/Licq/translations/GERMAN
+share/Licq/translations/HP_MCS
+share/Licq/translations/IRV
+share/Licq/translations/ITALIAN
+share/Licq/translations/JIS
+share/Licq/translations/MACINTOSH
+share/Licq/translations/NEXT
+share/Licq/translations/NORWEGIAN_1
+share/Licq/translations/NORWEGIAN_2
+share/Licq/translations/POLISH
+share/Licq/translations/POLISH_NOPL
+share/Licq/translations/PORTUGUESE
+share/Licq/translations/PORTUGUESE_COM
+share/Licq/translations/RUSSIAN
+share/Licq/translations/RUSSIAN_ALT
+share/Licq/translations/RUSSIAN_WIN
+share/Licq/translations/SPANISH
+share/Licq/translations/SWEDISH
+share/Licq/translations/SWEDISH_NAMES
+share/Licq/translations/SWEDISH_NAMES_COM
+share/Licq/translations/SWISS
+share/Licq/translations/UNITED_KINGDOM
+share/Licq/translations/UNITED_KINGDOM_COM
 @dirrm share/Licq/conf
+@dirrm share/Licq/data
+@dirrm share/Licq/translations
 @dirrm share/Licq