Revert to 0.85 as several people report instability with the new version,

and I notice it sometimes, too.

7 files changed, 164 insertions, 119 deletions

diff --git a/net/licq/Makefile b/net/licq/Makefile
index 1fce80d..c18f7a4 100644
--- a/net/licq/Makefile
+++ b/net/licq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	licq
-PORTVERSION=	1.0
+PORTVERSION=	0.85
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.wibble.net/pub/licq/srcs/ \
@@ -14,13 +14,13 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.fanfic.org/pub/licq/srcs/ \
 		ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	green@FreeBSD.org
 
 BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake
-LIB_DEPENDS=	qt2:${PORTSDIR}/x11-toolkits/qt22
 
-#USE_QT2=	yes
+USE_QT2=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
 USE_NEWGCC=     yes
@@ -29,10 +29,13 @@ USE_PERL5=      yes
 
 CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/qt2
 CONFIGURE_TARGET= $(ARCH)-unknown-freebsdelf$(OSREL)
+DATANAME=       licq-data-1.6
+DATAFILES=	${DATANAME}${EXTRACT_SUFX}
+DATADIR=	${WRKDIR}/${DATANAME}
 
 post-configure:
-	@(cd ${WRKSRC}/plugins/qt-gui-1.0 && ${AUTOCONF})
-	@(cd ${WRKSRC}/plugins/qt-gui-1.0 && \
+	@(cd ${WRKSRC}/plugins/qt-gui && ${AUTOCONF})
+	@(cd ${WRKSRC}/plugins/qt-gui && \
 		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	    INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
@@ -49,7 +52,7 @@ post-configure:
 		fi)
 
 post-build:
-	@(cd ${WRKSRC}/plugins/qt-gui-1.0; \
+	@(cd ${WRKSRC}/plugins/qt-gui;\
 	   ${SETENV} ${MAKE_ENV} \
 	   ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
@@ -58,10 +61,22 @@ pre-install:
 	${MKDIR} -m 700 ${PREFIX}/share/licq
 
 post-install:
-	cd ${WRKSRC}/plugins/qt-gui-1.0; \
+	strip ${PREFIX}/bin/licq
+	cd ${WRKSRC}/plugins/qt-gui;\
 	   ${SETENV} ${MAKE_ENV} \
 	   ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
+	${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
 	${CHMOD} -R a-w ${PREFIX}/share/licq
-	${CHMOD} 755 ${PREFIX}/share/licq
+	${CHMOD} 555 ${PREFIX}/share/licq
 
 .include <bsd.port.mk>
diff --git a/net/licq/distinfo b/net/licq/distinfo
index 1b81efe..4619492 100644
--- a/net/licq/distinfo
+++ b/net/licq/distinfo
@@ -1 +1,2 @@
-MD5 (licq-1.0.tar.gz) = c75271d7b8ee57060d617e9a4e6a0375
+MD5 (licq-0.85.tar.gz) = abbde101ac967755d07c025e3ab45068
+MD5 (licq-data-1.6.tar.gz) = f94b39990e20c97713562a4e12bb2d50
diff --git a/net/licq/files/patch-aa b/net/licq/files/patch-aa
index 2e19963..fd53298 100644
--- a/net/licq/files/patch-aa
+++ b/net/licq/files/patch-aa
@@ -1,5 +1,5 @@
---- plugins/qt-gui-1.0/configure.in.orig	Wed Aug  9 14:07:59 2000
-+++ plugins/qt-gui-1.0/configure.in	Wed Aug  9 14:15:46 2000
+--- plugins/qt-gui/configure.in.orig	Wed Aug  9 14:07:59 2000
++++ plugins/qt-gui/configure.in	Wed Aug  9 14:15:46 2000
 @@ -51,8 +51,6 @@
  LICQ_CHECK_X11HEADERS
  
diff --git a/net/licq/files/patch-ab b/net/licq/files/patch-ab
index a505fb0..852716c 100644
--- a/net/licq/files/patch-ab
+++ b/net/licq/files/patch-ab
@@ -1,5 +1,5 @@
---- plugins/qt-gui-1.0/acinclude.m4.in.orig	Sun Jun 18 06:20:57 2000
-+++ plugins/qt-gui-1.0/acinclude.m4.in	Mon Jul 24 03:09:28 2000
+--- 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
  
diff --git a/net/licq/files/patch-ac b/net/licq/files/patch-ac
index 0937c9b..d24dbe1 100644
--- a/net/licq/files/patch-ac
+++ b/net/licq/files/patch-ac
@@ -1,5 +1,5 @@
---- plugins/qt-gui-1.0/src/Makefile.in.orig	Tue Jul 11 18:54:27 2000
-+++ plugins/qt-gui-1.0/src/Makefile.in	Mon Jul 24 03:12:25 2000
+--- 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)
diff --git a/net/licq/files/patch-ae b/net/licq/files/patch-ae
index 5575ef0..e480062 100644
--- a/net/licq/files/patch-ae
+++ b/net/licq/files/patch-ae
@@ -1,11 +1,11 @@
---- plugins/qt-gui-1.0/aclocal.m4.orig	Tue Oct 10 16:52:41 2000
-+++ plugins/qt-gui-1.0/aclocal.m4	Sun Oct 15 17:51:04 2000
+--- plugins/qt-gui/aclocal.m4.orig	Wed Jul 12 05:54:25 2000
++++ plugins/qt-gui/aclocal.m4	Mon Sep 25 14:45:24 2000
 @@ -59,7 +59,7 @@
        fi
  
        for qt_dir in $qt_library_dirs; do
 -        for qt_check_lib in $qt_dir/libqt.so.2; do
-+        for qt_check_lib in $qt_dir/libqt2.so.*; do
++        for qt_check_lib in $qt_dir/libqt2.so.4; do
            if test -r $qt_check_lib; then
              ac_qt_libraries=$qt_dir
              break 2
diff --git a/net/licq/pkg-plist b/net/licq/pkg-plist
index 95f0a8f..ff0d097 100644
--- a/net/licq/pkg-plist
+++ b/net/licq/pkg-plist
@@ -1,36 +1,6 @@
 bin/licq
-bin/viewurl-lynx.sh
-bin/viewurl-ncftp.sh
-bin/viewurl-netscape.sh
-bin/viewurl-w3m.sh
-include/licq/licq_buffer.h
-include/licq/licq_icq.h
-include/licq/licq_remoteserver.h
-include/licq/licq_chat.h
-include/licq/licq_icqd.h
-include/licq/licq_sar.h
-include/licq/licq_constants.h
-include/licq/licq_languagecodes.h
-include/licq/licq_sighandler.h
-include/licq/licq_countrycodes.h
-include/licq/licq_log.h
-include/licq/licq_socket.h
-include/licq/licq_events.h
-include/licq/licq_message.h
-include/licq/licq_translate.h
-include/licq/licq_file.h
-include/licq/licq_onevent.h
-include/licq/licq_user.h
-include/licq/licq_filetransfer.h
-include/licq/licq_packets.h
-include/licq/licq_utility.h
-include/licq/licq_history.h
-include/licq/licq_plugin.h
-include/licq/pthread_rdwr.h
-include/licq/licq_plugind.h
-@dirrm include/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
@@ -83,7 +53,6 @@ share/licq/translations/SWISS
 share/licq/translations/UNITED_KINGDOM
 share/licq/translations/UNITED_KINGDOM_COM
 @dirrm share/licq/translations
-share/licq/sounds/Monty-Python.wav
 share/licq/sounds/fun/Auth.wav
 share/licq/sounds/fun/Chat.wav
 share/licq/sounds/fun/Contact.wav
@@ -102,76 +71,19 @@ share/licq/sounds/icq/Online.wav
 share/licq/sounds/icq/System.wav
 share/licq/sounds/icq/URL.wav
 @dirrm share/licq/sounds/icq
+share/licq/sounds/Monty-Python.wav
 @dirrm share/licq/sounds
 share/licq/qt-gui/locale/cs_CZ.qm
 share/licq/qt-gui/locale/de.qm
 share/licq/qt-gui/locale/es.qm
-share/licq/qt-gui/locale/fr.qm
 share/licq/qt-gui/locale/it.qm
 share/licq/qt-gui/locale/pl.qm
 share/licq/qt-gui/locale/pt.qm
 share/licq/qt-gui/locale/ru_RU.KOI8-R.qm
-share/licq/qt-gui/locale/sv.qm
 share/licq/qt-gui/locale/ru.qm
 share/licq/qt-gui/locale/cs.qm
+share/licq/qt-gui/locale/sv.qm
 @dirrm share/licq/qt-gui/locale
-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.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.png
-share/licq/qt-gui/skin.compact/compact.skin
-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.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.png
-@dirrm share/licq/qt-gui/skin.dim
-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.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.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.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.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.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.png
-@dirrm share/licq/qt-gui/skin.shale
 share/licq/qt-gui/dock.console/away.xpm
 share/licq/qt-gui/dock.console/bothmsg.xpm
 share/licq/qt-gui/dock.console/console.dock
@@ -246,16 +158,6 @@ 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/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.icq2/away.xpm
 share/licq/qt-gui/icons.icq2/chat.xpm
 share/licq/qt-gui/icons.icq2/dnd.xpm
@@ -270,6 +172,16 @@ 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.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
@@ -284,5 +196,122 @@ 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.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.png
+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.png
+share/licq/qt-gui/skin.compact/compact.skin
+share/licq/qt-gui/skin.compact/frame.png
+share/licq/qt-gui/skin.compact/msg.png
+share/licq/qt-gui/skin.compact/status.png
+share/licq/qt-gui/skin.compact/button.xpm
+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.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.png
+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/mask.gif
+@dirrm share/licq/qt-gui/skin.dim
+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.png
+share/licq/qt-gui/skin.e/msg.png
+share/licq/qt-gui/skin.e/status.png
+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/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.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.png
+share/licq/qt-gui/skin.gradient/status.png
+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/msg.xpm
+share/licq/qt-gui/skin.gradient/status.xpm
+@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.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
+share/licq/qt-gui/skin.pli/Frame.gif
+share/licq/qt-gui/skin.pli/MenuButtonDown.xpm
+share/licq/qt-gui/skin.pli/MenuButtonUp.xpm
+@dirrm share/licq/qt-gui/skin.pli
+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.png
+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/status.xpm
+@dirrm share/licq/qt-gui/skin.shale
+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
 @dirrm share/licq/qt-gui
+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
 @dirrm share/licq