diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index d6d03b944342..83f5fcaa9bf6 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -1,32 +1,58 @@ # New ports collection makefile for: licq -# Version required: 0.61 +# Version required: 0.75.3a # Date created: 2 July 1998 # Whom: Brian Feldman # # $FreeBSD$ # -DISTNAME= licq-0.61 +DISTNAME= licq-0.75.3a CATEGORIES= net MASTER_SITES= ftp://ftp.wibble.net/pub/licq/srcs/ \ ftp://licq.darkorb.net/srcs/ \ ftp://ftp.fanfic.org/pub/licq/srcs/ \ ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= green@FreeBSD.org -USE_QT= yes +BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake +USE_QT2= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_AUTOCONF= yes +USE_NEWGCC= yes +USE_PERL5= yes -MAN1= licq.1 +DATANAME= licq-data-1.5 +DATAFILES= ${DATANAME}${EXTRACT_SUFX} +DATADIR= ${WRKDIR}/${DATANAME} + +post-configure: + @(cd ${WRKSRC}/plugins/qt-gui; ./configure --prefix=${PREFIX}) + +post-build: + @(cd ${WRKSRC}/plugins/qt-gui;\ + ${SETENV} ${MAKE_ENV} \ + ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) post-install: - @${MKDIR} ${PREFIX}/share/licq - @${CP} ${WRKSRC}/contrib/licq.* ${WRKSRC}/contrib/viewurl* \ - ${PREFIX}/share/licq - @${CHMOD} 555 ${PREFIX}/share/licq/* - @${CHOWN} bin.bin ${PREFIX}/share/licq/* + strip ${PREFIX}/bin/licq + 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 + ${MKDIR} ${PREFIX}/share/licq/sounds/icq + ${INSTALL_DATA} ${DATADIR}/sounds/*.wav ${PREFIX}/share/licq/sounds + ${INSTALL_DATA} ${DATADIR}/sounds/icq/*.wav ${PREFIX}/share/licq/sounds/icq + ${MKDIR} ${PREFIX}/share/licq/translations + ${INSTALL_DATA} ${DATADIR}/translations/* ${PREFIX}/share/licq/translations + ${MKDIR} ${PREFIX}/share/licq/qt-gui + cd ${DATADIR}/qt-gui && ${TAR} -chf - * | \ + ${TAR} -xf - -C ${PREFIX}/share/licq/qt-gui .include diff --git a/net-im/licq/distinfo b/net-im/licq/distinfo index cd5cbb74aa42..e189dbdcbea6 100644 --- a/net-im/licq/distinfo +++ b/net-im/licq/distinfo @@ -1 +1,2 @@ -MD5 (licq-0.61.tar.gz) = 5abfb71ab1dcd45ca6f349d5e0dd26a1 +MD5 (licq-0.75.3a.tar.gz) = 4f189740c1c542c2efbbe1c4140bf349 +MD5 (licq-data-1.5.tar.gz) = 2b94827b02ae4df962744c36d1ff75da diff --git a/net-im/licq/files/patch-aa b/net-im/licq/files/patch-aa index 41d231f474bb..2a5bd5ffe26b 100644 --- a/net-im/licq/files/patch-aa +++ b/net-im/licq/files/patch-aa @@ -1,22 +1,55 @@ ---- src/messagebox.cpp.old Tue Mar 9 15:42:14 1999 -+++ src/messagebox.cpp Tue Mar 9 15:42:55 1999 -@@ -67,7 +67,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); +--- plugins/qt-gui/configure.orig Tue Feb 8 16:14:18 2000 ++++ plugins/qt-gui/configure Tue Feb 8 16:15:42 2000 +@@ -3966,7 +3966,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.2; do + if test -r $qt_check_lib; then + ac_qt_libraries=$qt_dir + break 2 +@@ -3987,7 +3987,7 @@ + have_qt_lib="yes" + fi + +- output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt.so* | grep QCString"` ++ output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt2.so* | grep QCString"` + if test -z "$output"; then + { echo "configure: error: The Qt lib directory + $ac_cv_lib_qtlib +@@ -4050,6 +4050,7 @@ + /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" + +@@ -4113,7 +4114,7 @@ + + + # 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:4119: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then +@@ -4137,7 +4138,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 +@@ -4152,7 +4153,7 @@ + + + if test -z "$QTDIR"; then +- echo "** environment variable QTDIR is not set, moc might not be found" ++ echo "** environment variable QTDIR is not set, moc2 might not be found" + fi + - } ---- src/searchuserdlg.cpp.old Tue Mar 9 15:42:23 1999 -+++ src/searchuserdlg.cpp Tue Mar 9 15:42:48 1999 -@@ -115,7 +115,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 (btnDone, SIGNAL(clicked()), this, SLOT(accept())); diff --git a/net-im/licq/files/patch-ab b/net-im/licq/files/patch-ab index 27aee2a8cbe9..52f8640438be 100644 --- a/net-im/licq/files/patch-ab +++ b/net-im/licq/files/patch-ab @@ -1,22 +1,46 @@ ---- acconfig.h.old Wed Mar 10 10:05:47 1999 -+++ acconfig.h Wed Mar 10 10:06:26 1999 -@@ -14,7 +14,7 @@ +--- plugins/qt-gui/acinclude.m4.in.orig Mon Feb 7 23:35:22 2000 ++++ plugins/qt-gui/acinclude.m4.in Mon Feb 7 23:37:10 2000 +@@ -63,7 +63,7 @@ + fi - /* Change this to MotifStyle if you want the old-school Motif - widget look. */ --#define STYLE WindowsStyle -+#define STYLE MotifStyle + 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.2; do + if test -r $qt_check_lib; then + ac_qt_libraries=$qt_dir + break 2 +@@ -84,7 +84,7 @@ + fi - /* The name of the package we're compiling */ - #undef PACKAGE ---- config.h.in.old Wed Mar 10 10:05:53 1999 -+++ config.h.in Wed Mar 10 10:06:17 1999 -@@ -15,7 +15,7 @@ + dnl Check if we have the right lib +- output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt.so* | grep QCString"` ++ output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt2.so* | grep QCString"` + if test -z "$output"; then + AC_MSG_ERROR([The Qt lib directory + $ac_cv_lib_qtlib +@@ -132,6 +132,7 @@ + /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" - /* Change this to MotifStyle if you want the old-school Motif - widget look. */ --#define STYLE WindowsStyle -+#define STYLE MotifStyle +@@ -173,14 +174,14 @@ + [ + AC_PATH_PROG( + MOC, +- moc, +- $QTDIR/bin/moc, ++ moc2, ++ $QTDIR/bin/moc2, + $QTDIR/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH) + + AC_SUBST(MOC) + + if test -z "$QTDIR"; then +- echo "** environment variable QTDIR is not set, moc might not be found" ++ echo "** environment variable QTDIR is not set, moc2 might not be found" + fi + ]) - /* The name of the package we're compiling */ - #undef PACKAGE diff --git a/net-im/licq/files/patch-ac b/net-im/licq/files/patch-ac new file mode 100644 index 000000000000..ceb848b1776d --- /dev/null +++ b/net-im/licq/files/patch-ac @@ -0,0 +1,11 @@ +--- plugins/qt-gui/src/Makefile.in.orig Tue Feb 8 16:12:30 2000 ++++ plugins/qt-gui/src/Makefile.in Tue Feb 8 16:12:51 2000 +@@ -120,7 +120,7 @@ + + licq_qt_gui_la_LDFLAGS = $(X_LIBS) $(QT_LDFLAGS) $(KDE_LDFLAGS) -s -module -avoid-version -rpath $(libdir) + +-licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) $(KDE_LIBS) ++licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt2 $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) $(KDE_LIBS) + + + #>- METASOURCES = AUTO diff --git a/net-im/licq/pkg-plist b/net-im/licq/pkg-plist index e7c4b870db02..0b2bea64b11b 100644 --- a/net-im/licq/pkg-plist +++ b/net-im/licq/pkg-plist @@ -1,9 +1,180 @@ bin/licq -share/licq-base.tar.gz -share/licq/licq.javaconvert -share/licq/licq.micqconvert -share/licq/licq.winconvert -share/licq/viewurl-lynx.sh -share/licq/viewurl-ncftp.sh -share/licq/viewurl-netscape.sh +lib/licq/licq_qt-gui.so +lib/licq/licq_qt-gui.la +@dirrm lib/licq +share/licq/utilities/finger.utility +share/licq/utilities/ftp.utility +share/licq/utilities/hostname.utility +share/licq/utilities/netscape.utility +share/licq/utilities/nmap.utility +share/licq/utilities/pine.utility +share/licq/utilities/ping.utility +share/licq/utilities/queso.utility +share/licq/utilities/talk.utility +share/licq/utilities/vnc.utility +@dirrm share/licq/utilities +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/LATIN_2 +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/translations +share/licq/sounds/icq/chat.wav +share/licq/sounds/icq/file.wav +share/licq/sounds/icq/message.wav +share/licq/sounds/icq/notify.wav +share/licq/sounds/icq/system.wav +share/licq/sounds/icq/url.wav +@dirrm share/licq/sounds/icq +share/licq/sounds/Monty-Python.wav +share/licq/sounds/notify.wav +@dirrm share/licq/sounds +share/licq/contrib/licq.gicqconvert +share/licq/contrib/licq.javaconvert +share/licq/contrib/licq.kicqconvert +share/licq/contrib/licq.micqconvert +share/licq/contrib/licq.winconvert +share/licq/contrib/licq.winconvert98 +share/licq/contrib/licq.winconvert99a +share/licq/contrib/licq.winconvert99b +share/licq/contrib/licq.zicqconvert +share/licq/contrib/RecreateUserList.sh +share/licq/contrib/gnome-menu-install.sh +share/licq/contrib/remove-null.sh +share/licq/contrib/viewurl-lynx.sh +share/licq/contrib/viewurl-ncftp.sh +share/licq/contrib/viewurl-netscape.sh +share/licq/contrib/viewurl-w3m.sh +@dirrm share/licq/contrib +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 +share/licq/qt-gui/icons.icq/message.ppm +share/licq/qt-gui/icons.icq/na.ppm +share/licq/qt-gui/icons.icq/occupied.ppm +share/licq/qt-gui/icons.icq/offline.ppm +share/licq/qt-gui/icons.icq/online.ppm +share/licq/qt-gui/icons.icq/private.ppm +@dirrm share/licq/qt-gui/icons.icq +share/licq/qt-gui/icons.mark/away.ppm +share/licq/qt-gui/icons.mark/chat.ppm +share/licq/qt-gui/icons.mark/dnd.ppm +share/licq/qt-gui/icons.mark/ffc.ppm +share/licq/qt-gui/icons.mark/file.ppm +share/licq/qt-gui/icons.mark/mark.icons +share/licq/qt-gui/icons.mark/message.ppm +share/licq/qt-gui/icons.mark/na.ppm +share/licq/qt-gui/icons.mark/occupied.ppm +share/licq/qt-gui/icons.mark/offline.ppm +share/licq/qt-gui/icons.mark/online.ppm +share/licq/qt-gui/icons.mark/private.ppm +share/licq/qt-gui/icons.mark/url.ppm +@dirrm share/licq/qt-gui/icons.mark +share/licq/qt-gui/skin.bheart/Frame.xpm +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/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 +@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/dim.skin +share/licq/qt-gui/skin.dim/mask.gif +@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/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 +@dirrm share/licq/qt-gui/skin.e +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.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/shale.skin +share/licq/qt-gui/skin.shale/status.xpm +@dirrm share/licq/qt-gui/skin.shale + +share/licq/qt-gui/skin.basic/basic.skin +@dirrm share/licq/qt-gui/skin.basic +share/licq/qt-gui/skin.icq/icq.skin +@dirrm share/licq/qt-gui/skin.icq +share/licq/qt-gui/icons.computer/chat.xpm +share/licq/qt-gui/icons.computer/chess.xpm +share/licq/qt-gui/icons.computer/computer.icons +share/licq/qt-gui/icons.computer/cross.xpm +share/licq/qt-gui/icons.computer/ffchat.xpm +share/licq/qt-gui/icons.computer/file.xpm +share/licq/qt-gui/icons.computer/lock.xpm +share/licq/qt-gui/icons.computer/message.xpm +share/licq/qt-gui/icons.computer/offline.xpm +share/licq/qt-gui/icons.computer/online.xpm +share/licq/qt-gui/icons.computer/private.xpm +share/licq/qt-gui/icons.computer/sign.xpm +share/licq/qt-gui/icons.computer/url.xpm +@dirrm share/licq/qt-gui/icons.computer +share/licq/qt-gui/locale/de.qm +share/licq/qt-gui/locale/es.qm +share/licq/qt-gui/locale/ru_RU.KOI8-R.qm +@dirrm share/licq/qt-gui/locale +@dirrm share/licq/qt-gui @dirrm share/licq diff --git a/net/licq-devel/Makefile b/net/licq-devel/Makefile index d6d03b944342..83f5fcaa9bf6 100644 --- a/net/licq-devel/Makefile +++ b/net/licq-devel/Makefile @@ -1,32 +1,58 @@ # New ports collection makefile for: licq -# Version required: 0.61 +# Version required: 0.75.3a # Date created: 2 July 1998 # Whom: Brian Feldman # # $FreeBSD$ # -DISTNAME= licq-0.61 +DISTNAME= licq-0.75.3a CATEGORIES= net MASTER_SITES= ftp://ftp.wibble.net/pub/licq/srcs/ \ ftp://licq.darkorb.net/srcs/ \ ftp://ftp.fanfic.org/pub/licq/srcs/ \ ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= green@FreeBSD.org -USE_QT= yes +BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake +USE_QT2= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_AUTOCONF= yes +USE_NEWGCC= yes +USE_PERL5= yes -MAN1= licq.1 +DATANAME= licq-data-1.5 +DATAFILES= ${DATANAME}${EXTRACT_SUFX} +DATADIR= ${WRKDIR}/${DATANAME} + +post-configure: + @(cd ${WRKSRC}/plugins/qt-gui; ./configure --prefix=${PREFIX}) + +post-build: + @(cd ${WRKSRC}/plugins/qt-gui;\ + ${SETENV} ${MAKE_ENV} \ + ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) post-install: - @${MKDIR} ${PREFIX}/share/licq - @${CP} ${WRKSRC}/contrib/licq.* ${WRKSRC}/contrib/viewurl* \ - ${PREFIX}/share/licq - @${CHMOD} 555 ${PREFIX}/share/licq/* - @${CHOWN} bin.bin ${PREFIX}/share/licq/* + strip ${PREFIX}/bin/licq + 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 + ${MKDIR} ${PREFIX}/share/licq/sounds/icq + ${INSTALL_DATA} ${DATADIR}/sounds/*.wav ${PREFIX}/share/licq/sounds + ${INSTALL_DATA} ${DATADIR}/sounds/icq/*.wav ${PREFIX}/share/licq/sounds/icq + ${MKDIR} ${PREFIX}/share/licq/translations + ${INSTALL_DATA} ${DATADIR}/translations/* ${PREFIX}/share/licq/translations + ${MKDIR} ${PREFIX}/share/licq/qt-gui + cd ${DATADIR}/qt-gui && ${TAR} -chf - * | \ + ${TAR} -xf - -C ${PREFIX}/share/licq/qt-gui .include diff --git a/net/licq-devel/distinfo b/net/licq-devel/distinfo index cd5cbb74aa42..e189dbdcbea6 100644 --- a/net/licq-devel/distinfo +++ b/net/licq-devel/distinfo @@ -1 +1,2 @@ -MD5 (licq-0.61.tar.gz) = 5abfb71ab1dcd45ca6f349d5e0dd26a1 +MD5 (licq-0.75.3a.tar.gz) = 4f189740c1c542c2efbbe1c4140bf349 +MD5 (licq-data-1.5.tar.gz) = 2b94827b02ae4df962744c36d1ff75da diff --git a/net/licq-devel/files/patch-aa b/net/licq-devel/files/patch-aa index 41d231f474bb..2a5bd5ffe26b 100644 --- a/net/licq-devel/files/patch-aa +++ b/net/licq-devel/files/patch-aa @@ -1,22 +1,55 @@ ---- src/messagebox.cpp.old Tue Mar 9 15:42:14 1999 -+++ src/messagebox.cpp Tue Mar 9 15:42:55 1999 -@@ -67,7 +67,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); +--- plugins/qt-gui/configure.orig Tue Feb 8 16:14:18 2000 ++++ plugins/qt-gui/configure Tue Feb 8 16:15:42 2000 +@@ -3966,7 +3966,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.2; do + if test -r $qt_check_lib; then + ac_qt_libraries=$qt_dir + break 2 +@@ -3987,7 +3987,7 @@ + have_qt_lib="yes" + fi + +- output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt.so* | grep QCString"` ++ output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt2.so* | grep QCString"` + if test -z "$output"; then + { echo "configure: error: The Qt lib directory + $ac_cv_lib_qtlib +@@ -4050,6 +4050,7 @@ + /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" + +@@ -4113,7 +4114,7 @@ + + + # 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:4119: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then +@@ -4137,7 +4138,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 +@@ -4152,7 +4153,7 @@ + + + if test -z "$QTDIR"; then +- echo "** environment variable QTDIR is not set, moc might not be found" ++ echo "** environment variable QTDIR is not set, moc2 might not be found" + fi + - } ---- src/searchuserdlg.cpp.old Tue Mar 9 15:42:23 1999 -+++ src/searchuserdlg.cpp Tue Mar 9 15:42:48 1999 -@@ -115,7 +115,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 (btnDone, SIGNAL(clicked()), this, SLOT(accept())); diff --git a/net/licq-devel/files/patch-ab b/net/licq-devel/files/patch-ab index 27aee2a8cbe9..52f8640438be 100644 --- a/net/licq-devel/files/patch-ab +++ b/net/licq-devel/files/patch-ab @@ -1,22 +1,46 @@ ---- acconfig.h.old Wed Mar 10 10:05:47 1999 -+++ acconfig.h Wed Mar 10 10:06:26 1999 -@@ -14,7 +14,7 @@ +--- plugins/qt-gui/acinclude.m4.in.orig Mon Feb 7 23:35:22 2000 ++++ plugins/qt-gui/acinclude.m4.in Mon Feb 7 23:37:10 2000 +@@ -63,7 +63,7 @@ + fi - /* Change this to MotifStyle if you want the old-school Motif - widget look. */ --#define STYLE WindowsStyle -+#define STYLE MotifStyle + 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.2; do + if test -r $qt_check_lib; then + ac_qt_libraries=$qt_dir + break 2 +@@ -84,7 +84,7 @@ + fi - /* The name of the package we're compiling */ - #undef PACKAGE ---- config.h.in.old Wed Mar 10 10:05:53 1999 -+++ config.h.in Wed Mar 10 10:06:17 1999 -@@ -15,7 +15,7 @@ + dnl Check if we have the right lib +- output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt.so* | grep QCString"` ++ output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt2.so* | grep QCString"` + if test -z "$output"; then + AC_MSG_ERROR([The Qt lib directory + $ac_cv_lib_qtlib +@@ -132,6 +132,7 @@ + /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" - /* Change this to MotifStyle if you want the old-school Motif - widget look. */ --#define STYLE WindowsStyle -+#define STYLE MotifStyle +@@ -173,14 +174,14 @@ + [ + AC_PATH_PROG( + MOC, +- moc, +- $QTDIR/bin/moc, ++ moc2, ++ $QTDIR/bin/moc2, + $QTDIR/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH) + + AC_SUBST(MOC) + + if test -z "$QTDIR"; then +- echo "** environment variable QTDIR is not set, moc might not be found" ++ echo "** environment variable QTDIR is not set, moc2 might not be found" + fi + ]) - /* The name of the package we're compiling */ - #undef PACKAGE diff --git a/net/licq-devel/files/patch-ac b/net/licq-devel/files/patch-ac new file mode 100644 index 000000000000..ceb848b1776d --- /dev/null +++ b/net/licq-devel/files/patch-ac @@ -0,0 +1,11 @@ +--- plugins/qt-gui/src/Makefile.in.orig Tue Feb 8 16:12:30 2000 ++++ plugins/qt-gui/src/Makefile.in Tue Feb 8 16:12:51 2000 +@@ -120,7 +120,7 @@ + + licq_qt_gui_la_LDFLAGS = $(X_LIBS) $(QT_LDFLAGS) $(KDE_LDFLAGS) -s -module -avoid-version -rpath $(libdir) + +-licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) $(KDE_LIBS) ++licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt2 $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) $(KDE_LIBS) + + + #>- METASOURCES = AUTO diff --git a/net/licq-devel/pkg-plist b/net/licq-devel/pkg-plist index e7c4b870db02..0b2bea64b11b 100644 --- a/net/licq-devel/pkg-plist +++ b/net/licq-devel/pkg-plist @@ -1,9 +1,180 @@ bin/licq -share/licq-base.tar.gz -share/licq/licq.javaconvert -share/licq/licq.micqconvert -share/licq/licq.winconvert -share/licq/viewurl-lynx.sh -share/licq/viewurl-ncftp.sh -share/licq/viewurl-netscape.sh +lib/licq/licq_qt-gui.so +lib/licq/licq_qt-gui.la +@dirrm lib/licq +share/licq/utilities/finger.utility +share/licq/utilities/ftp.utility +share/licq/utilities/hostname.utility +share/licq/utilities/netscape.utility +share/licq/utilities/nmap.utility +share/licq/utilities/pine.utility +share/licq/utilities/ping.utility +share/licq/utilities/queso.utility +share/licq/utilities/talk.utility +share/licq/utilities/vnc.utility +@dirrm share/licq/utilities +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/LATIN_2 +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/translations +share/licq/sounds/icq/chat.wav +share/licq/sounds/icq/file.wav +share/licq/sounds/icq/message.wav +share/licq/sounds/icq/notify.wav +share/licq/sounds/icq/system.wav +share/licq/sounds/icq/url.wav +@dirrm share/licq/sounds/icq +share/licq/sounds/Monty-Python.wav +share/licq/sounds/notify.wav +@dirrm share/licq/sounds +share/licq/contrib/licq.gicqconvert +share/licq/contrib/licq.javaconvert +share/licq/contrib/licq.kicqconvert +share/licq/contrib/licq.micqconvert +share/licq/contrib/licq.winconvert +share/licq/contrib/licq.winconvert98 +share/licq/contrib/licq.winconvert99a +share/licq/contrib/licq.winconvert99b +share/licq/contrib/licq.zicqconvert +share/licq/contrib/RecreateUserList.sh +share/licq/contrib/gnome-menu-install.sh +share/licq/contrib/remove-null.sh +share/licq/contrib/viewurl-lynx.sh +share/licq/contrib/viewurl-ncftp.sh +share/licq/contrib/viewurl-netscape.sh +share/licq/contrib/viewurl-w3m.sh +@dirrm share/licq/contrib +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 +share/licq/qt-gui/icons.icq/message.ppm +share/licq/qt-gui/icons.icq/na.ppm +share/licq/qt-gui/icons.icq/occupied.ppm +share/licq/qt-gui/icons.icq/offline.ppm +share/licq/qt-gui/icons.icq/online.ppm +share/licq/qt-gui/icons.icq/private.ppm +@dirrm share/licq/qt-gui/icons.icq +share/licq/qt-gui/icons.mark/away.ppm +share/licq/qt-gui/icons.mark/chat.ppm +share/licq/qt-gui/icons.mark/dnd.ppm +share/licq/qt-gui/icons.mark/ffc.ppm +share/licq/qt-gui/icons.mark/file.ppm +share/licq/qt-gui/icons.mark/mark.icons +share/licq/qt-gui/icons.mark/message.ppm +share/licq/qt-gui/icons.mark/na.ppm +share/licq/qt-gui/icons.mark/occupied.ppm +share/licq/qt-gui/icons.mark/offline.ppm +share/licq/qt-gui/icons.mark/online.ppm +share/licq/qt-gui/icons.mark/private.ppm +share/licq/qt-gui/icons.mark/url.ppm +@dirrm share/licq/qt-gui/icons.mark +share/licq/qt-gui/skin.bheart/Frame.xpm +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/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 +@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/dim.skin +share/licq/qt-gui/skin.dim/mask.gif +@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/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 +@dirrm share/licq/qt-gui/skin.e +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.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/shale.skin +share/licq/qt-gui/skin.shale/status.xpm +@dirrm share/licq/qt-gui/skin.shale + +share/licq/qt-gui/skin.basic/basic.skin +@dirrm share/licq/qt-gui/skin.basic +share/licq/qt-gui/skin.icq/icq.skin +@dirrm share/licq/qt-gui/skin.icq +share/licq/qt-gui/icons.computer/chat.xpm +share/licq/qt-gui/icons.computer/chess.xpm +share/licq/qt-gui/icons.computer/computer.icons +share/licq/qt-gui/icons.computer/cross.xpm +share/licq/qt-gui/icons.computer/ffchat.xpm +share/licq/qt-gui/icons.computer/file.xpm +share/licq/qt-gui/icons.computer/lock.xpm +share/licq/qt-gui/icons.computer/message.xpm +share/licq/qt-gui/icons.computer/offline.xpm +share/licq/qt-gui/icons.computer/online.xpm +share/licq/qt-gui/icons.computer/private.xpm +share/licq/qt-gui/icons.computer/sign.xpm +share/licq/qt-gui/icons.computer/url.xpm +@dirrm share/licq/qt-gui/icons.computer +share/licq/qt-gui/locale/de.qm +share/licq/qt-gui/locale/es.qm +share/licq/qt-gui/locale/ru_RU.KOI8-R.qm +@dirrm share/licq/qt-gui/locale +@dirrm share/licq/qt-gui @dirrm share/licq diff --git a/net/licq/Makefile b/net/licq/Makefile index d6d03b944342..83f5fcaa9bf6 100644 --- a/net/licq/Makefile +++ b/net/licq/Makefile @@ -1,32 +1,58 @@ # New ports collection makefile for: licq -# Version required: 0.61 +# Version required: 0.75.3a # Date created: 2 July 1998 # Whom: Brian Feldman # # $FreeBSD$ # -DISTNAME= licq-0.61 +DISTNAME= licq-0.75.3a CATEGORIES= net MASTER_SITES= ftp://ftp.wibble.net/pub/licq/srcs/ \ ftp://licq.darkorb.net/srcs/ \ ftp://ftp.fanfic.org/pub/licq/srcs/ \ ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= green@FreeBSD.org -USE_QT= yes +BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake +USE_QT2= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_AUTOCONF= yes +USE_NEWGCC= yes +USE_PERL5= yes -MAN1= licq.1 +DATANAME= licq-data-1.5 +DATAFILES= ${DATANAME}${EXTRACT_SUFX} +DATADIR= ${WRKDIR}/${DATANAME} + +post-configure: + @(cd ${WRKSRC}/plugins/qt-gui; ./configure --prefix=${PREFIX}) + +post-build: + @(cd ${WRKSRC}/plugins/qt-gui;\ + ${SETENV} ${MAKE_ENV} \ + ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) post-install: - @${MKDIR} ${PREFIX}/share/licq - @${CP} ${WRKSRC}/contrib/licq.* ${WRKSRC}/contrib/viewurl* \ - ${PREFIX}/share/licq - @${CHMOD} 555 ${PREFIX}/share/licq/* - @${CHOWN} bin.bin ${PREFIX}/share/licq/* + strip ${PREFIX}/bin/licq + 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 + ${MKDIR} ${PREFIX}/share/licq/sounds/icq + ${INSTALL_DATA} ${DATADIR}/sounds/*.wav ${PREFIX}/share/licq/sounds + ${INSTALL_DATA} ${DATADIR}/sounds/icq/*.wav ${PREFIX}/share/licq/sounds/icq + ${MKDIR} ${PREFIX}/share/licq/translations + ${INSTALL_DATA} ${DATADIR}/translations/* ${PREFIX}/share/licq/translations + ${MKDIR} ${PREFIX}/share/licq/qt-gui + cd ${DATADIR}/qt-gui && ${TAR} -chf - * | \ + ${TAR} -xf - -C ${PREFIX}/share/licq/qt-gui .include diff --git a/net/licq/distinfo b/net/licq/distinfo index cd5cbb74aa42..e189dbdcbea6 100644 --- a/net/licq/distinfo +++ b/net/licq/distinfo @@ -1 +1,2 @@ -MD5 (licq-0.61.tar.gz) = 5abfb71ab1dcd45ca6f349d5e0dd26a1 +MD5 (licq-0.75.3a.tar.gz) = 4f189740c1c542c2efbbe1c4140bf349 +MD5 (licq-data-1.5.tar.gz) = 2b94827b02ae4df962744c36d1ff75da diff --git a/net/licq/files/patch-aa b/net/licq/files/patch-aa index 41d231f474bb..2a5bd5ffe26b 100644 --- a/net/licq/files/patch-aa +++ b/net/licq/files/patch-aa @@ -1,22 +1,55 @@ ---- src/messagebox.cpp.old Tue Mar 9 15:42:14 1999 -+++ src/messagebox.cpp Tue Mar 9 15:42:55 1999 -@@ -67,7 +67,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); +--- plugins/qt-gui/configure.orig Tue Feb 8 16:14:18 2000 ++++ plugins/qt-gui/configure Tue Feb 8 16:15:42 2000 +@@ -3966,7 +3966,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.2; do + if test -r $qt_check_lib; then + ac_qt_libraries=$qt_dir + break 2 +@@ -3987,7 +3987,7 @@ + have_qt_lib="yes" + fi + +- output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt.so* | grep QCString"` ++ output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt2.so* | grep QCString"` + if test -z "$output"; then + { echo "configure: error: The Qt lib directory + $ac_cv_lib_qtlib +@@ -4050,6 +4050,7 @@ + /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" + +@@ -4113,7 +4114,7 @@ + + + # 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:4119: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then +@@ -4137,7 +4138,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 +@@ -4152,7 +4153,7 @@ + + + if test -z "$QTDIR"; then +- echo "** environment variable QTDIR is not set, moc might not be found" ++ echo "** environment variable QTDIR is not set, moc2 might not be found" + fi + - } ---- src/searchuserdlg.cpp.old Tue Mar 9 15:42:23 1999 -+++ src/searchuserdlg.cpp Tue Mar 9 15:42:48 1999 -@@ -115,7 +115,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 (btnDone, SIGNAL(clicked()), this, SLOT(accept())); diff --git a/net/licq/files/patch-ab b/net/licq/files/patch-ab index 27aee2a8cbe9..52f8640438be 100644 --- a/net/licq/files/patch-ab +++ b/net/licq/files/patch-ab @@ -1,22 +1,46 @@ ---- acconfig.h.old Wed Mar 10 10:05:47 1999 -+++ acconfig.h Wed Mar 10 10:06:26 1999 -@@ -14,7 +14,7 @@ +--- plugins/qt-gui/acinclude.m4.in.orig Mon Feb 7 23:35:22 2000 ++++ plugins/qt-gui/acinclude.m4.in Mon Feb 7 23:37:10 2000 +@@ -63,7 +63,7 @@ + fi - /* Change this to MotifStyle if you want the old-school Motif - widget look. */ --#define STYLE WindowsStyle -+#define STYLE MotifStyle + 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.2; do + if test -r $qt_check_lib; then + ac_qt_libraries=$qt_dir + break 2 +@@ -84,7 +84,7 @@ + fi - /* The name of the package we're compiling */ - #undef PACKAGE ---- config.h.in.old Wed Mar 10 10:05:53 1999 -+++ config.h.in Wed Mar 10 10:06:17 1999 -@@ -15,7 +15,7 @@ + dnl Check if we have the right lib +- output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt.so* | grep QCString"` ++ output=`eval "objdump -C -T $ac_cv_lib_qtlib/libqt2.so* | grep QCString"` + if test -z "$output"; then + AC_MSG_ERROR([The Qt lib directory + $ac_cv_lib_qtlib +@@ -132,6 +132,7 @@ + /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" - /* Change this to MotifStyle if you want the old-school Motif - widget look. */ --#define STYLE WindowsStyle -+#define STYLE MotifStyle +@@ -173,14 +174,14 @@ + [ + AC_PATH_PROG( + MOC, +- moc, +- $QTDIR/bin/moc, ++ moc2, ++ $QTDIR/bin/moc2, + $QTDIR/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH) + + AC_SUBST(MOC) + + if test -z "$QTDIR"; then +- echo "** environment variable QTDIR is not set, moc might not be found" ++ echo "** environment variable QTDIR is not set, moc2 might not be found" + fi + ]) - /* The name of the package we're compiling */ - #undef PACKAGE diff --git a/net/licq/files/patch-ac b/net/licq/files/patch-ac new file mode 100644 index 000000000000..ceb848b1776d --- /dev/null +++ b/net/licq/files/patch-ac @@ -0,0 +1,11 @@ +--- plugins/qt-gui/src/Makefile.in.orig Tue Feb 8 16:12:30 2000 ++++ plugins/qt-gui/src/Makefile.in Tue Feb 8 16:12:51 2000 +@@ -120,7 +120,7 @@ + + licq_qt_gui_la_LDFLAGS = $(X_LIBS) $(QT_LDFLAGS) $(KDE_LDFLAGS) -s -module -avoid-version -rpath $(libdir) + +-licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) $(KDE_LIBS) ++licq_qt_gui_la_LIBADD = $(KDE_LIBS) -lqt2 $(X_PRE_LIBS) -lX11 -lXext $(XSS_LIBS) $(X_EXTRA_LIBS) $(KDE_LIBS) + + + #>- METASOURCES = AUTO diff --git a/net/licq/pkg-plist b/net/licq/pkg-plist index e7c4b870db02..0b2bea64b11b 100644 --- a/net/licq/pkg-plist +++ b/net/licq/pkg-plist @@ -1,9 +1,180 @@ bin/licq -share/licq-base.tar.gz -share/licq/licq.javaconvert -share/licq/licq.micqconvert -share/licq/licq.winconvert -share/licq/viewurl-lynx.sh -share/licq/viewurl-ncftp.sh -share/licq/viewurl-netscape.sh +lib/licq/licq_qt-gui.so +lib/licq/licq_qt-gui.la +@dirrm lib/licq +share/licq/utilities/finger.utility +share/licq/utilities/ftp.utility +share/licq/utilities/hostname.utility +share/licq/utilities/netscape.utility +share/licq/utilities/nmap.utility +share/licq/utilities/pine.utility +share/licq/utilities/ping.utility +share/licq/utilities/queso.utility +share/licq/utilities/talk.utility +share/licq/utilities/vnc.utility +@dirrm share/licq/utilities +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/LATIN_2 +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/translations +share/licq/sounds/icq/chat.wav +share/licq/sounds/icq/file.wav +share/licq/sounds/icq/message.wav +share/licq/sounds/icq/notify.wav +share/licq/sounds/icq/system.wav +share/licq/sounds/icq/url.wav +@dirrm share/licq/sounds/icq +share/licq/sounds/Monty-Python.wav +share/licq/sounds/notify.wav +@dirrm share/licq/sounds +share/licq/contrib/licq.gicqconvert +share/licq/contrib/licq.javaconvert +share/licq/contrib/licq.kicqconvert +share/licq/contrib/licq.micqconvert +share/licq/contrib/licq.winconvert +share/licq/contrib/licq.winconvert98 +share/licq/contrib/licq.winconvert99a +share/licq/contrib/licq.winconvert99b +share/licq/contrib/licq.zicqconvert +share/licq/contrib/RecreateUserList.sh +share/licq/contrib/gnome-menu-install.sh +share/licq/contrib/remove-null.sh +share/licq/contrib/viewurl-lynx.sh +share/licq/contrib/viewurl-ncftp.sh +share/licq/contrib/viewurl-netscape.sh +share/licq/contrib/viewurl-w3m.sh +@dirrm share/licq/contrib +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 +share/licq/qt-gui/icons.icq/message.ppm +share/licq/qt-gui/icons.icq/na.ppm +share/licq/qt-gui/icons.icq/occupied.ppm +share/licq/qt-gui/icons.icq/offline.ppm +share/licq/qt-gui/icons.icq/online.ppm +share/licq/qt-gui/icons.icq/private.ppm +@dirrm share/licq/qt-gui/icons.icq +share/licq/qt-gui/icons.mark/away.ppm +share/licq/qt-gui/icons.mark/chat.ppm +share/licq/qt-gui/icons.mark/dnd.ppm +share/licq/qt-gui/icons.mark/ffc.ppm +share/licq/qt-gui/icons.mark/file.ppm +share/licq/qt-gui/icons.mark/mark.icons +share/licq/qt-gui/icons.mark/message.ppm +share/licq/qt-gui/icons.mark/na.ppm +share/licq/qt-gui/icons.mark/occupied.ppm +share/licq/qt-gui/icons.mark/offline.ppm +share/licq/qt-gui/icons.mark/online.ppm +share/licq/qt-gui/icons.mark/private.ppm +share/licq/qt-gui/icons.mark/url.ppm +@dirrm share/licq/qt-gui/icons.mark +share/licq/qt-gui/skin.bheart/Frame.xpm +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/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 +@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/dim.skin +share/licq/qt-gui/skin.dim/mask.gif +@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/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 +@dirrm share/licq/qt-gui/skin.e +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.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/shale.skin +share/licq/qt-gui/skin.shale/status.xpm +@dirrm share/licq/qt-gui/skin.shale + +share/licq/qt-gui/skin.basic/basic.skin +@dirrm share/licq/qt-gui/skin.basic +share/licq/qt-gui/skin.icq/icq.skin +@dirrm share/licq/qt-gui/skin.icq +share/licq/qt-gui/icons.computer/chat.xpm +share/licq/qt-gui/icons.computer/chess.xpm +share/licq/qt-gui/icons.computer/computer.icons +share/licq/qt-gui/icons.computer/cross.xpm +share/licq/qt-gui/icons.computer/ffchat.xpm +share/licq/qt-gui/icons.computer/file.xpm +share/licq/qt-gui/icons.computer/lock.xpm +share/licq/qt-gui/icons.computer/message.xpm +share/licq/qt-gui/icons.computer/offline.xpm +share/licq/qt-gui/icons.computer/online.xpm +share/licq/qt-gui/icons.computer/private.xpm +share/licq/qt-gui/icons.computer/sign.xpm +share/licq/qt-gui/icons.computer/url.xpm +@dirrm share/licq/qt-gui/icons.computer +share/licq/qt-gui/locale/de.qm +share/licq/qt-gui/locale/es.qm +share/licq/qt-gui/locale/ru_RU.KOI8-R.qm +@dirrm share/licq/qt-gui/locale +@dirrm share/licq/qt-gui @dirrm share/licq