Remove the OTHER patch. I hate CVS.

2 files changed, 48 insertions, 41 deletions

diff --git a/net/licq/files/patch-ad b/net/licq/files/patch-ad
new file mode 100644
index 000000000000..7bf734c85ce6
--- /dev/null
+++ b/net/licq/files/patch-ad
@@ -0,0 +1,48 @@
+--- src/socket.cpp.orig	Tue Jul  4 20:51:50 2000
++++ src/socket.cpp	Mon Jul 24 03:32:56 2000
+@@ -12,6 +12,7 @@
+ #include <netdb.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <osreldate.h>
+ 
+ #ifndef MSG_DONTWAIT
+ #define MSG_DONTWAIT 0
+@@ -288,7 +289,12 @@
+ bool INetSocket::SetLocalAddress(bool bIp)
+ {
+   // Setup the local structure
++
++#if __FreeBSD_version < 400013
++  int sizeofSockaddr = sizeof(struct sockaddr_in);
++#else
+   socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
++#endif
+   if (getsockname(m_nDescriptor, (struct sockaddr *)&m_sLocalAddr, &sizeofSockaddr) < 0)
+   {
+     m_nErrorType = SOCK_ERROR_errno;
+@@ -372,7 +378,11 @@
+   m_sRemoteAddr.sin_family = AF_INET;
+ 
+   // if connect fails then call CloseConnection to clean up before returning
++#if __FreeBSD_version < 400013
++  int sizeofSockaddr = sizeof(struct sockaddr);
++#else
+   socklen_t sizeofSockaddr = sizeof(struct sockaddr);
++#endif
+   if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
+   {
+     // errno has been set
+@@ -504,7 +514,11 @@
+  *---------------------------------------------------------------------------*/
+ void TCPSocket::RecvConnection(TCPSocket &newSocket)
+ {
+-  socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
++#if __FreeBSD_version < 400013
++    int sizeofSockaddr = sizeof(struct sockaddr_in);
++#else
++    socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
++#endif
+   newSocket.m_nDescriptor = accept(m_nDescriptor, (struct sockaddr *)&newSocket.m_sRemoteAddr, &sizeofSockaddr);
+   newSocket.SetLocalAddress();
+ }
diff --git a/net/licq/files/patch-ae b/net/licq/files/patch-ae
deleted file mode 100644
index 0f939b1c7b75..000000000000
--- a/net/licq/files/patch-ae
+++ /dev/null
@@ -1,41 +0,0 @@
---- plugins/qt-gui-1.0.3/aclocal.m4.orig	Tue Oct 10 16:52:41 2000
-+++ plugins/qt-gui-1.0.3/aclocal.m4	Sun Oct 15 17:51:04 2000
-@@ -59,7 +59,7 @@
-       fi
- 
-       for qt_dir in $qt_library_dirs; do
--        for qt_check_lib in $qt_dir/libqt.so.2; do
-+        for qt_check_lib in $qt_dir/libqt2.so.4; do
-           if test -r $qt_check_lib; then
-             ac_qt_libraries=$qt_dir
-             break 2
-@@ -79,17 +79,12 @@
-   else
-     have_qt_lib="yes"
-     dnl Check if we have the right lib
--    output=`eval "strings $ac_cv_lib_qtlib/libqt.so | grep -l QCString"`
-+    output=`eval "strings $ac_cv_lib_qtlib/libqt2.so | grep -l QCString"`
-     if test -z "$output"; then
-       AC_MSG_ERROR([
-           The Qt lib directory "$ac_cv_lib_qtlib"
-           found by configure doesn't contain a Qt 2.1.x library.
- 
--          To overcome special features of the GNU ld (aka bugs), the
--          libqt.so file _needs_ to point to libqt.so.2 which needs
--          to point to a Qt 2.1 library.
--          (this is only needed during compiling and linking, not at runtime)
--
-           Please check your installation.
- 
-           Use the --with-qt-libraries option if we found the wrong Qt lib.
-@@ -196,8 +191,8 @@
- 
-     AC_PATH_PROG(
-       MOC,
--      moc,
--      $QTDIR/bin/moc,
-+      moc2,
-+      $QTDIR/bin/moc2,
-       $QTDIR/bin:/usr/lib/qt2/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH
-     )
-   else