On Tue, Jul 02, 2019 at 06:59:44PM +0200, Jeremie Courreges-Anglas wrote: > I have seen a bunch of people confused by the "socks" FLAVOR of irssi. > Specifically, it's not clear how to use it. After a few tests the > simplest recipe I found is ''SOCKS_SERVER=127.0.0.1:1080 irssi''. > > On a system with no shared libs, the irssi--socks FLAVOR might make > sense. But all our architectures now use shared libs and ld.so. Which > means we can use socksify(1) - also from the dante package - to > transparently use a SOCKS proxy with an unflavored irssi program. > > socksify(1) has a nice manpage that explains how to use SOCKS5 or even > an HTTP proxy. > > We obviously don't need to point people at socksify(1) in all ports that > do network connections. But do we want to give a hint at irssi--socks > users? Maybe a MESSAGE like > > "The irssi socks FLAVOR has been removed, please use socksify(1) from > the dante package." > > I'm not even sure there is anyone actually using the socks FLAVOR. (If > you do, please speak up!) It seems noone spoke up (and I slacked off, sorry).
> Cleanup diff below which includes an automatic upgrade from irssi--socks > to irssi--. The REVISION-otr bump may not be technically needed but > I included it to be safe. I don't use irssi on OpenBSD much but this > survived IRC and ICB tests with socksify(1). > > Thoughts? oks? Looks all good to me, OK kn to remove the flavor. Fresh diff that also removes FLAVOR_STRING, feel free to commit with my OK, otherwise I'd like to clean this up in time before 6.7 gets tagged. Index: Makefile =================================================================== RCS file: /cvs/ports/net/irssi/Makefile,v retrieving revision 1.86 diff -u -p -r1.86 Makefile --- Makefile 30 Aug 2019 07:24:49 -0000 1.86 +++ Makefile 12 Apr 2020 23:16:34 -0000 @@ -9,10 +9,7 @@ V = 1.2.2 DISTNAME = irssi-$V PKGSPEC = irssi-=$V PKGNAME-main = irssi-$V - -# -otr module doesn't vary between FLAVORs; override default FLAVOR suffix -FULLPKGNAME-otr = irssi-otr-$V -FULLPKGPATH-otr = net/irssi,-otr +REVISION = 0 CATEGORIES = net @@ -28,11 +25,6 @@ WANTLIB += c crypto curses glib-2.0 gmod MASTER_SITES = https://github.com/irssi/irssi/releases/download/${V}/ -FLAVORS = socks -FLAVOR ?= -FLAVOR_STRING = ${FLAVOR_EXT:S/-/,/g} -SUBST_VARS = FLAVOR_STRING - LIB_DEPENDS = devel/glib2>=2.28.0 RUN_DEPENDS-otr = net/irssi,-main @@ -52,12 +44,6 @@ CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_lib_utf8proc_utf8proc_version=no SEPARATE_BUILD = Yes - -.if ${FLAVOR:Msocks} -CONFIGURE_ARGS += --with-socks -LIB_DEPENDS += security/dante -WANTLIB += socks -.endif MAKE_FLAGS = scriptdir="${SYSCONFDIR}/irssi/scripts" \ themedir="${SYSCONFDIR}/irssi/themes" Index: pkg/DESCR-main =================================================================== RCS file: /cvs/ports/net/irssi/pkg/DESCR-main,v retrieving revision 1.1 diff -u -p -r1.1 DESCR-main --- pkg/DESCR-main 29 Jun 2019 14:54:09 -0000 1.1 +++ pkg/DESCR-main 12 Apr 2020 23:11:04 -0000 @@ -1,5 +1,3 @@ Irssi is a modular, console-based IRC client with scripting support that can also connect to other protocols (like ICB) through the use of plugins. - -Flavor: socks support for dante socks firewall implementation Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/net/irssi/pkg/PLIST-main,v retrieving revision 1.2 diff -u -p -r1.2 PLIST-main --- pkg/PLIST-main 2 Jul 2019 20:30:02 -0000 1.2 +++ pkg/PLIST-main 12 Apr 2020 23:18:38 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST-main,v 1.2 2019/07/02 20:30:02 sthen Exp $ -@pkgpath net/irssi${FLAVOR_STRING} +@pkgpath net/irssi,socks @bin bin/irssi include/irssi/ include/irssi/irssi-config
