Index: head/net/licq/Makefile
===================================================================
--- head/net/licq/Makefile	(revision 74324)
+++ head/net/licq/Makefile	(revision 74325)
@@ -1,49 +1,44 @@
 # New ports collection makefile for:    licq
 # Date created:                         2 July 1998
 # Whom:                                 Brian Feldman & Matt Heckaman
 #
 # $FreeBSD$
 #
 
 PORTNAME=	base
 PORTVERSION=	${LICQ_VER}
 CATEGORIES=	net
 .if defined(WITH_SOCKS)
 PKGNAMESUFFIX=	-socks
 .endif
 
 MAINTAINER=	dinoex@FreeBSD.org
 
 .if defined(WITH_SOCKS)
-.if defined(WITH_DANTE)
-LIB_DEPENDS=	socks.1:${PORTSDIR}/net/dante
-.else
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 .endif
-.endif
 
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
+INCDIR?=	${.CURDIR}
 
 # workaround for installed autoconf/automake
 CONFIGURE_ARGS+=--program-transform-name=s,y,y,
 
 .if defined(WITH_SOCKS)
 CONFIGURE_ARGS+=--enable-socks5
-.if defined(WITH_DANTE)
 CONFIGURE_ARGS+=--with-socks5-inc=${LOCALBASE}/include
 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}
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/Makefile.inc"
+.include "${INCDIR}/Makefile.inc"
 .include <bsd.port.post.mk>

Property changes on: head/net/licq/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.43
\ No newline at end of property
+1.44
\ No newline at end of property
Index: head/net/licq/files/patch-main.cpp
===================================================================
--- head/net/licq/files/patch-main.cpp	(nonexistent)
+++ head/net/licq/files/patch-main.cpp	(revision 74325)
@@ -0,0 +1,10 @@
+--- src/main.cpp.orig	Wed Jan 29 13:19:50 2003
++++ src/main.cpp	Wed Jan 29 13:20:13 2003
+@@ -10,7 +10,6 @@
+ 
+ #ifdef USE_SOCKS5
+ #define SOCKS
+-#define INCLUDE_PROTOTYPES
+ extern "C" {
+ #include <socks.h>
+ }

Property changes on: head/net/licq/files/patch-main.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/licq/files/patch-socket.cpp
===================================================================
--- head/net/licq/files/patch-socket.cpp	(revision 74324)
+++ head/net/licq/files/patch-socket.cpp	(revision 74325)
@@ -1,24 +1,34 @@
 --- 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>
  #include <unistd.h>
 +#ifdef __FreeBSD__
 +#include <osreldate.h>
 +#endif
  
  #ifdef HAVE_INET_ATON
  #include <arpa/inet.h>
 @@ -427,7 +430,11 @@
      m_sRemoteAddr.sin_family = AF_INET;
  
      // if connect fails then call CloseConnection to clean up before returning
 +#if defined(__FreeBSD__) && __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
+--- src/socket.cpp.orig	Wed Jan 29 13:19:59 2003
++++ src/socket.cpp	Wed Jan 29 13:20:20 2003
+@@ -42,7 +42,6 @@
+ #ifdef USE_SOCKS5
+ 
+ #define SOCKS
+-#define INCLUDE_PROTOTYPES
+ extern "C" {
+ #include <socks.h>
+ }

Property changes on: head/net/licq/files/patch-socket.cpp
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-im/licq/Makefile
===================================================================
--- head/net-im/licq/Makefile	(revision 74324)
+++ head/net-im/licq/Makefile	(revision 74325)
@@ -1,49 +1,44 @@
 # New ports collection makefile for:    licq
 # Date created:                         2 July 1998
 # Whom:                                 Brian Feldman & Matt Heckaman
 #
 # $FreeBSD$
 #
 
 PORTNAME=	base
 PORTVERSION=	${LICQ_VER}
 CATEGORIES=	net
 .if defined(WITH_SOCKS)
 PKGNAMESUFFIX=	-socks
 .endif
 
 MAINTAINER=	dinoex@FreeBSD.org
 
 .if defined(WITH_SOCKS)
-.if defined(WITH_DANTE)
-LIB_DEPENDS=	socks.1:${PORTSDIR}/net/dante
-.else
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 .endif
-.endif
 
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
+INCDIR?=	${.CURDIR}
 
 # workaround for installed autoconf/automake
 CONFIGURE_ARGS+=--program-transform-name=s,y,y,
 
 .if defined(WITH_SOCKS)
 CONFIGURE_ARGS+=--enable-socks5
-.if defined(WITH_DANTE)
 CONFIGURE_ARGS+=--with-socks5-inc=${LOCALBASE}/include
 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}
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/Makefile.inc"
+.include "${INCDIR}/Makefile.inc"
 .include <bsd.port.post.mk>

Property changes on: head/net-im/licq/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.43
\ No newline at end of property
+1.44
\ No newline at end of property
Index: head/net-im/licq/files/patch-main.cpp
===================================================================
--- head/net-im/licq/files/patch-main.cpp	(nonexistent)
+++ head/net-im/licq/files/patch-main.cpp	(revision 74325)
@@ -0,0 +1,10 @@
+--- src/main.cpp.orig	Wed Jan 29 13:19:50 2003
++++ src/main.cpp	Wed Jan 29 13:20:13 2003
+@@ -10,7 +10,6 @@
+ 
+ #ifdef USE_SOCKS5
+ #define SOCKS
+-#define INCLUDE_PROTOTYPES
+ extern "C" {
+ #include <socks.h>
+ }

Property changes on: head/net-im/licq/files/patch-main.cpp
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net-im/licq/files/patch-socket.cpp
===================================================================
--- head/net-im/licq/files/patch-socket.cpp	(revision 74324)
+++ head/net-im/licq/files/patch-socket.cpp	(revision 74325)
@@ -1,24 +1,34 @@
 --- 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>
  #include <unistd.h>
 +#ifdef __FreeBSD__
 +#include <osreldate.h>
 +#endif
  
  #ifdef HAVE_INET_ATON
  #include <arpa/inet.h>
 @@ -427,7 +430,11 @@
      m_sRemoteAddr.sin_family = AF_INET;
  
      // if connect fails then call CloseConnection to clean up before returning
 +#if defined(__FreeBSD__) && __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
+--- src/socket.cpp.orig	Wed Jan 29 13:19:59 2003
++++ src/socket.cpp	Wed Jan 29 13:20:20 2003
+@@ -42,7 +42,6 @@
+ #ifdef USE_SOCKS5
+ 
+ #define SOCKS
+-#define INCLUDE_PROTOTYPES
+ extern "C" {
+ #include <socks.h>
+ }

Property changes on: head/net-im/licq/files/patch-socket.cpp
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property