Index: head/Mk/Scripts/desktop-categories.sh =================================================================== --- head/Mk/Scripts/desktop-categories.sh +++ head/Mk/Scripts/desktop-categories.sh @@ -55,6 +55,7 @@ net-im) c="Network InstantMessaging" ;; net-mgmt) c="Network" ;; net-p2p) c="Network P2P" ;; + net-vpn) c="Network VPN" ;; news) c="Network News" ;; palm) c="Office PDA" ;; parallel) c="ParallelComputing" ;; Index: head/Mk/bsd.port.mk =================================================================== --- head/Mk/bsd.port.mk +++ head/Mk/bsd.port.mk @@ -2533,7 +2533,7 @@ deskutils devel docs dns editors elisp emulators enlightenment finance french ftp \ games geography german gnome gnustep graphics hamradio haskell hebrew hungarian \ ipv6 irc japanese java kde ${_KDE_CATEGORIES_SUPPORTED} kld korean lang linux lisp \ - mail mate math mbone misc multimedia net net-im net-mgmt net-p2p news \ + mail mate math mbone misc multimedia net net-im net-mgmt net-p2p net-vpn news \ palm parallel pear perl5 plan9 polish portuguese ports-mgmt \ print python ruby rubygems russian \ scheme science security shells spanish sysutils \ Index: head/net/mlvpn/Makefile =================================================================== --- head/net/mlvpn/Makefile +++ head/net/mlvpn/Makefile @@ -3,7 +3,7 @@ PORTNAME= mlvpn PORTVERSION= 2.3.1 PORTREVISION= 2 -CATEGORIES= net +CATEGORIES= net net-vpn MAINTAINER= olivier@FreeBSD.org COMMENT= Multi-link VPN Index: head/net/ocserv/Makefile =================================================================== --- head/net/ocserv/Makefile +++ head/net/ocserv/Makefile @@ -4,7 +4,7 @@ PORTNAME= ocserv PORTVERSION= 0.12.4 PORTREVISION= 1 -CATEGORIES= net security +CATEGORIES= net net-vpn security MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/ MAINTAINER= cpm@FreeBSD.org Index: head/net/poptop/Makefile =================================================================== --- head/net/poptop/Makefile +++ head/net/poptop/Makefile @@ -4,7 +4,7 @@ PORTNAME= poptop PORTVERSION= 1.4.0 PORTREVISION= 1 -CATEGORIES= net +CATEGORIES= net net-vpn MASTER_SITES= SF/${PORTNAME}/pptpd/pptpd-${PORTVERSION} \ SAMBA/ppp:pppd DISTFILES= pptpd-${PORTVERSION}${EXTRACT_SUFX} \ Index: head/net/pptpclient/Makefile =================================================================== --- head/net/pptpclient/Makefile +++ head/net/pptpclient/Makefile @@ -3,7 +3,7 @@ PORTNAME= pptpclient DISTVERSION= 1.10.0 -CATEGORIES= net +CATEGORIES= net net-vpn MASTER_SITES= SF/${PORTNAME}/pptp/pptp-${PORTVERSION} DISTNAME= pptp-${PORTVERSION} Index: head/net/py-sshuttle/Makefile =================================================================== --- head/net/py-sshuttle/Makefile +++ head/net/py-sshuttle/Makefile @@ -3,7 +3,7 @@ PORTNAME= sshuttle PORTVERSION= 0.78.5 -CATEGORIES= net python +CATEGORIES= net python net-vpn MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: head/net/wireguard-go/Makefile =================================================================== --- head/net/wireguard-go/Makefile +++ head/net/wireguard-go/Makefile @@ -2,7 +2,7 @@ PORTNAME= wireguard-go PORTVERSION= 0.0.20190805 -CATEGORIES= net +CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-go/snapshot/ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} Index: head/net/wireguard/Makefile =================================================================== --- head/net/wireguard/Makefile +++ head/net/wireguard/Makefile @@ -2,7 +2,7 @@ PORTNAME= wireguard PORTVERSION= 0.0.20190702 -CATEGORIES= net +CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/WireGuard/snapshot/ DISTNAME= WireGuard-${PORTVERSION} Index: head/security/fiked/Makefile =================================================================== --- head/security/fiked/Makefile +++ head/security/fiked/Makefile @@ -4,7 +4,7 @@ PORTNAME= fiked PORTVERSION= 0.0.5 PORTREVISION= 7 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= https://mirror.roe.ch/rel/fiked/ MAINTAINER= ports@FreeBSD.org Index: head/security/govpn/Makefile =================================================================== --- head/security/govpn/Makefile +++ head/security/govpn/Makefile @@ -4,7 +4,7 @@ PORTNAME= govpn DISTVERSION= 7.5 PORTREVISION= 1 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= http://www.govpn.info/download/ MAINTAINER= stargrave@stargrave.org Index: head/security/ike-scan/Makefile =================================================================== --- head/security/ike-scan/Makefile +++ head/security/ike-scan/Makefile @@ -3,7 +3,7 @@ PORTNAME= ike-scan PORTVERSION= 1.9 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= http://www.nta-monitor.com/tools/ike-scan/download/ MAINTAINER= ports@FreeBSD.org Index: head/security/n2n/Makefile =================================================================== --- head/security/n2n/Makefile +++ head/security/n2n/Makefile @@ -3,7 +3,7 @@ PORTNAME= n2n PORTVERSION= 2.4 -CATEGORIES= security net +CATEGORIES= security net net-vpn MAINTAINER= farrokhi@FreeBSD.org COMMENT= Layer Two Peer-to-peer VPN Index: head/security/openconnect-gui/Makefile =================================================================== --- head/security/openconnect-gui/Makefile +++ head/security/openconnect-gui/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.4.1 DISTVERSIONPREFIX=v PORTREVISION= 3 -CATEGORIES= security +CATEGORIES= security net-vpn MAINTAINER= pkubaj@anongoth.pl COMMENT= Graphical OpenConnect client Index: head/security/openconnect/Makefile =================================================================== --- head/security/openconnect/Makefile +++ head/security/openconnect/Makefile @@ -3,7 +3,7 @@ PORTNAME= openconnect PORTVERSION= 8.03 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \ ZI Index: head/security/openfortivpn/Makefile =================================================================== --- head/security/openfortivpn/Makefile +++ head/security/openfortivpn/Makefile @@ -3,7 +3,7 @@ PORTNAME= openfortivpn PORTVERSION= 1.10.0 DISTVERSIONPREFIX=v -CATEGORIES= security +CATEGORIES= security net-vpn MAINTAINER= lifanov@FreeBSD.org COMMENT= Client for PPP+SSL VPN tunnel services Index: head/security/openvpn-admin/Makefile =================================================================== --- head/security/openvpn-admin/Makefile +++ head/security/openvpn-admin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.9.4 DISTVERSIONSUFFIX= -2 PORTREVISION= 6 -CATEGORIES= security gnome +CATEGORIES= security gnome net-vpn MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/release-${PORTVERSION} MAINTAINER= egypcio@FreeBSD.org Index: head/security/openvpn-auth-ldap/Makefile =================================================================== --- head/security/openvpn-auth-ldap/Makefile +++ head/security/openvpn-auth-ldap/Makefile @@ -4,7 +4,7 @@ PORTNAME= openvpn-auth-ldap PORTVERSION= 2.0.4.0.s1379 PORTREVISION= 3 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= LOCAL/mandree # figure out proper GitHub commit and use that. # https://github.com/threerings/openvpn-auth-ldap/ DISTNAME= auth-ldap-${PORTVERSION} Index: head/security/openvpn-auth-radius/Makefile =================================================================== --- head/security/openvpn-auth-radius/Makefile +++ head/security/openvpn-auth-radius/Makefile @@ -4,7 +4,7 @@ PORTNAME= openvpn-auth-radius PORTVERSION= 2.1 PORTREVISION= 4 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= http://www.nongnu.org/radiusplugin/ \ http://svn-cache.ipcopaddons.org/ DISTNAME= radiusplugin_v${PORTVERSION} Index: head/security/openvpn-auth-script/Makefile =================================================================== --- head/security/openvpn-auth-script/Makefile +++ head/security/openvpn-auth-script/Makefile @@ -2,7 +2,7 @@ PORTNAME= openvpn-auth-script DISTVERSION= 1.0.0.3 -CATEGORIES= security net +CATEGORIES= security net net-vpn MAINTAINER= pdemon@gmail.com COMMENT= Generic script-based deferred auth plugin for OpenVPN Index: head/security/openvpn-devel/Makefile =================================================================== --- head/security/openvpn-devel/Makefile +++ head/security/openvpn-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= openvpn DISTVERSION= 201907 -CATEGORIES= security net +CATEGORIES= security net net-vpn MASTER_SITES= https://secure-computing.net/files/openvpn/ \ ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/ PKGNAMESUFFIX= -devel Index: head/security/openvpn/Makefile =================================================================== --- head/security/openvpn/Makefile +++ head/security/openvpn/Makefile @@ -4,7 +4,7 @@ PORTNAME= openvpn DISTVERSION= 2.4.7 PORTREVISION?= 0 -CATEGORIES= security net +CATEGORIES= security net net-vpn MASTER_SITES= https://swupdate.openvpn.org/community/releases/ \ https://build.openvpn.net/downloads/releases/ Index: head/security/softether-devel/Makefile =================================================================== --- head/security/softether-devel/Makefile +++ head/security/softether-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= softether DISTVERSION= 4.30-9700-beta #PORTREVISION= 0 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= https://www.softether-download.com/files/softether/v${DISTVERSION}-2019.07.13-tree/Source_Code/ PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-src-v${DISTVERSION} Index: head/security/softether/Makefile =================================================================== --- head/security/softether/Makefile +++ head/security/softether/Makefile @@ -3,7 +3,7 @@ PORTNAME= softether DISTVERSION= 4.29-9680 PORTREVISION= 2 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= https://www.softether-download.com/files/softether/v${DISTVERSION}-rtm-2019.02.28-tree/Source_Code/ DISTNAME= ${PORTNAME}-src-v${DISTVERSION}-rtm Index: head/security/softether5/Makefile =================================================================== --- head/security/softether5/Makefile +++ head/security/softether5/Makefile @@ -3,7 +3,7 @@ PORTNAME= softether DISTVERSION= 5.01.9671 #PORTREVISION= 0 -CATEGORIES= security +CATEGORIES= security net-vpn PKGNAMESUFFIX= 5 MAINTAINER= meta@FreeBSD.org Index: head/security/strongswan/Makefile =================================================================== --- head/security/strongswan/Makefile +++ head/security/strongswan/Makefile @@ -3,7 +3,7 @@ PORTNAME= strongswan PORTVERSION= 5.8.0 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= http://download.strongswan.org/ \ http://download2.strongswan.org/ Index: head/security/tinc-devel/Makefile =================================================================== --- head/security/tinc-devel/Makefile +++ head/security/tinc-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= tinc PORTVERSION= 1.1pre17 PORTREVISION= 3 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= https://www.tinc-vpn.org/packages/ \ http://www.tinc-vpn.org/packages/ PKGNAMESUFFIX= -devel Index: head/security/tinc/Makefile =================================================================== --- head/security/tinc/Makefile +++ head/security/tinc/Makefile @@ -4,7 +4,7 @@ PORTNAME= tinc PORTVERSION= 1.0.35 PORTREVISION= 1 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= https://www.tinc-vpn.org/packages/ \ http://www.tinc-vpn.org/packages/ Index: head/security/vpnc/Makefile =================================================================== --- head/security/vpnc/Makefile +++ head/security/vpnc/Makefile @@ -4,7 +4,7 @@ PORTNAME= vpnc PORTVERSION= 0.5.3 PORTREVISION= 13 -CATEGORIES= security +CATEGORIES= security net-vpn MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/ \ LOCAL/ehaupt Index: head/sysutils/vpnc-scripts/Makefile =================================================================== --- head/sysutils/vpnc-scripts/Makefile +++ head/sysutils/vpnc-scripts/Makefile @@ -3,7 +3,7 @@ PORTNAME= vpnc-scripts PORTVERSION= 20190611 -CATEGORIES= sysutils +CATEGORIES= sysutils net-vpn MASTER_SITES= ftp://ftp.infradead.org/pub/${PORTNAME}/ \ ZI