Date: Sat, 12 May 2012 17:02:06 GMT From: "4721@hushmail.com" <4721@hushmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/167826: [patch] readd socks5 support to irc/xchat Message-ID: <201205121702.q4CH26oY026399@red.freebsd.org> Resent-Message-ID: <201205121710.q4CHA6i2053843@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 167826
>Category: ports
>Synopsis: [patch] readd socks5 support to irc/xchat
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat May 12 17:10:06 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: 4721@hushmail.com
>Release:
>Organization:
>Environment:
>Description:
attached patch readds socks5 support to irc/xchat and makes configure compatible with net/dante instead of removed net/socks5.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: irc/xchat/Makefile
===================================================================
RCS file: /home/ncvs/ports/irc/xchat/Makefile,v
retrieving revision 1.152
diff -u -r1.152 Makefile
--- irc/xchat/Makefile 26 Feb 2012 18:44:12 -0000 1.152
+++ irc/xchat/Makefile 11 May 2012 17:40:50 -0000
@@ -36,6 +36,7 @@
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 @@
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"
Index: irc/xchat/files/patch-socks
===================================================================
RCS file: irc/xchat/files/patch-socks
diff -N irc/xchat/files/patch-socks
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ irc/xchat/files/patch-socks 11 May 2012 17:40:51 -0000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205121702.q4CH26oY026399>