diff options
author | green <green@FreeBSD.org> | 2000-08-04 23:56:57 +0800 |
---|---|---|
committer | green <green@FreeBSD.org> | 2000-08-04 23:56:57 +0800 |
commit | 58573f3961d0a632dd94cffad3c05f47777b3b9e (patch) | |
tree | a35c616a7a3bbe4d222a7b35f70dd8f0592f3e2d /net-im/licq/files | |
parent | 3242bcefbfdba58f6f66e36349d034a79084d5a0 (diff) | |
download | freebsd-ports-graphics-58573f3961d0a632dd94cffad3c05f47777b3b9e.tar.gz freebsd-ports-graphics-58573f3961d0a632dd94cffad3c05f47777b3b9e.tar.zst freebsd-ports-graphics-58573f3961d0a632dd94cffad3c05f47777b3b9e.zip |
Update to licq 0.85. Grr.
Diffstat (limited to 'net-im/licq/files')
-rw-r--r-- | net-im/licq/files/patch-aa | 35 | ||||
-rw-r--r-- | net-im/licq/files/patch-ab | 26 | ||||
-rw-r--r-- | net-im/licq/files/patch-ac | 8 | ||||
-rw-r--r-- | net-im/licq/files/patch-ad | 52 |
4 files changed, 71 insertions, 50 deletions
diff --git a/net-im/licq/files/patch-aa b/net-im/licq/files/patch-aa index 099bbe39d7b..dd494d48d93 100644 --- a/net-im/licq/files/patch-aa +++ b/net-im/licq/files/patch-aa @@ -1,6 +1,6 @@ ---- plugins/qt-gui/configure.orig Wed Mar 29 01:26:46 2000 -+++ plugins/qt-gui/configure Wed Mar 29 01:35:53 2000 -@@ -4217,7 +4217,7 @@ +--- plugins/qt-gui/configure.orig Tue Jul 11 18:54:28 2000 ++++ plugins/qt-gui/configure Mon Jul 24 03:40:56 2000 +@@ -4138,7 +4138,7 @@ fi for qt_dir in $qt_library_dirs; do @@ -9,16 +9,25 @@ if test -r $qt_check_lib; then ac_qt_libraries=$qt_dir break 2 -@@ -4238,7 +4238,7 @@ +@@ -4158,7 +4158,7 @@ + have_qt_lib="no" + else have_qt_lib="yes" +- 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 + { echo "configure: error: + The Qt lib directory "$ac_cv_lib_qtlib" +@@ -4172,7 +4172,7 @@ + Please check your installation. + + Use the --with-qt-libraries option if we found the wrong Qt lib. +- " 1>&2; exit 1; } ++ " 1>&2; } + fi fi -- 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 - { echo "configure: error: The Qt lib directory - $ac_cv_lib_qtlib -@@ -4301,7 +4301,7 @@ +@@ -4226,7 +4226,7 @@ /usr/X11/include/qt \ /usr/X11/include/X11/qt \ /usr/X11R6/include \ @@ -27,16 +36,16 @@ /usr/X11R6/include/X11/qt \ /usr/X11/lib/qt/include" -@@ -4380,7 +4380,7 @@ +@@ -4318,7 +4318,7 @@ fi # Extract the first word of "moc", so it can be a program name with args. -set dummy moc; ac_word=$2 +set dummy moc2; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:4386: checking for $ac_word" >&5 + echo "configure:4324: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then -@@ -4405,7 +4405,7 @@ +@@ -4343,7 +4343,7 @@ fi done IFS="$ac_save_ifs" diff --git a/net-im/licq/files/patch-ab b/net-im/licq/files/patch-ab index b14a60f67fd..852716c052a 100644 --- a/net-im/licq/files/patch-ab +++ b/net-im/licq/files/patch-ab @@ -1,6 +1,6 @@ ---- plugins/qt-gui/acinclude.m4.in.orig Wed Mar 29 01:36:10 2000 -+++ plugins/qt-gui/acinclude.m4.in Wed Mar 29 01:37:07 2000 -@@ -72,7 +72,7 @@ +--- plugins/qt-gui/acinclude.m4.in.orig Sun Jun 18 06:20:57 2000 ++++ plugins/qt-gui/acinclude.m4.in Mon Jul 24 03:09:28 2000 +@@ -48,7 +48,7 @@ fi for qt_dir in $qt_library_dirs; do @@ -9,16 +9,16 @@ if test -r $qt_check_lib; then ac_qt_libraries=$qt_dir break 2 -@@ -93,7 +93,7 @@ - fi - - 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 -@@ -196,8 +196,8 @@ +@@ -68,7 +68,7 @@ + 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" +@@ -185,8 +185,8 @@ AC_PATH_PROG( MOC, diff --git a/net-im/licq/files/patch-ac b/net-im/licq/files/patch-ac index 46f222747e9..d24dbe10a56 100644 --- a/net-im/licq/files/patch-ac +++ b/net-im/licq/files/patch-ac @@ -1,10 +1,10 @@ ---- plugins/qt-gui/src/Makefile.in.orig Wed Mar 29 01:31:47 2000 -+++ plugins/qt-gui/src/Makefile.in Wed Mar 29 01:31:52 2000 -@@ -120,7 +120,7 @@ +--- plugins/qt-gui/src/Makefile.in.orig Tue Jul 11 18:54:27 2000 ++++ plugins/qt-gui/src/Makefile.in Mon Jul 24 03:12:25 2000 +@@ -119,7 +119,7 @@ licq_qt_gui_la_LDFLAGS = $(X_LIBS) $(QT_LDFLAGS) $(KDE_LDFLAGS) -module -avoid-version -rpath $(libdir) -R$(QT_LIBDIR) --licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) +-licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) +licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt2 $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) diff --git a/net-im/licq/files/patch-ad b/net-im/licq/files/patch-ad index 0d9579f0b76..7bf734c85ce 100644 --- a/net-im/licq/files/patch-ad +++ b/net-im/licq/files/patch-ad @@ -1,5 +1,5 @@ ---- src/daemon/socket.cpp.orig Wed Mar 29 01:30:14 2000 -+++ src/daemon/socket.cpp Wed Mar 29 01:30:18 2000 +--- 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> @@ -8,29 +8,41 @@ #ifndef MSG_DONTWAIT #define MSG_DONTWAIT 0 -@@ -260,7 +261,11 @@ - if (_nFlags & ADDR_LOCAL) +@@ -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) { - // Setup the local structure -- 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 - if (getsockname(m_nDescriptor, (struct sockaddr *)&m_sLocalAddr, &sizeofSockaddr) < 0) - { - // errno has been set -@@ -498,7 +503,11 @@ + // errno has been set +@@ -504,7 +514,11 @@ *---------------------------------------------------------------------------*/ void TCPSocket::RecvConnection(TCPSocket &newSocket) { - socklen_t sizeofSockaddr = sizeof(struct sockaddr_in); -+ #if __FreeBSD_version < 400013 ++#if __FreeBSD_version < 400013 + int sizeofSockaddr = sizeof(struct sockaddr_in); -+ #else ++#else + socklen_t sizeofSockaddr = sizeof(struct sockaddr_in); -+ #endif ++#endif newSocket.m_nDescriptor = accept(m_nDescriptor, (struct sockaddr *)&newSocket.m_sRemoteAddr, &sizeofSockaddr); - newSocket.OpenSocket(); - newSocket.SetAddrsFromSocket(ADDR_LOCAL | ADDR_REMOTE); + newSocket.SetLocalAddress(); + } |