diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2000-07-21 18:15:36 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2000-07-21 18:15:36 +0000 |
commit | 70f89778c0f2f76bc2f8046e99cc55f2962ac9c2 (patch) | |
tree | 14c35099cfb4f4257c5e0b8e589d530fcb829468 /net/licq-devel/files | |
parent | f667b39b3c0614d5aeb9bcb4bac4a4b222408185 (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_1_0'.release/4.1.0
Notes
Notes:
svn path=/head/; revision=30942
svn path=/tags/RELEASE_4_1_0/; revision=30943; tag=release/4.1.0
Diffstat (limited to 'net/licq-devel/files')
-rw-r--r-- | net/licq-devel/files/patch-aa | 47 | ||||
-rw-r--r-- | net/licq-devel/files/patch-ab | 31 | ||||
-rw-r--r-- | net/licq-devel/files/patch-ac | 11 | ||||
-rw-r--r-- | net/licq-devel/files/patch-ad | 36 |
4 files changed, 0 insertions, 125 deletions
diff --git a/net/licq-devel/files/patch-aa b/net/licq-devel/files/patch-aa deleted file mode 100644 index 099bbe39d7b3..000000000000 --- a/net/licq-devel/files/patch-aa +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 @@ - 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.3; do - if test -r $qt_check_lib; then - ac_qt_libraries=$qt_dir - break 2 -@@ -4238,7 +4238,7 @@ - have_qt_lib="yes" - 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 @@ - /usr/X11/include/qt \ - /usr/X11/include/X11/qt \ - /usr/X11R6/include \ -- /usr/X11R6/include/qt \ -+ /usr/X11R6/include/qt2 \ - /usr/X11R6/include/X11/qt \ - /usr/X11/lib/qt/include" - -@@ -4380,7 +4380,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 - if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then -@@ -4405,7 +4405,7 @@ - fi - done - IFS="$ac_save_ifs" -- test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="$QTDIR/bin/moc" -+ test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="$QTDIR/bin/moc2" - ;; - esac - fi diff --git a/net/licq-devel/files/patch-ab b/net/licq-devel/files/patch-ab deleted file mode 100644 index b14a60f67fde..000000000000 --- a/net/licq-devel/files/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 @@ - 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.3; do - 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 @@ - - 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 diff --git a/net/licq-devel/files/patch-ac b/net/licq-devel/files/patch-ac deleted file mode 100644 index 46f222747e98..000000000000 --- a/net/licq-devel/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 @@ - - 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) -lqt2 $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) - - - #>- METASOURCES = AUTO diff --git a/net/licq-devel/files/patch-ad b/net/licq-devel/files/patch-ad deleted file mode 100644 index 0d9579f0b76f..000000000000 --- a/net/licq-devel/files/patch-ad +++ /dev/null @@ -1,36 +0,0 @@ ---- src/daemon/socket.cpp.orig Wed Mar 29 01:30:14 2000 -+++ src/daemon/socket.cpp Wed Mar 29 01:30:18 2000 -@@ -12,6 +12,7 @@ - #include <netdb.h> - #include <fcntl.h> - #include <unistd.h> -+#include <osreldate.h> - - #ifndef MSG_DONTWAIT - #define MSG_DONTWAIT 0 -@@ -260,7 +261,11 @@ - if (_nFlags & ADDR_LOCAL) - { - // 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 @@ - *---------------------------------------------------------------------------*/ - 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.OpenSocket(); - newSocket.SetAddrsFromSocket(ADDR_LOCAL | ADDR_REMOTE); |