mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Readd socks5 support by using net/dante instead of removal net/socks5.

Browse Source 
PR:		ports/167826
Submitted by:	4721@hushmail.com <4721@hushmail.com>
This commit is contained in:
Jeremy Messenger 2012-05-20 16:46:32 +00:00
parent 8e1c50af09
commit b427b0d251
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=297048
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
irc/xchat/Makefile
View File

@ -36,6 +36,7 @@ OPTIONS= DBUS "Enable DBUS support" on \
NOTIFY "Depend on libnotify for notifications" off \
PERL "Enable Perl support" on \
PYTHON "Enable Python support" off \
SOCKS "Build with socks5 support" off \
TCL "Enable TCL support" off
.if defined(WITH_PYTHON)
@ -98,6 +99,11 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
.if defined(WITH_SOCKS)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
CONFIGURE_ARGS+=--enable-socks
.endif
.if defined(WITH_TCL)
USE_TCL= 84+
.include "${PORTSDIR}/Mk/bsd.tcl.mk"

64
irc/xchat/files/patch-socks Normal file
View File

@ -0,0 +1,64 @@
--- configure.orig
+++ configure
@@ -18485,13 +18485,13 @@
if test "$socks" = yes; then
socks=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCKSconnect in -lsocks5" >&5
-$as_echo_n "checking for SOCKSconnect in -lsocks5... " >&6; }
-if test "${ac_cv_lib_socks5_SOCKSconnect+set}" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Rconnect in -lsocks" >&5
+$as_echo_n "checking for Rconnect in -lsocks... " >&6; }
+if test "${ac_cv_lib_socks_Rconnect+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocks5 $LIBS"
+LIBS="-lsocks $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -18501,27 +18501,27 @@
#ifdef __cplusplus
extern "C"
#endif
-char SOCKSconnect ();
+char Rconnect ();
int
main ()
{
-return SOCKSconnect ();
+return Rconnect ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socks5_SOCKSconnect=yes
+ ac_cv_lib_socks_Rconnect=yes
else
- ac_cv_lib_socks5_SOCKSconnect=no
+ ac_cv_lib_socks_Rconnect=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socks5_SOCKSconnect" >&5
-$as_echo "$ac_cv_lib_socks5_SOCKSconnect" >&6; }
-if test "x$ac_cv_lib_socks5_SOCKSconnect" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socks_Rconnect" >&5
+$as_echo "$ac_cv_lib_socks_Rconnect" >&6; }
+if test "x$ac_cv_lib_socks_Rconnect" = x""yes; then :
have_socks=yes
fi
@@ -18542,7 +18542,7 @@
socks=yes
$as_echo "#define SOCKS 1" >>confdefs.h
- LIBS="$LIBS -lsocks5"
+ LIBS="$LIBS -lsocks"
fi
fi
fi