diff options
| author | dinoex <dinoex@FreeBSD.org> | 2003-01-31 12:48:15 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2003-01-31 12:48:15 +0800 |
| commit | 852d99d2b61643e95eb64c84e111b2a5ba4bc87d (patch) | |
| tree | 4b85ed037cde137d512ddc27c1f3a3944bff9c11 /net-im | |
| parent | b10e4b5ed4cf520970abc71c2d41f527a06003ac (diff) | |
| download | freebsd-ports-gnome-852d99d2b61643e95eb64c84e111b2a5ba4bc87d.tar.gz freebsd-ports-gnome-852d99d2b61643e95eb64c84e111b2a5ba4bc87d.tar.zst freebsd-ports-gnome-852d99d2b61643e95eb64c84e111b2a5ba4bc87d.zip | |
- allows licq used as master-port. e.G. for socks.
- remove WITH_DANTE
- fix SOCKS support to work with net/socks5-port.
PR: 47636
Submitted by: lofi@lofi.dyndns.org
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/licq/Makefile | 9 | ||||
| -rw-r--r-- | net-im/licq/files/patch-main.cpp | 10 | ||||
| -rw-r--r-- | net-im/licq/files/patch-socket.cpp | 10 |
3 files changed, 22 insertions, 7 deletions
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index 40963be65477..90485a9a74ac 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -15,26 +15,21 @@ PKGNAMESUFFIX= -socks 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 @@ -45,5 +40,5 @@ post-install: @${CAT} ${PKGMESSAGE} .include <bsd.port.pre.mk> -.include "${.CURDIR}/Makefile.inc" +.include "${INCDIR}/Makefile.inc" .include <bsd.port.post.mk> diff --git a/net-im/licq/files/patch-main.cpp b/net-im/licq/files/patch-main.cpp new file mode 100644 index 000000000000..e6ca09b4f421 --- /dev/null +++ b/net-im/licq/files/patch-main.cpp @@ -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> + } diff --git a/net-im/licq/files/patch-socket.cpp b/net-im/licq/files/patch-socket.cpp index 809c4e6a6ee6..36d9f1d9f585 100644 --- a/net-im/licq/files/patch-socket.cpp +++ b/net-im/licq/files/patch-socket.cpp @@ -22,3 +22,13 @@ 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> + } |