mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-02 11:09:29 +00:00
Update to licq 0.85. Grr.
This commit is contained in:
parent
18189138fd
commit
438f5bb06b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=31318
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= licq
|
||||
PORTVERSION= 0.81
|
||||
PORTVERSION= 0.85
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
|
||||
ftp://ftp.wibble.net/pub/licq/srcs/ \
|
||||
@ -24,8 +24,10 @@ BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake
|
||||
USE_GMAKE= yes
|
||||
USE_AUTOCONF= yes
|
||||
USE_NEWGCC= yes
|
||||
USE_OPENSSL= yes
|
||||
USE_PERL5= yes
|
||||
|
||||
CONFIGURE_TARGET= $(ARCH)-unknown-freebsdelf$(OSREL)
|
||||
DATANAME= licq-data-1.6
|
||||
DATAFILES= ${DATANAME}${EXTRACT_SUFX}
|
||||
DATADIR= ${WRKDIR}/${DATANAME}
|
||||
@ -56,7 +58,6 @@ post-install:
|
||||
cd ${WRKSRC}/plugins/qt-gui;\
|
||||
${SETENV} ${MAKE_ENV} \
|
||||
${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
|
||||
strip ${PREFIX}/lib/licq/licq_qt-gui.so
|
||||
${MKDIR} ${PREFIX}/share/licq/contrib
|
||||
${INSTALL_SCRIPT} ${DATADIR}/contrib/licq.* ${PREFIX}/share/licq/contrib
|
||||
${INSTALL_SCRIPT} ${DATADIR}/contrib/*.sh ${PREFIX}/share/licq/contrib
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (licq-0.81.tar.gz) = b003fedfec9cb1e5e0ad8dc560cef7b0
|
||||
MD5 (licq-0.85.tar.gz) = abbde101ac967755d07c025e3ab45068
|
||||
MD5 (licq-data-1.6.tar.gz) = f94b39990e20c97713562a4e12bb2d50
|
||||
|
@ -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"
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
// 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 @@
|
||||
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
|
||||
+#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();
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
bin/licq
|
||||
lib/licq/licq_qt-gui.so
|
||||
lib/licq/licq_qt-gui.la
|
||||
lib/licq/licq_qt-gui.so
|
||||
@dirrm lib/licq
|
||||
share/licq/utilities/BackOrifice.utility
|
||||
share/licq/utilities/finger.utility
|
||||
@ -53,6 +53,15 @@ share/licq/translations/SWISS
|
||||
share/licq/translations/UNITED_KINGDOM
|
||||
share/licq/translations/UNITED_KINGDOM_COM
|
||||
@dirrm share/licq/translations
|
||||
share/licq/sounds/fun/Auth.wav
|
||||
share/licq/sounds/fun/Chat.wav
|
||||
share/licq/sounds/fun/Contact.wav
|
||||
share/licq/sounds/fun/File.wav
|
||||
share/licq/sounds/fun/Message.wav
|
||||
share/licq/sounds/fun/Online.wav
|
||||
share/licq/sounds/fun/System.wav
|
||||
share/licq/sounds/fun/URL.wav
|
||||
@dirrm share/licq/sounds/fun
|
||||
share/licq/sounds/icq/Auth.wav
|
||||
share/licq/sounds/icq/Chat.wav
|
||||
share/licq/sounds/icq/Contact.wav
|
||||
@ -162,17 +171,6 @@ share/licq/qt-gui/icons.icq2/offline.xpm
|
||||
share/licq/qt-gui/icons.icq2/online.xpm
|
||||
share/licq/qt-gui/icons.icq2/url.xpm
|
||||
@dirrm share/licq/qt-gui/icons.icq2
|
||||
share/licq/qt-gui/icons.dots/away.xpm
|
||||
share/licq/qt-gui/icons.dots/dnd.xpm
|
||||
share/licq/qt-gui/icons.dots/dots.icons
|
||||
share/licq/qt-gui/icons.dots/message.xpm
|
||||
share/licq/qt-gui/icons.dots/na.xpm
|
||||
share/licq/qt-gui/icons.dots/occupied.xpm
|
||||
share/licq/qt-gui/icons.dots/offline.xpm
|
||||
share/licq/qt-gui/icons.dots/online.xpm
|
||||
share/licq/qt-gui/icons.dots/online.xpm.d
|
||||
share/licq/qt-gui/icons.dots/private.xpm
|
||||
@dirrm share/licq/qt-gui/icons.dots
|
||||
share/licq/qt-gui/icons.icq/away.ppm
|
||||
share/licq/qt-gui/icons.icq/dnd.ppm
|
||||
share/licq/qt-gui/icons.icq/icq.icons
|
||||
@ -201,57 +199,58 @@ share/licq/qt-gui/skin.basic/basic.skin
|
||||
@dirrm share/licq/qt-gui/skin.basic
|
||||
share/licq/qt-gui/skin.basic-ncb/basic-ncb.skin
|
||||
@dirrm share/licq/qt-gui/skin.basic-ncb
|
||||
share/licq/qt-gui/skin.bheart/Frame.xpm
|
||||
share/licq/qt-gui/skin.bheart/Frame.png
|
||||
share/licq/qt-gui/skin.bheart/MenuButtonDown.png
|
||||
share/licq/qt-gui/skin.bheart/MenuButtonUp.png
|
||||
share/licq/qt-gui/skin.bheart/MenuButtonlight.png
|
||||
share/licq/qt-gui/skin.bheart/README
|
||||
share/licq/qt-gui/skin.bheart/bheart.skin
|
||||
@dirrm share/licq/qt-gui/skin.bheart
|
||||
share/licq/qt-gui/skin.compact/button.xpm
|
||||
share/licq/qt-gui/skin.compact/button.png
|
||||
share/licq/qt-gui/skin.compact/compact.skin
|
||||
share/licq/qt-gui/skin.compact/frame.gif
|
||||
share/licq/qt-gui/skin.compact/msg.xpm
|
||||
share/licq/qt-gui/skin.compact/status.xpm
|
||||
share/licq/qt-gui/skin.compact/frame.png
|
||||
share/licq/qt-gui/skin.compact/msg.png
|
||||
share/licq/qt-gui/skin.compact/status.png
|
||||
@dirrm share/licq/qt-gui/skin.compact
|
||||
share/licq/qt-gui/skin.dim/Frame.gif
|
||||
share/licq/qt-gui/skin.dim/Label-small.xpm
|
||||
share/licq/qt-gui/skin.dim/Label.xpm
|
||||
share/licq/qt-gui/skin.dim/MenuDown.xpm
|
||||
share/licq/qt-gui/skin.dim/MenuUpFocus.xpm
|
||||
share/licq/qt-gui/skin.dim/MenuUpNoFocus.xpm
|
||||
share/licq/qt-gui/skin.dim/Status.xpm
|
||||
share/licq/qt-gui/skin.dim/Frame.png
|
||||
share/licq/qt-gui/skin.dim/Label-small.png
|
||||
share/licq/qt-gui/skin.dim/MenuDown.png
|
||||
share/licq/qt-gui/skin.dim/MenuUpFocus.png
|
||||
share/licq/qt-gui/skin.dim/MenuUpNoFocus.png
|
||||
share/licq/qt-gui/skin.dim/Status.png
|
||||
share/licq/qt-gui/skin.dim/dim.skin
|
||||
share/licq/qt-gui/skin.dim/mask.gif
|
||||
share/licq/qt-gui/skin.dim/mask.png
|
||||
@dirrm share/licq/qt-gui/skin.dim
|
||||
share/licq/qt-gui/skin.e/butMenu.xpm
|
||||
share/licq/qt-gui/skin.e/butMenuDown.xpm
|
||||
share/licq/qt-gui/skin.e/butMenuFocus.xpm
|
||||
share/licq/qt-gui/skin.e/butMenu.png
|
||||
share/licq/qt-gui/skin.e/butMenuDown.png
|
||||
share/licq/qt-gui/skin.e/butMenuFocus.png
|
||||
share/licq/qt-gui/skin.e/e.skin
|
||||
share/licq/qt-gui/skin.e/frame.gif
|
||||
share/licq/qt-gui/skin.e/msg.xpm
|
||||
share/licq/qt-gui/skin.e/status.xpm
|
||||
share/licq/qt-gui/skin.e/frame.png
|
||||
share/licq/qt-gui/skin.e/msg.png
|
||||
share/licq/qt-gui/skin.e/status.png
|
||||
@dirrm share/licq/qt-gui/skin.e
|
||||
share/licq/qt-gui/skin.gradient/background.gif
|
||||
share/licq/qt-gui/skin.gradient/buttonLowered.xpm
|
||||
share/licq/qt-gui/skin.gradient/buttonRaised.xpm
|
||||
share/licq/qt-gui/skin.gradient/background.png
|
||||
share/licq/qt-gui/skin.gradient/buttonLowered.png
|
||||
share/licq/qt-gui/skin.gradient/buttonRaised.png
|
||||
share/licq/qt-gui/skin.gradient/gradient.skin
|
||||
share/licq/qt-gui/skin.gradient/msg.xpm
|
||||
share/licq/qt-gui/skin.gradient/status.xpm
|
||||
share/licq/qt-gui/skin.gradient/msg.png
|
||||
share/licq/qt-gui/skin.gradient/status.png
|
||||
@dirrm share/licq/qt-gui/skin.gradient
|
||||
share/licq/qt-gui/skin.icq/icq.skin
|
||||
@dirrm share/licq/qt-gui/skin.icq
|
||||
share/licq/qt-gui/skin.pli/Frame.gif
|
||||
share/licq/qt-gui/skin.pli/MenuButtonDown.xpm
|
||||
share/licq/qt-gui/skin.pli/MenuButtonUp.xpm
|
||||
share/licq/qt-gui/skin.icq-ncb/icq-ncb.skin
|
||||
@dirrm share/licq/qt-gui/skin.icq-ncb
|
||||
share/licq/qt-gui/skin.pli/Frame.png
|
||||
share/licq/qt-gui/skin.pli/MenuButtonDown.png
|
||||
share/licq/qt-gui/skin.pli/MenuButtonUp.png
|
||||
share/licq/qt-gui/skin.pli/pli.skin
|
||||
@dirrm share/licq/qt-gui/skin.pli
|
||||
share/licq/qt-gui/skin.shale/butMenu.xpm
|
||||
share/licq/qt-gui/skin.shale/butMenuDown.xpm
|
||||
share/licq/qt-gui/skin.shale/butMenuFocus.xpm
|
||||
share/licq/qt-gui/skin.shale/frame.gif
|
||||
share/licq/qt-gui/skin.shale/butMenu.png
|
||||
share/licq/qt-gui/skin.shale/butMenuDown.png
|
||||
share/licq/qt-gui/skin.shale/butMenuFocus.png
|
||||
share/licq/qt-gui/skin.shale/frame.png
|
||||
share/licq/qt-gui/skin.shale/shale.skin
|
||||
share/licq/qt-gui/skin.shale/status.xpm
|
||||
share/licq/qt-gui/skin.shale/status.png
|
||||
@dirrm share/licq/qt-gui/skin.shale
|
||||
@dirrm share/licq/qt-gui
|
||||
share/licq/contrib/licq.gicqconvert
|
||||
|
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= licq
|
||||
PORTVERSION= 0.81
|
||||
PORTVERSION= 0.85
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
|
||||
ftp://ftp.wibble.net/pub/licq/srcs/ \
|
||||
@ -24,8 +24,10 @@ BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake
|
||||
USE_GMAKE= yes
|
||||
USE_AUTOCONF= yes
|
||||
USE_NEWGCC= yes
|
||||
USE_OPENSSL= yes
|
||||
USE_PERL5= yes
|
||||
|
||||
CONFIGURE_TARGET= $(ARCH)-unknown-freebsdelf$(OSREL)
|
||||
DATANAME= licq-data-1.6
|
||||
DATAFILES= ${DATANAME}${EXTRACT_SUFX}
|
||||
DATADIR= ${WRKDIR}/${DATANAME}
|
||||
@ -56,7 +58,6 @@ post-install:
|
||||
cd ${WRKSRC}/plugins/qt-gui;\
|
||||
${SETENV} ${MAKE_ENV} \
|
||||
${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
|
||||
strip ${PREFIX}/lib/licq/licq_qt-gui.so
|
||||
${MKDIR} ${PREFIX}/share/licq/contrib
|
||||
${INSTALL_SCRIPT} ${DATADIR}/contrib/licq.* ${PREFIX}/share/licq/contrib
|
||||
${INSTALL_SCRIPT} ${DATADIR}/contrib/*.sh ${PREFIX}/share/licq/contrib
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (licq-0.81.tar.gz) = b003fedfec9cb1e5e0ad8dc560cef7b0
|
||||
MD5 (licq-0.85.tar.gz) = abbde101ac967755d07c025e3ab45068
|
||||
MD5 (licq-data-1.6.tar.gz) = f94b39990e20c97713562a4e12bb2d50
|
||||
|
@ -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"
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
// 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 @@
|
||||
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
|
||||
+#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();
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
bin/licq
|
||||
lib/licq/licq_qt-gui.so
|
||||
lib/licq/licq_qt-gui.la
|
||||
lib/licq/licq_qt-gui.so
|
||||
@dirrm lib/licq
|
||||
share/licq/utilities/BackOrifice.utility
|
||||
share/licq/utilities/finger.utility
|
||||
@ -53,6 +53,15 @@ share/licq/translations/SWISS
|
||||
share/licq/translations/UNITED_KINGDOM
|
||||
share/licq/translations/UNITED_KINGDOM_COM
|
||||
@dirrm share/licq/translations
|
||||
share/licq/sounds/fun/Auth.wav
|
||||
share/licq/sounds/fun/Chat.wav
|
||||
share/licq/sounds/fun/Contact.wav
|
||||
share/licq/sounds/fun/File.wav
|
||||
share/licq/sounds/fun/Message.wav
|
||||
share/licq/sounds/fun/Online.wav
|
||||
share/licq/sounds/fun/System.wav
|
||||
share/licq/sounds/fun/URL.wav
|
||||
@dirrm share/licq/sounds/fun
|
||||
share/licq/sounds/icq/Auth.wav
|
||||
share/licq/sounds/icq/Chat.wav
|
||||
share/licq/sounds/icq/Contact.wav
|
||||
@ -162,17 +171,6 @@ share/licq/qt-gui/icons.icq2/offline.xpm
|
||||
share/licq/qt-gui/icons.icq2/online.xpm
|
||||
share/licq/qt-gui/icons.icq2/url.xpm
|
||||
@dirrm share/licq/qt-gui/icons.icq2
|
||||
share/licq/qt-gui/icons.dots/away.xpm
|
||||
share/licq/qt-gui/icons.dots/dnd.xpm
|
||||
share/licq/qt-gui/icons.dots/dots.icons
|
||||
share/licq/qt-gui/icons.dots/message.xpm
|
||||
share/licq/qt-gui/icons.dots/na.xpm
|
||||
share/licq/qt-gui/icons.dots/occupied.xpm
|
||||
share/licq/qt-gui/icons.dots/offline.xpm
|
||||
share/licq/qt-gui/icons.dots/online.xpm
|
||||
share/licq/qt-gui/icons.dots/online.xpm.d
|
||||
share/licq/qt-gui/icons.dots/private.xpm
|
||||
@dirrm share/licq/qt-gui/icons.dots
|
||||
share/licq/qt-gui/icons.icq/away.ppm
|
||||
share/licq/qt-gui/icons.icq/dnd.ppm
|
||||
share/licq/qt-gui/icons.icq/icq.icons
|
||||
@ -201,57 +199,58 @@ share/licq/qt-gui/skin.basic/basic.skin
|
||||
@dirrm share/licq/qt-gui/skin.basic
|
||||
share/licq/qt-gui/skin.basic-ncb/basic-ncb.skin
|
||||
@dirrm share/licq/qt-gui/skin.basic-ncb
|
||||
share/licq/qt-gui/skin.bheart/Frame.xpm
|
||||
share/licq/qt-gui/skin.bheart/Frame.png
|
||||
share/licq/qt-gui/skin.bheart/MenuButtonDown.png
|
||||
share/licq/qt-gui/skin.bheart/MenuButtonUp.png
|
||||
share/licq/qt-gui/skin.bheart/MenuButtonlight.png
|
||||
share/licq/qt-gui/skin.bheart/README
|
||||
share/licq/qt-gui/skin.bheart/bheart.skin
|
||||
@dirrm share/licq/qt-gui/skin.bheart
|
||||
share/licq/qt-gui/skin.compact/button.xpm
|
||||
share/licq/qt-gui/skin.compact/button.png
|
||||
share/licq/qt-gui/skin.compact/compact.skin
|
||||
share/licq/qt-gui/skin.compact/frame.gif
|
||||
share/licq/qt-gui/skin.compact/msg.xpm
|
||||
share/licq/qt-gui/skin.compact/status.xpm
|
||||
share/licq/qt-gui/skin.compact/frame.png
|
||||
share/licq/qt-gui/skin.compact/msg.png
|
||||
share/licq/qt-gui/skin.compact/status.png
|
||||
@dirrm share/licq/qt-gui/skin.compact
|
||||
share/licq/qt-gui/skin.dim/Frame.gif
|
||||
share/licq/qt-gui/skin.dim/Label-small.xpm
|
||||
share/licq/qt-gui/skin.dim/Label.xpm
|
||||
share/licq/qt-gui/skin.dim/MenuDown.xpm
|
||||
share/licq/qt-gui/skin.dim/MenuUpFocus.xpm
|
||||
share/licq/qt-gui/skin.dim/MenuUpNoFocus.xpm
|
||||
share/licq/qt-gui/skin.dim/Status.xpm
|
||||
share/licq/qt-gui/skin.dim/Frame.png
|
||||
share/licq/qt-gui/skin.dim/Label-small.png
|
||||
share/licq/qt-gui/skin.dim/MenuDown.png
|
||||
share/licq/qt-gui/skin.dim/MenuUpFocus.png
|
||||
share/licq/qt-gui/skin.dim/MenuUpNoFocus.png
|
||||
share/licq/qt-gui/skin.dim/Status.png
|
||||
share/licq/qt-gui/skin.dim/dim.skin
|
||||
share/licq/qt-gui/skin.dim/mask.gif
|
||||
share/licq/qt-gui/skin.dim/mask.png
|
||||
@dirrm share/licq/qt-gui/skin.dim
|
||||
share/licq/qt-gui/skin.e/butMenu.xpm
|
||||
share/licq/qt-gui/skin.e/butMenuDown.xpm
|
||||
share/licq/qt-gui/skin.e/butMenuFocus.xpm
|
||||
share/licq/qt-gui/skin.e/butMenu.png
|
||||
share/licq/qt-gui/skin.e/butMenuDown.png
|
||||
share/licq/qt-gui/skin.e/butMenuFocus.png
|
||||
share/licq/qt-gui/skin.e/e.skin
|
||||
share/licq/qt-gui/skin.e/frame.gif
|
||||
share/licq/qt-gui/skin.e/msg.xpm
|
||||
share/licq/qt-gui/skin.e/status.xpm
|
||||
share/licq/qt-gui/skin.e/frame.png
|
||||
share/licq/qt-gui/skin.e/msg.png
|
||||
share/licq/qt-gui/skin.e/status.png
|
||||
@dirrm share/licq/qt-gui/skin.e
|
||||
share/licq/qt-gui/skin.gradient/background.gif
|
||||
share/licq/qt-gui/skin.gradient/buttonLowered.xpm
|
||||
share/licq/qt-gui/skin.gradient/buttonRaised.xpm
|
||||
share/licq/qt-gui/skin.gradient/background.png
|
||||
share/licq/qt-gui/skin.gradient/buttonLowered.png
|
||||
share/licq/qt-gui/skin.gradient/buttonRaised.png
|
||||
share/licq/qt-gui/skin.gradient/gradient.skin
|
||||
share/licq/qt-gui/skin.gradient/msg.xpm
|
||||
share/licq/qt-gui/skin.gradient/status.xpm
|
||||
share/licq/qt-gui/skin.gradient/msg.png
|
||||
share/licq/qt-gui/skin.gradient/status.png
|
||||
@dirrm share/licq/qt-gui/skin.gradient
|
||||
share/licq/qt-gui/skin.icq/icq.skin
|
||||
@dirrm share/licq/qt-gui/skin.icq
|
||||
share/licq/qt-gui/skin.pli/Frame.gif
|
||||
share/licq/qt-gui/skin.pli/MenuButtonDown.xpm
|
||||
share/licq/qt-gui/skin.pli/MenuButtonUp.xpm
|
||||
share/licq/qt-gui/skin.icq-ncb/icq-ncb.skin
|
||||
@dirrm share/licq/qt-gui/skin.icq-ncb
|
||||
share/licq/qt-gui/skin.pli/Frame.png
|
||||
share/licq/qt-gui/skin.pli/MenuButtonDown.png
|
||||
share/licq/qt-gui/skin.pli/MenuButtonUp.png
|
||||
share/licq/qt-gui/skin.pli/pli.skin
|
||||
@dirrm share/licq/qt-gui/skin.pli
|
||||
share/licq/qt-gui/skin.shale/butMenu.xpm
|
||||
share/licq/qt-gui/skin.shale/butMenuDown.xpm
|
||||
share/licq/qt-gui/skin.shale/butMenuFocus.xpm
|
||||
share/licq/qt-gui/skin.shale/frame.gif
|
||||
share/licq/qt-gui/skin.shale/butMenu.png
|
||||
share/licq/qt-gui/skin.shale/butMenuDown.png
|
||||
share/licq/qt-gui/skin.shale/butMenuFocus.png
|
||||
share/licq/qt-gui/skin.shale/frame.png
|
||||
share/licq/qt-gui/skin.shale/shale.skin
|
||||
share/licq/qt-gui/skin.shale/status.xpm
|
||||
share/licq/qt-gui/skin.shale/status.png
|
||||
@dirrm share/licq/qt-gui/skin.shale
|
||||
@dirrm share/licq/qt-gui
|
||||
share/licq/contrib/licq.gicqconvert
|
||||
|
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= licq
|
||||
PORTVERSION= 0.81
|
||||
PORTVERSION= 0.85
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
|
||||
ftp://ftp.wibble.net/pub/licq/srcs/ \
|
||||
@ -24,8 +24,10 @@ BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake
|
||||
USE_GMAKE= yes
|
||||
USE_AUTOCONF= yes
|
||||
USE_NEWGCC= yes
|
||||
USE_OPENSSL= yes
|
||||
USE_PERL5= yes
|
||||
|
||||
CONFIGURE_TARGET= $(ARCH)-unknown-freebsdelf$(OSREL)
|
||||
DATANAME= licq-data-1.6
|
||||
DATAFILES= ${DATANAME}${EXTRACT_SUFX}
|
||||
DATADIR= ${WRKDIR}/${DATANAME}
|
||||
@ -56,7 +58,6 @@ post-install:
|
||||
cd ${WRKSRC}/plugins/qt-gui;\
|
||||
${SETENV} ${MAKE_ENV} \
|
||||
${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
|
||||
strip ${PREFIX}/lib/licq/licq_qt-gui.so
|
||||
${MKDIR} ${PREFIX}/share/licq/contrib
|
||||
${INSTALL_SCRIPT} ${DATADIR}/contrib/licq.* ${PREFIX}/share/licq/contrib
|
||||
${INSTALL_SCRIPT} ${DATADIR}/contrib/*.sh ${PREFIX}/share/licq/contrib
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (licq-0.81.tar.gz) = b003fedfec9cb1e5e0ad8dc560cef7b0
|
||||
MD5 (licq-0.85.tar.gz) = abbde101ac967755d07c025e3ab45068
|
||||
MD5 (licq-data-1.6.tar.gz) = f94b39990e20c97713562a4e12bb2d50
|
||||
|
@ -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"
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
// 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 @@
|
||||
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
|
||||
+#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();
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
bin/licq
|
||||
lib/licq/licq_qt-gui.so
|
||||
lib/licq/licq_qt-gui.la
|
||||
lib/licq/licq_qt-gui.so
|
||||
@dirrm lib/licq
|
||||
share/licq/utilities/BackOrifice.utility
|
||||
share/licq/utilities/finger.utility
|
||||
@ -53,6 +53,15 @@ share/licq/translations/SWISS
|
||||
share/licq/translations/UNITED_KINGDOM
|
||||
share/licq/translations/UNITED_KINGDOM_COM
|
||||
@dirrm share/licq/translations
|
||||
share/licq/sounds/fun/Auth.wav
|
||||
share/licq/sounds/fun/Chat.wav
|
||||
share/licq/sounds/fun/Contact.wav
|
||||
share/licq/sounds/fun/File.wav
|
||||
share/licq/sounds/fun/Message.wav
|
||||
share/licq/sounds/fun/Online.wav
|
||||
share/licq/sounds/fun/System.wav
|
||||
share/licq/sounds/fun/URL.wav
|
||||
@dirrm share/licq/sounds/fun
|
||||
share/licq/sounds/icq/Auth.wav
|
||||
share/licq/sounds/icq/Chat.wav
|
||||
share/licq/sounds/icq/Contact.wav
|
||||
@ -162,17 +171,6 @@ share/licq/qt-gui/icons.icq2/offline.xpm
|
||||
share/licq/qt-gui/icons.icq2/online.xpm
|
||||
share/licq/qt-gui/icons.icq2/url.xpm
|
||||
@dirrm share/licq/qt-gui/icons.icq2
|
||||
share/licq/qt-gui/icons.dots/away.xpm
|
||||
share/licq/qt-gui/icons.dots/dnd.xpm
|
||||
share/licq/qt-gui/icons.dots/dots.icons
|
||||
share/licq/qt-gui/icons.dots/message.xpm
|
||||
share/licq/qt-gui/icons.dots/na.xpm
|
||||
share/licq/qt-gui/icons.dots/occupied.xpm
|
||||
share/licq/qt-gui/icons.dots/offline.xpm
|
||||
share/licq/qt-gui/icons.dots/online.xpm
|
||||
share/licq/qt-gui/icons.dots/online.xpm.d
|
||||
share/licq/qt-gui/icons.dots/private.xpm
|
||||
@dirrm share/licq/qt-gui/icons.dots
|
||||
share/licq/qt-gui/icons.icq/away.ppm
|
||||
share/licq/qt-gui/icons.icq/dnd.ppm
|
||||
share/licq/qt-gui/icons.icq/icq.icons
|
||||
@ -201,57 +199,58 @@ share/licq/qt-gui/skin.basic/basic.skin
|
||||
@dirrm share/licq/qt-gui/skin.basic
|
||||
share/licq/qt-gui/skin.basic-ncb/basic-ncb.skin
|
||||
@dirrm share/licq/qt-gui/skin.basic-ncb
|
||||
share/licq/qt-gui/skin.bheart/Frame.xpm
|
||||
share/licq/qt-gui/skin.bheart/Frame.png
|
||||
share/licq/qt-gui/skin.bheart/MenuButtonDown.png
|
||||
share/licq/qt-gui/skin.bheart/MenuButtonUp.png
|
||||
share/licq/qt-gui/skin.bheart/MenuButtonlight.png
|
||||
share/licq/qt-gui/skin.bheart/README
|
||||
share/licq/qt-gui/skin.bheart/bheart.skin
|
||||
@dirrm share/licq/qt-gui/skin.bheart
|
||||
share/licq/qt-gui/skin.compact/button.xpm
|
||||
share/licq/qt-gui/skin.compact/button.png
|
||||
share/licq/qt-gui/skin.compact/compact.skin
|
||||
share/licq/qt-gui/skin.compact/frame.gif
|
||||
share/licq/qt-gui/skin.compact/msg.xpm
|
||||
share/licq/qt-gui/skin.compact/status.xpm
|
||||
share/licq/qt-gui/skin.compact/frame.png
|
||||
share/licq/qt-gui/skin.compact/msg.png
|
||||
share/licq/qt-gui/skin.compact/status.png
|
||||
@dirrm share/licq/qt-gui/skin.compact
|
||||
share/licq/qt-gui/skin.dim/Frame.gif
|
||||
share/licq/qt-gui/skin.dim/Label-small.xpm
|
||||
share/licq/qt-gui/skin.dim/Label.xpm
|
||||
share/licq/qt-gui/skin.dim/MenuDown.xpm
|
||||
share/licq/qt-gui/skin.dim/MenuUpFocus.xpm
|
||||
share/licq/qt-gui/skin.dim/MenuUpNoFocus.xpm
|
||||
share/licq/qt-gui/skin.dim/Status.xpm
|
||||
share/licq/qt-gui/skin.dim/Frame.png
|
||||
share/licq/qt-gui/skin.dim/Label-small.png
|
||||
share/licq/qt-gui/skin.dim/MenuDown.png
|
||||
share/licq/qt-gui/skin.dim/MenuUpFocus.png
|
||||
share/licq/qt-gui/skin.dim/MenuUpNoFocus.png
|
||||
share/licq/qt-gui/skin.dim/Status.png
|
||||
share/licq/qt-gui/skin.dim/dim.skin
|
||||
share/licq/qt-gui/skin.dim/mask.gif
|
||||
share/licq/qt-gui/skin.dim/mask.png
|
||||
@dirrm share/licq/qt-gui/skin.dim
|
||||
share/licq/qt-gui/skin.e/butMenu.xpm
|
||||
share/licq/qt-gui/skin.e/butMenuDown.xpm
|
||||
share/licq/qt-gui/skin.e/butMenuFocus.xpm
|
||||
share/licq/qt-gui/skin.e/butMenu.png
|
||||
share/licq/qt-gui/skin.e/butMenuDown.png
|
||||
share/licq/qt-gui/skin.e/butMenuFocus.png
|
||||
share/licq/qt-gui/skin.e/e.skin
|
||||
share/licq/qt-gui/skin.e/frame.gif
|
||||
share/licq/qt-gui/skin.e/msg.xpm
|
||||
share/licq/qt-gui/skin.e/status.xpm
|
||||
share/licq/qt-gui/skin.e/frame.png
|
||||
share/licq/qt-gui/skin.e/msg.png
|
||||
share/licq/qt-gui/skin.e/status.png
|
||||
@dirrm share/licq/qt-gui/skin.e
|
||||
share/licq/qt-gui/skin.gradient/background.gif
|
||||
share/licq/qt-gui/skin.gradient/buttonLowered.xpm
|
||||
share/licq/qt-gui/skin.gradient/buttonRaised.xpm
|
||||
share/licq/qt-gui/skin.gradient/background.png
|
||||
share/licq/qt-gui/skin.gradient/buttonLowered.png
|
||||
share/licq/qt-gui/skin.gradient/buttonRaised.png
|
||||
share/licq/qt-gui/skin.gradient/gradient.skin
|
||||
share/licq/qt-gui/skin.gradient/msg.xpm
|
||||
share/licq/qt-gui/skin.gradient/status.xpm
|
||||
share/licq/qt-gui/skin.gradient/msg.png
|
||||
share/licq/qt-gui/skin.gradient/status.png
|
||||
@dirrm share/licq/qt-gui/skin.gradient
|
||||
share/licq/qt-gui/skin.icq/icq.skin
|
||||
@dirrm share/licq/qt-gui/skin.icq
|
||||
share/licq/qt-gui/skin.pli/Frame.gif
|
||||
share/licq/qt-gui/skin.pli/MenuButtonDown.xpm
|
||||
share/licq/qt-gui/skin.pli/MenuButtonUp.xpm
|
||||
share/licq/qt-gui/skin.icq-ncb/icq-ncb.skin
|
||||
@dirrm share/licq/qt-gui/skin.icq-ncb
|
||||
share/licq/qt-gui/skin.pli/Frame.png
|
||||
share/licq/qt-gui/skin.pli/MenuButtonDown.png
|
||||
share/licq/qt-gui/skin.pli/MenuButtonUp.png
|
||||
share/licq/qt-gui/skin.pli/pli.skin
|
||||
@dirrm share/licq/qt-gui/skin.pli
|
||||
share/licq/qt-gui/skin.shale/butMenu.xpm
|
||||
share/licq/qt-gui/skin.shale/butMenuDown.xpm
|
||||
share/licq/qt-gui/skin.shale/butMenuFocus.xpm
|
||||
share/licq/qt-gui/skin.shale/frame.gif
|
||||
share/licq/qt-gui/skin.shale/butMenu.png
|
||||
share/licq/qt-gui/skin.shale/butMenuDown.png
|
||||
share/licq/qt-gui/skin.shale/butMenuFocus.png
|
||||
share/licq/qt-gui/skin.shale/frame.png
|
||||
share/licq/qt-gui/skin.shale/shale.skin
|
||||
share/licq/qt-gui/skin.shale/status.xpm
|
||||
share/licq/qt-gui/skin.shale/status.png
|
||||
@dirrm share/licq/qt-gui/skin.shale
|
||||
@dirrm share/licq/qt-gui
|
||||
share/licq/contrib/licq.gicqconvert
|
||||
|
Loading…
x
Reference in New Issue
Block a user