Update to 1.2.0a

Submitted by: fjoe,brad@brad-x.com

11 files changed, 58 insertions, 112 deletions

diff --git a/net-im/licq-console/Makefile b/net-im/licq-console/Makefile
index 9c1f9fedd155..562a44baec45 100644
--- a/net-im/licq-console/Makefile
+++ b/net-im/licq-console/Makefile
@@ -12,22 +12,14 @@ CATEGORIES=	net
 MAINTAINER=	dinoex@FreeBSD.org
 
 USE_AUTOMAKE=	yes
-
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
-
-post-configure:
-	@${PERL5} -pi -e 's|^archive_cmds=.*nostdlib.*|| ; \
-		s|^build_libtool_need_lc=.*|build_libtool_need_lc=no|' \
-		${WRKSRC}/libtool
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/licq_console.conf \
-		${PREFIX}/etc/licq_console.conf.sample
+INCDIR=		${PORTSDIR}/net
 
 .include <bsd.port.pre.mk>
 .if defined(WITH_LICQ_DEVEL)
-.include "${PORTSDIR}/net/licq-devel/Makefile.inc"
+.include "${INCDIR}/licq-devel/Makefile.inc"
 .else
-.include "${PORTSDIR}/net/licq/Makefile.inc"
+.include "${INCDIR}/licq/Makefile.inc"
 .endif
 .include <bsd.port.post.mk>
diff --git a/net-im/licq-console/pkg-plist b/net-im/licq-console/pkg-plist
index c59a99e4ef31..a22192d23e20 100644
--- a/net-im/licq-console/pkg-plist
+++ b/net-im/licq-console/pkg-plist
@@ -1,3 +1,2 @@
-etc/licq_console.conf.sample
 lib/licq/licq_console.la
 lib/licq/licq_console.so
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index 1791cd8932f4..6f3c14b2f645 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -11,26 +11,10 @@ CATEGORIES=	net
 
 MAINTAINER=	dinoex@FreeBSD.org
 
-USE_AUTOMAKE=	yes
-USE_QT_VER=	2
-
+USE_QT_VER=	3
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
-
-post-patch:
-	@${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})
-
-post-configure:
-	@(cd ${WRKSRC} && ${PERL5} am_edit)
-	@${PERL5} -pi -e 's|^archive_cmds=.*nostdlib.*|| ; \
-		s|^build_libtool_need_lc=.*|build_libtool_need_lc=no| ; \
-		s|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
-		${WRKSRC}/libtool
+INCDIR=		${PORTSDIR}/net
 
 post-install:
 	${RM} -rf ${PREFIX}/share/licq/qt-gui/locale
@@ -40,8 +24,8 @@ post-install:
 
 .include <bsd.port.pre.mk>
 .if defined(WITH_LICQ_DEVEL)
-.include "${PORTSDIR}/net/licq-devel/Makefile.inc"
+.include "${INCDIR}/licq-devel/Makefile.inc"
 .else
-.include "${PORTSDIR}/net/licq/Makefile.inc"
+.include "${INCDIR}/licq/Makefile.inc"
 .endif
 .include <bsd.port.post.mk>
diff --git a/net-im/licq-qt-gui/files/patch-acinclude.m4 b/net-im/licq-qt-gui/files/patch-acinclude.m4
deleted file mode 100644
index bf62ccb830a0..000000000000
--- a/net-im/licq-qt-gui/files/patch-acinclude.m4
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-im/licq-qt-gui/pkg-plist b/net-im/licq-qt-gui/pkg-plist
index 3f96f6e8b6fd..cb5ec2200c0b 100644
--- a/net-im/licq-qt-gui/pkg-plist
+++ b/net-im/licq-qt-gui/pkg-plist
@@ -167,6 +167,7 @@ share/licq/qt-gui/skin.shale/status.png
 @dirrm share/licq/qt-gui/icons.mark
 @dirrm share/licq/qt-gui/icons.icq2
 @dirrm share/licq/qt-gui/icons.icq
+%%LICQ_DEVEL%%@dirrm share/licq/qt-gui/icons.dots
 @dirrm share/licq/qt-gui/icons.computer
 @dirrm share/licq/qt-gui/dock.pli
 @dirrm share/licq/qt-gui/dock.kde2
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 5e9e1d290c6c..eede69776e3e 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -32,12 +32,6 @@ CONFIGURE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
 .endif
 .endif
 
