- Update for 1.0.4

licq
licq-console (no changes)
licq-qt-gui

Protocol changed on Server.
licq-1.0.3 does not work corectlly, messages are lost.

problems fixed:
- program_transform_name installed the binaray as:
        /usr/local/bin/i386--freebsd4.4-licq
- configure seeks now a qt-mt itself,
  but the options for "ac_qt_libraries" are not processed
- use ob BZIP2 as compressor.

6 files changed, 29 insertions, 18 deletions

diff --git a/net/licq-devel/Makefile.inc b/net/licq-devel/Makefile.inc
index 5cea43e6b04c..5efe120b1617 100644
--- a/net/licq-devel/Makefile.inc
+++ b/net/licq-devel/Makefile.inc
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=		licq-
-LICQ_VER=		1.0.3
+LICQ_VER=		1.0.4
 QT_LICQ_VER=		${LICQ_VER}
-RMS_LICQ_VER=		0.22
-CONSOLE_LICQ_VER=	1.0.2
-AUTO_REPLY_LICQ_VER=	1.0.1
+RMS_LICQ_VER=		0.23
+CONSOLE_LICQ_VER=	1.0.4
+AUTO_REPLY_LICQ_VER=	1.0.2
 FORWARDER_LICQ_VER=	1.0.1
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${PORTSDIR}/net/licq
@@ -18,11 +18,12 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
 			ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/
 MASTER_SITE_SUBDIR=	licq
 DISTNAME=		${PKGNAMEPREFIX}${LICQ_VER}
-DISTFILES=		${DISTNAME}.tar.gz
+DISTFILES=		${DISTNAME}.tar.bz2
 GNU_CONFIGURE=		yes
 MD5_FILE=		${PORTSDIR}/net/licq/distinfo
 # USE_LIBTOOL doesn't work for these ports
 #USE_LIBTOOL=		yes
 USE_GMAKE=		yes
 USE_NEWGCC=		yes
+USE_BZIP2=		yes
 WRKSRC?=		${WRKDIR}/${DISTNAME}/plugins/${PORTNAME}-${PORTVERSION}
diff --git a/net/licq-devel/distinfo b/net/licq-devel/distinfo
index 9e8c439fb449..07ec3269d3b8 100644
--- a/net/licq-devel/distinfo
+++ b/net/licq-devel/distinfo
@@ -1 +1 @@
-MD5 (licq-1.0.3.tar.gz) = 894d7c27c0799c8b31dda134fe14b257
+MD5 (licq-1.0.4.tar.bz2) = df3e50c1b03aa0cf2ecd1c27af3588e7
diff --git a/net/licq-qt-gui/Makefile b/net/licq-qt-gui/Makefile
index ff8d23a1bd0f..7b88e3d6e68b 100644
--- a/net/licq-qt-gui/Makefile
+++ b/net/licq-qt-gui/Makefile
@@ -18,12 +18,9 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
 
 post-patch:
-	@${PERL5} -pi -e 's|0777|0755|g;' \
-		-e 's|-lqt|-lqt2-mt|g' ${WRKSRC}/share/Makefile.am
-	@${PERL5} -pi -e 's|libqt.so.2|libqt2-mt.so.4|g;' \
-		-e 's|libqt.so|libqt2-mt.so|g;' ${WRKSRC}/acinclude.m4
-	@${PERL5} -pi -e 's|-lqt|-lqt2|g;' ${WRKSRC}/src/Makefile.am \
-		${WRKSRC}/src/Makefile.in
+	@${PERL5} -pi -e 's|libqt-mt.so.2|libqt2-mt.so.4|g;' \
+		-e 's|-lqt-mt|-lqt2-mt|g;' -e 's|libqt.so|libqt2.so|g;' \
+		-e 's|-lqt$$|-lqt2|g;' ${WRKSRC}/acinclude.m4
 
 pre-configure:
 	@(cd ${WRKSRC} && ${ACLOCAL})
diff --git a/net/licq-qt-gui/files/patch-acinclude.m4 b/net/licq-qt-gui/files/patch-acinclude.m4
new file mode 100644
index 000000000000..bf62ccb830a0
--- /dev/null
+++ b/net/licq-qt-gui/files/patch-acinclude.m4
@@ -0,0 +1,12 @@
+--- acinclude.m4.orig	Tue Jan  1 09:39:27 2002
++++ acinclude.m4	Tue Jan  1 09:50:18 2002
+@@ -68,6 +68,9 @@
+           fi
+         done
+       fi
++    else
++      ac_qt_libname=-lqt2-mt
++      ac_qt_libdir=$ac_qt_libraries
+     fi
+ 
+     ac_cv_lib_qtlib="ac_qt_libname=$ac_qt_libname ac_qt_libdir=$ac_qt_libdir"
diff --git a/net/licq/Makefile.inc b/net/licq/Makefile.inc
index 5cea43e6b04c..5efe120b1617 100644
--- a/net/licq/Makefile.inc
+++ b/net/licq/Makefile.inc
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=		licq-
-LICQ_VER=		1.0.3
+LICQ_VER=		1.0.4
 QT_LICQ_VER=		${LICQ_VER}
-RMS_LICQ_VER=		0.22
-CONSOLE_LICQ_VER=	1.0.2
-AUTO_REPLY_LICQ_VER=	1.0.1
+RMS_LICQ_VER=		0.23
+CONSOLE_LICQ_VER=	1.0.4
+AUTO_REPLY_LICQ_VER=	1.0.2
 FORWARDER_LICQ_VER=	1.0.1
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${PORTSDIR}/net/licq
@@ -18,11 +18,12 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
 			ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/
 MASTER_SITE_SUBDIR=	licq
 DISTNAME=		${PKGNAMEPREFIX}${LICQ_VER}
-DISTFILES=		${DISTNAME}.tar.gz
+DISTFILES=		${DISTNAME}.tar.bz2
 GNU_CONFIGURE=		yes
 MD5_FILE=		${PORTSDIR}/net/licq/distinfo
 # USE_LIBTOOL doesn't work for these ports
 #USE_LIBTOOL=		yes
 USE_GMAKE=		yes
 USE_NEWGCC=		yes
+USE_BZIP2=		yes
 WRKSRC?=		${WRKDIR}/${DISTNAME}/plugins/${PORTNAME}-${PORTVERSION}
diff --git a/net/licq/distinfo b/net/licq/distinfo
index 9e8c439fb449..07ec3269d3b8 100644
--- a/net/licq/distinfo
+++ b/net/licq/distinfo
@@ -1 +1 @@
-MD5 (licq-1.0.3.tar.gz) = 894d7c27c0799c8b31dda134fe14b257
+MD5 (licq-1.0.4.tar.bz2) = df3e50c1b03aa0cf2ecd1c27af3588e7