diff options
author | tnn <tnn> | 2015-09-30 08:25:37 +0000 |
---|---|---|
committer | tnn <tnn> | 2015-09-30 08:25:37 +0000 |
commit | 9583e584ab332a73c595b057c59f78633da7f97c (patch) | |
tree | 15f2e52cbc0823f38bb1aa505121cecf6db6165b | |
parent | dd942734d99027e58c5cbe120f50ae33c4206fd1 (diff) | |
download | pkgsrc-9583e584ab332a73c595b057c59f78633da7f97c.tar.gz |
replace optional socks5 dependencies with net/dante
-rw-r--r-- | chat/ircII/options.mk | 10 | ||||
-rw-r--r-- | chat/scrollz/options.mk | 12 | ||||
-rw-r--r-- | comms/kermit/options.mk | 12 | ||||
-rw-r--r-- | mail/fetchmail/options.mk | 11 | ||||
-rw-r--r-- | net/tnftp/options.mk | 10 | ||||
-rw-r--r-- | news/suck/options.mk | 10 | ||||
-rw-r--r-- | news/tin/options.mk | 6 | ||||
-rw-r--r-- | www/libwww/buildlink3.mk | 6 | ||||
-rw-r--r-- | www/libwww/options.mk | 12 | ||||
-rw-r--r-- | www/lynx/options.mk | 10 |
10 files changed, 50 insertions, 49 deletions
diff --git a/chat/ircII/options.mk b/chat/ircII/options.mk index 9500bbde06a..ed0f1a09aab 100644 --- a/chat/ircII/options.mk +++ b/chat/ircII/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2005/06/02 22:21:18 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2015/09/30 08:25:37 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ircII PKG_SUPPORTED_OPTIONS= # only socks group PKG_OPTIONS_OPTIONAL_GROUPS= socks -PKG_OPTIONS_GROUP.socks= socks4 socks5 +PKG_OPTIONS_GROUP.socks= socks4 dante .include "../../mk/bsd.options.mk" @@ -12,7 +12,7 @@ PKG_OPTIONS_GROUP.socks= socks4 socks5 .include "../../net/socks4/buildlink3.mk" CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.socks4} .endif -.if !empty(PKG_OPTIONS:Msocks5) -.include "../../net/socks5/buildlink3.mk" -CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_PREFIX.socks5} +.if !empty(PKG_OPTIONS:Mdante) +.include "../../net/dante/buildlink3.mk" +CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.dante} .endif diff --git a/chat/scrollz/options.mk b/chat/scrollz/options.mk index 448f7bb1eeb..4304226653f 100644 --- a/chat/scrollz/options.mk +++ b/chat/scrollz/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.1 2015/07/27 22:31:30 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2015/09/30 08:25:37 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.scrollz PKG_SUPPORTED_OPTIONS= efence inet6 regexp utf8 PKG_SUGGESTED_OPTIONS+= efence inet6 PKG_OPTIONS_OPTIONAL_GROUPS= socks ssl -PKG_OPTIONS_GROUP.socks= socks4 socks5 +PKG_OPTIONS_GROUP.socks= socks4 dante PKG_OPTIONS_GROUP.ssl= gnutls openssl .include "../../mk/bsd.options.mk" @@ -49,11 +49,11 @@ CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.socks4} CONFIGURE_ARGS+= --disable-socks4 .endif -.if !empty(PKG_OPTIONS:Msocks5) -.include "../../net/socks5/buildlink3.mk" -CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_PREFIX.socks5} +.if !empty(PKG_OPTIONS:Mdante) +.include "../../net/dante/buildlink3.mk" +CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.dante} .else -CONFIGURE_ARGS+= --disable-socks5 +CONFIGURE_ARGS+= --disable-socks4 .endif .if !empty(PKG_OPTIONS:Mutf8) diff --git a/comms/kermit/options.mk b/comms/kermit/options.mk index 2a072550e43..f48ee20b0fc 100644 --- a/comms/kermit/options.mk +++ b/comms/kermit/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.5 2015/01/17 15:30:03 bsiegert Exp $ +# $NetBSD: options.mk,v 1.6 2015/09/30 08:25:37 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.kermit PKG_SUPPORTED_OPTIONS= kermit-suid-uucp ssl kerberos PKG_OPTIONS_OPTIONAL_GROUPS+= socks -PKG_OPTIONS_GROUP.socks= socks4 socks5 +PKG_OPTIONS_GROUP.socks= socks4 dante .include "../../mk/bsd.options.mk" @@ -25,10 +25,10 @@ SPECIAL_PERMS+= bin/kermit ${UUCP_USER} ${UUCP_GROUP} 4555 KFLAGS+= -DSOCKS -DCK_SOCKS LIBS+= -L${BUILDLINK_PREFIX.dante}/lib -lsocks .include "../../net/dante/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Msocks5) -KFLAGS+= -DSOCKS -DCK_SOCKS5 -LIBS+= -L${BUILDLINK_PREFIX.socks5}/lib -lsocks5 -.include "../../net/socks5/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Mdante) +KFLAGS+= -DSOCKS -DCK_SOCKS +LIBS+= -L${BUILDLINK_PREFIX.dante}/lib -lsocks +.include "../../net/dante/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mkerberos) diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk index fc59bf78185..d5f5bc51dde 100644 --- a/mail/fetchmail/options.mk +++ b/mail/fetchmail/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.17 2014/02/12 23:19:49 tron Exp $ +# $NetBSD: options.mk,v 1.18 2015/09/30 08:25:37 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail PKG_SUPPORTED_OPTIONS= kerberos4 kerberos gssapi ssl PKG_OPTIONS_OPTIONAL_GROUPS= socks -PKG_OPTIONS_GROUP.socks= socks4 socks5 +PKG_OPTIONS_GROUP.socks= socks4 dante PKG_SUGGESTED_OPTIONS= ssl @@ -59,7 +59,8 @@ CONFIGURE_ARGS+= --without-ssl .include "../../net/socks4/buildlink3.mk" CONFIGURE_ARGS+= --with-socks=${BUILDLINK_PREFIX.socks4} .endif -.if !empty(PKG_OPTIONS:Msocks5) -.include "../../net/socks5/buildlink3.mk" -CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_PREFIX.socks5} +.if !empty(PKG_OPTIONS:Mdante) +.include "../../net/dante/buildlink3.mk" +CPPFLAGS+= -I${BUILDLINK_PREFIX.dante}/include/dante +CONFIGURE_ARGS+= --with-socks=${BUILDLINK_PREFIX.dante} .endif diff --git a/net/tnftp/options.mk b/net/tnftp/options.mk index b20c9bf3161..c73bce64b79 100644 --- a/net/tnftp/options.mk +++ b/net/tnftp/options.mk @@ -1,9 +1,7 @@ -# $NetBSD: options.mk,v 1.10 2015/02/18 09:16:52 wiz Exp $ +# $NetBSD: options.mk,v 1.11 2015/09/30 08:25:37 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tnftp -PKG_SUPPORTED_OPTIONS= inet6 ssl -PKG_OPTIONS_OPTIONAL_GROUPS+= socks -PKG_OPTIONS_GROUP.socks= socks5 +PKG_SUPPORTED_OPTIONS= inet6 ssl socks PKG_SUGGESTED_OPTIONS= inet6 CHECK_BUILTIN.openssl:= yes @@ -16,9 +14,9 @@ PKG_SUGGESTED_OPTIONS+= ssl .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Msocks5) +.if !empty(PKG_OPTIONS:Msocks) CONFIGURE_ARGS+= --with-socks -.include "../../net/socks5/buildlink3.mk" +.include "../../net/dante/buildlink3.mk" .else CONFIGURE_ARGS+= --without-socks .endif diff --git a/news/suck/options.mk b/news/suck/options.mk index ffd6c7087ba..56b20b48283 100644 --- a/news/suck/options.mk +++ b/news/suck/options.mk @@ -1,13 +1,15 @@ -# $NetBSD: options.mk,v 1.1 2005/12/02 17:04:35 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2015/09/30 08:25:37 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.suck PKG_OPTIONS_OPTIONAL_GROUPS+= socks -PKG_OPTIONS_GROUP.socks= socks4 socks5 +PKG_OPTIONS_GROUP.socks= socks4 dante .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msocks4) .include "../../net/socks4/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Msocks5) -.include "../../net/socks5/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Mdante) +CFLAGS+= -I${BUILDLINK_PREFIX.dante}/include/dante +CPPFLAGS+= -I${BUILDLINK_PREFIX.dante}/include/dante +.include "../../net/dante/buildlink3.mk" .endif diff --git a/news/tin/options.mk b/news/tin/options.mk index 567fb835bd3..b1e5804727d 100644 --- a/news/tin/options.mk +++ b/news/tin/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2012/06/12 15:46:02 wiz Exp $ +# $NetBSD: options.mk,v 1.14 2015/09/30 08:25:37 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tin PKG_SUPPORTED_OPTIONS= icu inet6 tin-use-inn-spool @@ -52,6 +52,6 @@ CONFIGURE_ARGS+= --enable-nntp-only .endif .if !empty(PKG_OPTIONS:Msocks) -.include "../../net/socks5/buildlink3.mk" -CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_PREFIX.socks5} +.include "../../net/dante/buildlink3.mk" +CONFIGURE_ARGS+= --with-socks=${BUILDLINK_PREFIX.dante} .endif diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk index bba705e2ee2..e732a541c30 100644 --- a/www/libwww/buildlink3.mk +++ b/www/libwww/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2014/02/12 23:18:45 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2015/09/30 08:25:37 tnn Exp $ BUILDLINK_TREE+= libwww @@ -18,8 +18,8 @@ pkgbase := libwww .include "../../net/socks4/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.libwww:Msocks5) -.include "../../net/socks5/buildlink3.mk" +.if !empty(PKG_BUILD_OPTIONS.libwww:Mdante) +.include "../../net/dante/buildlink3.mk" .endif .include "../../devel/zlib/buildlink3.mk" diff --git a/www/libwww/options.mk b/www/libwww/options.mk index 9e8ca87e139..2c3d50fe6f3 100644 --- a/www/libwww/options.mk +++ b/www/libwww/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2006/10/04 19:45:58 rillig Exp $ +# $NetBSD: options.mk,v 1.3 2015/09/30 08:25:37 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libwww PKG_OPTIONS_OPTIONAL_GROUPS+= socks -PKG_OPTIONS_GROUP.socks= socks4 socks5 +PKG_OPTIONS_GROUP.socks= socks4 dante .include "../../mk/bsd.options.mk" @@ -10,8 +10,8 @@ PKG_OPTIONS_GROUP.socks= socks4 socks5 CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a CONFIGURE_ARGS+= --with-socks5=no .include "../../net/socks4/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Msocks5) -CONFIGURE_ARGS+= --with-socks4=no -CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_PREFIX.socks5}/lib/libsocks5.a -.include "../../net/socks5/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Mdante) +CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.dante}/lib/libsocks.a +CONFIGURE_ARGS+= --with-socks5=no +.include "../../net/dante/buildlink3.mk" .endif diff --git a/www/lynx/options.mk b/www/lynx/options.mk index cb6f25be780..359a6413732 100644 --- a/www/lynx/options.mk +++ b/www/lynx/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.15 2014/09/16 09:52:05 wiz Exp $ +# $NetBSD: options.mk,v 1.16 2015/09/30 08:25:37 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lynx PKG_SUPPORTED_OPTIONS= inet6 PKG_OPTIONS_OPTIONAL_GROUPS= socksproxy -PKG_OPTIONS_GROUP.socksproxy= socks5 socks4 +PKG_OPTIONS_GROUP.socksproxy= dante socks4 PKG_OPTIONS_REQUIRED_GROUPS= screen PKG_OPTIONS_GROUP.screen= ncurses ncursesw slang curses @@ -62,9 +62,9 @@ CONFIGURE_ARGS+= --enable-color-style CONFIGURE_ARGS+= --with-socks . include "../../net/socks4/buildlink3.mk" .endif -.if !empty(PKG_OPTIONS:Msocks5) -CONFIGURE_ARGS+= --with-socks5 -. include "../../net/socks5/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mdante) +CONFIGURE_ARGS+= --with-socks +. include "../../net/dante/buildlink3.mk" .endif ### |