-post-patch:
-	@${PERL5} -pi -e 's|<wait.h>|<sys/wait.h>|g' \
-		${WRKSRC}/src/sighandler.c
-	@${PERL5} -pi -e 's|.program_transform_name.|s,x,x,|' \
-		${WRKSRC}/src/Makefile.in
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index 5d1ad736d3ec..5862b3e094dc 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -2,25 +2,20 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=		licq-
-LICQ_VER=		1.0.4
-QT_LICQ_VER=		${LICQ_VER}
-RMS_LICQ_VER=		0.23
-CONSOLE_LICQ_VER=	1.0.4
-AUTO_REPLY_LICQ_VER=	1.0.2
-FORWARDER_LICQ_VER=	1.0.1
+LICQ_VER=		1.2.0a
+QT_LICQ_VER=		1.2.0
+RMS_LICQ_VER=		0.33
+CONSOLE_LICQ_VER=	1.2.0
+JONS_GTK_LICQ_VER=	0.20
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${PORTSDIR}/net/licq
 .endif
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
-			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/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	licq
 DISTNAME=		${PKGNAMEPREFIX}${LICQ_VER}
 DISTFILES=		${DISTNAME}.tar.bz2
 GNU_CONFIGURE=		yes
-MD5_FILE=		${PORTSDIR}/net/licq/distinfo
+MD5_FILE?=		${PORTSDIR}/net/licq/distinfo
 # USE_LIBTOOL doesn't work for these ports
 #USE_LIBTOOL=		yes
 USE_GMAKE=		yes
diff --git a/net-im/licq/distinfo b/net-im/licq/distinfo
index 07ec3269d3b8..aad2721a8dd4 100644
--- a/net-im/licq/distinfo
+++ b/net-im/licq/distinfo
@@ -1 +1 @@
-MD5 (licq-1.0.4.tar.bz2) = df3e50c1b03aa0cf2ecd1c27af3588e7
+MD5 (licq-1.2.0a.tar.bz2) = 3f977d83b36b26d1bc716be3e3336315
diff --git a/net-im/licq/files/patch-ad b/net-im/licq/files/patch-ad
deleted file mode 100644
index 7bf734c85ce6..000000000000
--- a/net-im/licq/files/patch-ad
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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>
- #include <unistd.h>
-+#include <osreldate.h>
- 
- #ifndef MSG_DONTWAIT
- #define MSG_DONTWAIT 0
-@@ -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)
-   {
-     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
-+    int sizeofSockaddr = sizeof(struct sockaddr_in);
-+#else
-+    socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
-+#endif
-   newSocket.m_nDescriptor = accept(m_nDescriptor, (struct sockaddr *)&newSocket.m_sRemoteAddr, &sizeofSockaddr);
-   newSocket.SetLocalAddress();
- }
diff --git a/net-im/licq/files/patch-socket.cpp b/net-im/licq/files/patch-socket.cpp
new file mode 100644
index 000000000000..4d39b2ff7103
--- /dev/null
+++ b/net-im/licq/files/patch-socket.cpp
@@ -0,0 +1,40 @@
+--- src/socket.cpp.orig	Tue Jul 23 12:22:13 2002
++++ src/socket.cpp	Thu Aug  8 03:07:32 2002
+@@ -13,6 +13,7 @@
+ #include <netdb.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <osreldate.h>
+ 
+ #ifdef HAVE_INET_ATON
+ #include <arpa/inet.h>
+@@ -304,6 +305,8 @@
+   // Setup the local structure
+ #ifdef USE_SOCKS5
+   int sizeofSockaddr = sizeof(struct sockaddr_in);
++#elif __FreeBSD_version < 400013
++  int sizeofSockaddr = sizeof(struct sockaddr_in);
+ #else
+   socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
+ #endif
+@@ -416,7 +419,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
+@@ -691,6 +698,8 @@
+ void TCPSocket::RecvConnection(TCPSocket &newSocket)
+ {
+ #ifdef USE_SOCKS5
++  int sizeofSockaddr = sizeof(struct sockaddr_in);
++#elif __FreeBSD_version < 400013
+   int sizeofSockaddr = sizeof(struct sockaddr_in);
+ #else
+   socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
diff --git a/net-im/licq/pkg-plist b/net-im/licq/pkg-plist
index ae5ddc74ce01..6876b88d1359 100644
--- a/net-im/licq/pkg-plist
+++ b/net-im/licq/pkg-plist
@@ -21,7 +21,7 @@ include/licq/licq_onevent.h
 include/licq/licq_packets.h
 include/licq/licq_plugin.h
 include/licq/licq_plugind.h
-include/licq/licq_remoteserver.h
+include/licq/licq_proxy.h
 include/licq/licq_sar.h
 include/licq/licq_sighandler.h
 include/licq/licq_socket.h
@@ -78,6 +78,7 @@ share/licq/translations/SWEDISH
 share/licq/translations/SWEDISH_NAMES
 share/licq/translations/SWEDISH_NAMES_COM
 share/licq/translations/SWISS
+share/licq/translations/UKRAINIAN_WIN
 share/licq/translations/UNITED_KINGDOM
 share/licq/translations/UNITED_KINGDOM_COM
 share/licq/utilities/BackOrifice.utility