licq:

- Update to 1.2.3
- default config now prefix aware
- Update PKG_MESSAGE for gtk plugin

licq-qt-gui:
- Update to 1.2.3

licq-console:
- Update to 1.2.3
- user newer autoconf/automake

licq-jons-gtk-gui:
- Update to 1.2.3 (0.20.1)

8 files changed, 29 insertions, 42 deletions

diff --git a/net/licq-console/Makefile b/net/licq-console/Makefile
index 7449d5cb4448..e8ce148523b8 100644
--- a/net/licq-console/Makefile
+++ b/net/licq-console/Makefile
@@ -11,7 +11,8 @@ CATEGORIES=	net
 
 MAINTAINER=	dinoex@FreeBSD.org
 
-USE_AUTOMAKE=	yes
+USE_AUTOCONF_VER=	253
+USE_AUTOMAKE_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
 INCDIR=		${PORTSDIR}/net
diff --git a/net/licq-console/files/patch-console.cpp b/net/licq-console/files/patch-console.cpp
deleted file mode 100644
index 689b419ddf13..000000000000
--- a/net/licq-console/files/patch-console.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/console.cpp.orig	Mon Nov  4 00:23:20 2002
-+++ src/console.cpp	Mon Nov  4 00:23:55 2002
-@@ -2157,7 +2157,7 @@
-  * CLicqConsole::Input_Line
-  *-------------------------------------------------------------------------*/
- char *CLicqConsole::Input_Line(char *sz, unsigned short &n, int cIn,
--  bool bEcho = true)
-+  bool bEcho)
- {
-   // Now check for keys
-   switch (cIn)
-
diff --git a/net/licq-qt-gui/pkg-plist b/net/licq-qt-gui/pkg-plist
index 8aac9a2d7a0d..2675142954b4 100644
--- a/net/licq-qt-gui/pkg-plist
+++ b/net/licq-qt-gui/pkg-plist
@@ -70,6 +70,14 @@ share/licq/qt-gui/dock.pli/pli.dock
 share/licq/qt-gui/dock.pli/regmsg.xpm
 share/licq/qt-gui/dock.pli/statusmask.xpm
 share/licq/qt-gui/dock.pli/sysmsg.xpm
+share/licq/qt-gui/extended.icons.basic/basic.icons
+share/licq/qt-gui/extended.icons.basic/itemCollapsed.xpm
+share/licq/qt-gui/extended.icons.basic/itemExpanded.xpm
+share/licq/qt-gui/extended.icons.basic/pixBirthday.xpm
+share/licq/qt-gui/extended.icons.basic/pixCellular.xpm
+share/licq/qt-gui/extended.icons.basic/pixCustomAR.xpm
+share/licq/qt-gui/extended.icons.basic/pixInvisible.xpm
+share/licq/qt-gui/extended.icons.basic/pixPhone.xpm
 share/licq/qt-gui/icons.computer/chat.xpm
 share/licq/qt-gui/icons.computer/chess.xpm
 share/licq/qt-gui/icons.computer/computer.icons
@@ -104,6 +112,7 @@ share/licq/qt-gui/icons.icq2/na.xpm
 share/licq/qt-gui/icons.icq2/occ.xpm
 share/licq/qt-gui/icons.icq2/offline.xpm
 share/licq/qt-gui/icons.icq2/online.xpm
+share/licq/qt-gui/icons.icq2/sms.xpm
 share/licq/qt-gui/icons.icq2/url.xpm
 share/licq/qt-gui/icons.mark/away.ppm
 share/licq/qt-gui/icons.mark/chat.ppm
@@ -167,7 +176,9 @@ 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
+@dirrm share/licq/qt-gui/icons.dots
 @dirrm share/licq/qt-gui/icons.computer
+@dirrm share/licq/qt-gui/extended.icons.basic
 @dirrm share/licq/qt-gui/dock.pli
 @dirrm share/licq/qt-gui/dock.kde2
 @dirrm share/licq/qt-gui/dock.glicq
diff --git a/net/licq/Makefile b/net/licq/Makefile
index 4328a3b1dcea..40963be65477 100644
--- a/net/licq/Makefile
+++ b/net/licq/Makefile
@@ -36,6 +36,11 @@ CONFIGURE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib
 .endif
 .endif
 
+pre-configure:
+	@${MV} ${WRKSRC}/src/licq.conf.h ${WRKSRC}/src/licq.conf.h.sed
+	${SED} -e "s=/usr/share/licq=${PREFIX}/share/licq=" \
+		${WRKSRC}/src/licq.conf.h.sed > ${WRKSRC}/src/licq.conf.h
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net/licq/Makefile.inc b/net/licq/Makefile.inc
index 1a1621a937dc..315ae628cb34 100644
--- a/net/licq/Makefile.inc
+++ b/net/licq/Makefile.inc
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=		licq-
-LICQ_VER=		1.2.0a
-QT_LICQ_VER=		1.2.0
+LICQ_VER=		1.2.3
+QT_LICQ_VER=		1.2.3
 RMS_LICQ_VER=		0.33
-CONSOLE_LICQ_VER=	1.2.0
-JONS_GTK_LICQ_VER=	0.20
+CONSOLE_LICQ_VER=	1.2.3
+JONS_GTK_LICQ_VER=	0.20.1
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${PORTSDIR}/net/licq
 .endif
@@ -20,7 +20,7 @@ MD5_FILE?=		${PORTSDIR}/net/licq/distinfo
 #USE_LIBTOOL=		yes
 USE_GMAKE=		yes
 USE_BZIP2=		yes
-WRKSRC?=		${WRKDIR}/${DISTNAME}/plugins/${PORTNAME}-${PORTVERSION}
+WRKSRC?=		${WRKDIR}/${DISTNAME}/plugins/${PORTNAME}
 PLIST_SUB+=		LICQ_DEVEL="@comment "
 .if ${OSVERSION} > 500030
 CPPFLAGS+=		-Wno-deprecated
diff --git a/net/licq/distinfo b/net/licq/distinfo
index aad2721a8dd4..2b80c888b845 100644
--- a/net/licq/distinfo
+++ b/net/licq/distinfo
@@ -1 +1 @@
-MD5 (licq-1.2.0a.tar.bz2) = 3f977d83b36b26d1bc716be3e3336315
+MD5 (licq-1.2.3.tar.bz2) = 57b00f580515e6a51e401ca50e197ce9
diff --git a/net/licq/files/patch-socket.cpp b/net/licq/files/patch-socket.cpp
index 352f77ab89ae..809c4e6a6ee6 100644
--- a/net/licq/files/patch-socket.cpp
+++ b/net/licq/files/patch-socket.cpp
@@ -1,5 +1,5 @@
---- src/socket.cpp.orig	Tue Jul 23 07:22:13 2002
-+++ src/socket.cpp	Mon Dec 16 19:21:03 2002
+--- src/socket.cpp.orig	Thu Jan  2 22:08:06 2003
++++ src/socket.cpp	Wed Jan  8 07:58:47 2003
 @@ -13,6 +13,9 @@
  #include <netdb.h>
  #include <fcntl.h>
@@ -10,16 +10,7 @@
  
  #ifdef HAVE_INET_ATON
  #include <arpa/inet.h>
-@@ -304,6 +307,8 @@
-   // Setup the local structure
- #ifdef USE_SOCKS5
-   int sizeofSockaddr = sizeof(struct sockaddr_in);
-+#elif defined(__FreeBSD__) && __FreeBSD_version < 400013
-+  int sizeofSockaddr = sizeof(struct sockaddr_in);
- #else
-   socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
- #endif
-@@ -416,7 +421,11 @@
+@@ -427,7 +430,11 @@
      m_sRemoteAddr.sin_family = AF_INET;
  
      // if connect fails then call CloseConnection to clean up before returning
@@ -31,12 +22,3 @@
      if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0)
      {
        // errno has been set
-@@ -691,6 +700,8 @@
- void TCPSocket::RecvConnection(TCPSocket &newSocket)
- {
- #ifdef USE_SOCKS5
-+  int sizeofSockaddr = sizeof(struct sockaddr_in);
-+#elif defined(__FreeBSD__) && __FreeBSD_version < 400013
-   int sizeofSockaddr = sizeof(struct sockaddr_in);
- #else
-   socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
diff --git a/net/licq/pkg-message b/net/licq/pkg-message
index 953f4e101753..41656d4d7bc4 100644
--- a/net/licq/pkg-message
+++ b/net/licq/pkg-message
@@ -1,3 +1,3 @@
 In order to actually use licq, at least one plugin port needs to be installed.
-Currently they include: licq-qt-gui, gtk+licq, licq-console, and several others.
-Check the net category to find them.
+Currently they include: licq-qt-gui, licq-jons-gtk-gui, licq-console
+and several others.  Check the net category to find them.