Remove expired ports:

2017-12-31 security/gnupg20: Will reach EOL upstream on 2017-12-31 2018-01-01 dns/dualserver: Please migrate to dns/dnsmasq. Over the years dualserver becomes unmaintenaible. 2018-01-01 devel/p5-Parse-Pidl44: yes 2018-01-01 sysutils/DTraceToolkit: Now maintained as part of the base system
svn path=/head/; revision=457766
2024-12-20 04:02:27 +00:00 · 2018-01-01 11:41:37 +00:00 · 2018-01-01 11:41:37 +00:00 · 9088acc2a4 · 2021-03-31 03:12:20 +00:00
commit 9088acc2a4
parent 7b393d7885
23 changed files with 4 additions and 1747 deletions
--- a/4
+++ b/4
@ -9834,3 +9834,7 @@ www/npm3|www/npm|2017-12-31|Has expired: use www/npm or www/npm-node* instead
 net/rubygem-fog-aws0|net/rubygem-fog-aws|2017-12-31|Has expired: use net/rubygem-fog-aws or net/rubygem-fog-aws1 instead
 net-mgmt/nrpe|net-mgmt/nrpe3|2018-01-01|nrpe 2.0 not maintained, use nrpe 3.0
 net-mgmt/nrpe-ssl|net-mgmt/nrpe3|2018-01-01|nrpe 2.0 not maintained, use nrpe 3.0
+security/gnupg20|security/gnupg|2018-01-01|Has expired: Will reach EOL upstream on 2017-12-31
+dns/dualserver|dns/dnsmasq|2018-01-01|Has expired: Please migrate to dns/dnsmasq. Over the years dualserver becomes unmaintenaible.
+devel/p5-Parse-Pidl44|devel/p5-Parse-Pidl|2018-01-01|Has expired: use devel/p5-Parse-Pidl instead
+sysutils/DTraceToolkit||2018-01-01|Has expired: Now maintained as part of the base system
--- a/devel/Makefile
+++ b/devel/Makefile
@ -3126,7 +3126,6 @@
    SUBDIR += p5-Parse-PMFile
    SUBDIR += p5-Parse-PerlConfig
    SUBDIR += p5-Parse-Pidl
-    SUBDIR += p5-Parse-Pidl44
    SUBDIR += p5-Parse-PlainConfig
    SUBDIR += p5-Parse-RecDescent
    SUBDIR += p5-Parse-Win32Registry
--- a/devel/p5-Parse-Pidl44/Makefile
+++ b/devel/p5-Parse-Pidl44/Makefile
@ -1,37 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=		Parse-Pidl
-PORTVERSION=		${SAMBA4_VERSION}
-PORTREVISION=		0
-PORTEPOCH=		0
-CATEGORIES=		devel perl5
-PKGNAMEPREFIX=		p5-
-PKGNAMESUFFIX=		44
-
-COMMENT=		IDL compiler written in Perl
-
-LICENSE=		GPLv3
-
-DEPRECATED=		yes
-EXPIRATION_DATE=	2018-01-01
-
-BUILD_DEPENDS=		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
-RUN_DEPENDS:=		${BUILD_DEPENDS}
-
-CONFLICTS=
-
-SAMBA4_PORT=		net/samba44
-SAMBA4_SUBPORT=		yes
-
-MASTERDIR=		${.CURDIR}/../../${SAMBA4_PORT}
-PKGDIR=			${.CURDIR}
-
-USES=			perl5
-USE_PERL5=		configure
-PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}
-WRKSRC=			${WRKDIR}/${DISTNAME}/pidl
-
-post-extract:
-			@${RM} -r ${WRKSRC}/lib/Parse/Yapp ${WRKSRC}/lib/wscript_build
-
-.include "${MASTERDIR}/Makefile"
--- a/devel/p5-Parse-Pidl44/pkg-descr
+++ b/devel/p5-Parse-Pidl44/pkg-descr
@ -1,24 +0,0 @@
-Pidl is an IDL compiler written in Perl that aims to be somewhat
-compatible with the midl compiler. IDL stands for "Interface Definition
-Language".
-
-Pidl can generate stubs for DCE/RPC server code, DCE/RPC client code and
-ethereal dissectors for DCE/RPC traffic.
-
-IDL compilers like pidl take a description of an interface as their
-input and use it to generate C (though support for other languages may
-be added later) code that can use these interfaces, pretty print data
-sent using these interfaces, or even generate ethereal dissectors that
-can parse data sent over the wire by these interfaces.
-
-Pidl takes IDL files in the same format as is used by midl, converts it
-to a .pidl file (which contains pidl's internal representation of the
-interface) and can then generate whatever output you need. .pidl files
-should be used for debugging purposes only. Write your interface
-definitions in .idl format.
-
-The goal of pidl is to implement a IDL compiler that can be used while
-developing the RPC subsystem in Samba (for both marshalling/unmarshalling
-and debugging purposes).
-
-WWW: http://search.cpan.org/dist/Parse-Pidl/
--- a/devel/p5-Parse-Pidl44/pkg-plist
+++ b/devel/p5-Parse-Pidl44/pkg-plist
@ -1,33 +0,0 @@
-bin/pidl
-%%SITE_PERL%%/Parse/Pidl.pm
-%%SITE_PERL%%/Parse/Pidl/CUtil.pm
-%%SITE_PERL%%/Parse/Pidl/Compat.pm
-%%SITE_PERL%%/Parse/Pidl/Dump.pm
-%%SITE_PERL%%/Parse/Pidl/Expr.pm
-%%SITE_PERL%%/Parse/Pidl/IDL.pm
-%%SITE_PERL%%/Parse/Pidl/NDR.pm
-%%SITE_PERL%%/Parse/Pidl/ODL.pm
-%%SITE_PERL%%/Parse/Pidl/Samba3/ClientNDR.pm
-%%SITE_PERL%%/Parse/Pidl/Samba3/ServerNDR.pm
-%%SITE_PERL%%/Parse/Pidl/Samba3/Template.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/COM/Header.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/COM/Proxy.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/COM/Stub.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/Header.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/NDR/Client.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/NDR/Parser.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/NDR/Server.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/Python.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/TDR.pm
-%%SITE_PERL%%/Parse/Pidl/Samba4/Template.pm
-%%SITE_PERL%%/Parse/Pidl/Typelist.pm
-%%SITE_PERL%%/Parse/Pidl/Util.pm
-%%SITE_PERL%%/Parse/Pidl/Wireshark/Conformance.pm
-%%SITE_PERL%%/Parse/Pidl/Wireshark/NDR.pm
-%%PERL5_MAN3%%/Parse::Pidl::Dump.3.gz
-%%PERL5_MAN3%%/Parse::Pidl::NDR.3.gz
-%%PERL5_MAN3%%/Parse::Pidl::Util.3.gz
-%%PERL5_MAN3%%/Parse::Pidl::Wireshark::Conformance.3.gz
-%%PERL5_MAN3%%/Parse::Pidl::Wireshark::NDR.3.gz
-%%PERL5_MAN1%%/pidl.1.gz
--- a/dns/Makefile
+++ b/dns/Makefile
@ -62,7 +62,6 @@
    SUBDIR += doc
    SUBDIR += dq
    SUBDIR += drool
-    SUBDIR += dualserver
    SUBDIR += dynip
    SUBDIR += erlang-idna
    SUBDIR += ez-ipupdate
--- a/dns/dualserver/Makefile
+++ b/dns/dualserver/Makefile
@ -1,36 +0,0 @@
-# Created by: Gabor Kovesdan
-# $FreeBSD$
-
-PORTNAME=	dualserver
-PORTVERSION=	6.94
-PORTREVISION=	1
-PORTEPOCH=	1
-CATEGORIES=	dns net
-MASTER_SITES=	http://rodrigo.osorio.free.fr/freebsd/distfiles/
-DISTNAME=	${PORTNAME}V${PORTVERSION}
-
-MAINTAINER=	rodrigo@FreeBSD.org
-COMMENT=	Combined DHCP/DNS server for small LANs
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Please migrate to dns/dnsmasq. Over the years dualserver becomes unmaintenaible.
-EXPIRATION_DATE=	2018-01-01
-
-USES=		dos2unix
-USE_RC_SUBR=	dualserver
-PLIST_FILES=	sbin/dualserver etc/dualserver.conf.sample
-
-post-extract:
-	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
-
-do-build:
-	${CXX} ${CXXFLAGS} -o ${WRKSRC}/dualserver \
-		${WRKSRC}/dualserverd.cpp -lpthread
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini \
-		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
-
-.include <bsd.port.mk>
--- a/dns/dualserver/distinfo
+++ b/dns/dualserver/distinfo
@ -1,2 +0,0 @@
-SHA256 (dualserverV6.94.tar.gz) = 3007e6508eb95d06f3c8764951ff6d3276733409e2119f6299c9485060b9445c
-SIZE (dualserverV6.94.tar.gz) = 796893
--- a/dns/dualserver/files/dualserver.in
+++ b/dns/dualserver/files/dualserver.in
@ -1,28 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: dualserver
-# REQUIRE: SERVERS
-# BEFORE:
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="dualserver"
-rcvar=dualserver_enable
-start_cmd="dualserver_startcmd"
-stop_cmd="dualserver_stopcmd"
-
-dualserver_startcmd ()
-{
-%%PREFIX%%/sbin/dualserver
-}
-
-dualserver_stopcmd ()
-{
-killall dualserver
-}
-
-load_rc_config $name
-run_rc_command "$1"
--- a/dns/dualserver/files/patch-dualserverd.cpp
+++ b/dns/dualserver/files/patch-dualserverd.cpp
@ -1,211 +0,0 @@
--- dualserverd.cpp.orig	2015-07-27 19:41:31.000000000 +0000
-+++ dualserverd.cpp	2015-07-27 19:46:28.000000000 +0000
-@@ -22,10 +22,16 @@
- #include <math.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-+#ifdef __FreeBSD__
-+#include <sys/socket.h>
-+#endif
- #include <limits.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <net/if.h>
-+#ifdef __FreeBSD__
-+#include <net/if_dl.h>
-+#endif
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <unistd.h>
-@@ -39,6 +45,9 @@
- #include <syslog.h>
- #include <pthread.h>
- #include <map>
-+#ifdef __FreeBSD__
-+#include <ifaddrs.h>
-+#endif
- using namespace std;
- #include "dualserverd.h"
- 
-@@ -84,7 +93,11 @@
- const char send200[] = "HTTP/1.1 200 OK\r\nDate: %s\r\nLast-Modified: %s\r\nContent-Type: text/html\r\nConnection: Close\r\nContent-Length:         \r\n\r\n";
- //const char send200[] = "HTTP/1.1 200 OK\r\nDate: %s\r\nLast-Modified: %s\r\nContent-Type: text/html\r\nConnection: Close\r\nTransfer-Encoding: chunked\r\n";
- const char line200[] = "<td>%s</td>";
-+#ifdef __FreeBSD__
-+const char sVersion[] = "Dual DHCP DNS Server Version 6.94 for FreeBSD";
-+#else
- const char sVersion[] = "Dual DHCP DNS Server Version 6.94 Linux Build 7011";
-+#endif
- const data4 opData[] =
-     {
- 		{ "SubnetMask", DHCP_OPTION_NETMASK, 3 },
-@@ -261,7 +274,7 @@
-         strcpy(leaFile, "/tmp/dualserver.state");
- 
-     if (!iniFile[0])
-        strcpy(iniFile, "/etc/dualserver.ini");
-+        strcpy(iniFile, "/usr/local/etc/dualserver.conf");
- 
-     if (verbatim)
-     {
-@@ -4002,7 +4015,13 @@
- 	else if (req->dhcpp.header.bp_broadcast || !req->remote.sin_addr.s_addr || req->reqIP)
- 	{
- 		req->remote.sin_port = htons(IPPORT_DHCPC);
-+#ifdef __FreeBSD__
-+    req->remote.sin_addr.s_addr = network.dhcpConn[req->sockInd].addr.sin_addr.s_addr | 
-+    (~network.dhcpConn[req->sockInd].mask);
-+    //printf("broadcast dhcp response to %s\n",inet_ntoa(req->remote.sin_addr));
-+#else
- 		req->remote.sin_addr.s_addr = INADDR_BROADCAST;
-+#endif
- 		req->dhcpp.header.bp_broadcast = 1;
- 	}
- 	else
-@@ -8983,6 +9002,10 @@
- 					newNetwork.dhcpConn[i].broadCastSize = sizeof(newNetwork.dhcpConn[i].broadCastVal);
- 
- 					setsockopt(newNetwork.dhcpConn[i].sock, SOL_SOCKET, SO_BROADCAST, (char*)&newNetwork.dhcpConn[i].broadCastVal, newNetwork.dhcpConn[i].broadCastSize);
-+#ifdef __FreeBSD__
-+          // See man ip
-+          setsockopt(newNetwork.dhcpConn[i].sock,IPPROTO_IP, IP_ONESBCAST,(char*)&newNetwork.dhcpConn[i].broadCastVal, newNetwork.dhcpConn[i].broadCastSize);
-+#endif
- 					int nRet = bind(newNetwork.dhcpConn[i].sock, (sockaddr*)&newNetwork.dhcpConn[i].addr, sizeof(struct sockaddr_in));
- 
- 					if (nRet == SOCKET_ERROR)
-@@ -9034,7 +9057,11 @@
- 					setsockopt(newNetwork.dhcpListener.sock, SOL_SOCKET, SO_REUSEADDR, (char*)&newNetwork.dhcpListener.reUseVal, newNetwork.dhcpListener.reUseSize);
- 					newNetwork.dhcpListener.pktinfoVal = true;
- 					newNetwork.dhcpListener.pktinfoSize = sizeof(newNetwork.dhcpListener.pktinfoVal);
-+#ifdef __FreeBSD__
-+					setsockopt(newNetwork.dhcpListener.sock, IPPROTO_IP, IP_RECVIF, &newNetwork.dhcpListener.pktinfoVal, newNetwork.dhcpListener.pktinfoSize);
-+#else
- 					setsockopt(newNetwork.dhcpListener.sock, IPPROTO_IP, IP_PKTINFO, &newNetwork.dhcpListener.pktinfoVal, newNetwork.dhcpListener.pktinfoSize);
-+#endif
- 
- 					newNetwork.dhcpListener.addr.sin_family = AF_INET;
- 					newNetwork.dhcpListener.addr.sin_addr.s_addr = INADDR_ANY;
-@@ -9458,6 +9485,10 @@
- 	else
- 		return false;
- }
-+#define MAX(a,b) ((a)>(b)?(a):(b))
-+#define NEXTIFR(i)                                              \
-+    ((struct ifreq *)((char *)&(i)->ifr_addr                    \
-+        + MAX((i)->ifr_addr.sa_len, sizeof((i)->ifr_addr))) )
- 
- void getInterfaces(data1 *network)
- {
-@@ -9469,14 +9500,16 @@
- 	if (ioctl(cfig.fixedSocket, SIOCGIFCONF, &Ifc) >= 0)
- 	{
- 
-+		struct ifreq *ifrp, *ifen;
- 		MYDWORD addr, mask;
- 		short flags;
- 		struct ifreq pIfr;
-		MYBYTE numInterfaces = Ifc.ifc_len / sizeof(ifreq);
-+		ifrp = (struct ifreq *)Ifc.ifc_buf;
-+		ifen = (struct ifreq *)((char *)Ifc.ifc_buf + Ifc.ifc_len);
- 
-		for (MYBYTE i = 0 ; i < numInterfaces; i++)
-		{
-			memcpy(&pIfr, &(IfcBuf[i]), sizeof(ifreq));
-+		for (; ifrp < ifen;) {
-+			memcpy(&pIfr, ifrp, sizeof(ifreq));
-+			ifrp = NEXTIFR(ifrp);
- 
- 			if (!ioctl(cfig.fixedSocket, SIOCGIFADDR, &pIfr))
- 				addr = ((struct sockaddr_in*)&pIfr.ifr_addr)->sin_addr.s_addr;
-@@ -9496,8 +9529,11 @@
- 
- 			if (addr && !(flags & IFF_LOOPBACK))
- 				addServer(network->allServers, addr);
-
-+#ifdef __FreeBSD__
-+			if (addr && mask && !(flags & IFF_POINTOPOINT) && !(flags & IFF_LOOPBACK))
-+#else
- 			if (addr && mask && !(flags & IFF_POINTOPOINT) && !(flags & IFF_LOOPBACK) && !(flags & IFF_DYNAMIC))
-+#endif
- 			{
- 				if ((flags & IFF_RUNNING) && (flags & IFF_UP))
- 				{
-@@ -9656,6 +9692,12 @@
- 
- MYWORD gdmess(data9 *req, MYBYTE sockInd)
- {
-+#ifdef __FreeBSD__
-+    struct cmsghdr *cmsg;
-+    struct sockaddr_dl * isdl;
-+    struct sockaddr_in *isin;
-+    struct ifaddrs *ifap, *ifa;
-+#endif
-     //sprintf(logBuff, "Socket=%u", sockInd);
- 	//logDHCPMess(logBuff, 1);
-     memset(req, 0, sizeof(data9));
-@@ -9671,7 +9713,11 @@
-         req->msg.msg_name = &req->remote;
-         req->msg.msg_namelen = sizeof(sockaddr_in);
-         req->msg.msg_control = &req->msgcontrol;
-+#ifdef __FreeBSD__
-+        req->msg.msg_controllen = sizeof(req->msgcontrol);
-+#else
-         req->msg.msg_controllen = sizeof(msg_control);
-+#endif
-         req->msg.msg_flags = msgflags;
- 
-         int flags = 0;
-@@ -9680,6 +9726,45 @@
-         if (errno || req->bytes <= 0)
-             return 0;
- 
-+#ifdef __FreeBSD__
-+        isdl = NULL;
-+        isin = NULL;
-+        MYDWORD addr=0;
-+        bool found_addr = false;
-+
-+        if (req->msg.msg_controllen>0){
-+          for (cmsg=CMSG_FIRSTHDR(&req->msg);cmsg;cmsg=CMSG_NXTHDR(&req->msg,cmsg)){
-+            if (cmsg->cmsg_type==IP_RECVIF) {
-+              isdl=(struct sockaddr_dl *)CMSG_DATA(cmsg);
-+            }
-+          }
-+        }
-+
-+        if (!isdl || getifaddrs(&ifap))
-+          return 0;
-+
-+        for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-+          if(ifa->ifa_addr->sa_family == AF_INET &&
-+          strcmp(ifa->ifa_name,isdl->sdl_data) == 0){
-+            isin = (struct sockaddr_in *)ifa->ifa_addr;
-+            addr = isin->sin_addr.s_addr;
-+            for (int i = 0; (i < MAX_SERVERS || !network.dhcpConn[i].server);i++){
-+              if (addr == network.dhcpConn[i].server){
-+                found_addr = true;
-+                req->sockInd = i;
-+                break;
-+              }
-+            }
-+          }
-+        }
-+        freeifaddrs(ifap);
-+
-+        if(!found_addr) return 0;
-+
-+        //printf("IF = %s\n", isdl->sdl_data);
-+        //printf("RADDR = %s\n", inet_ntoa(isin->sin_addr));
-+        
-+#else
-         //printf("%u\n", req->msg.msg_controllen);
-         //msgcontrol = (msg_control*)msg.msg_control;
- 
-@@ -9711,6 +9796,7 @@
-                 break;
-             }
-         }
-+#endif
-     }
-     else
-     {
--- a/dns/dualserver/files/patch-dualserverd.h
+++ b/dns/dualserver/files/patch-dualserverd.h
@ -1,41 +0,0 @@
--- dualserverd.h	2012-11-09 15:45:52.000000000 +0100
-+++ dualserverd.h	2012-11-09 15:55:00.000000000 +0100
-@@ -52,9 +52,11 @@
- #define INADDR_NONE ULONG_MAX
- #endif
- 
-+#ifndef __FreeBSD__
- #ifndef IFF_DYNAMIC
- #define IFF_DYNAMIC 0x8000
- #endif
-+#endif
- 
- #define MYWORD unsigned short
- #define MYBYTE unsigned char
-@@ -594,10 +596,15 @@
- 
- struct msg_control
- {
-	ulong cmsg_len;
-+	u_long cmsg_len;
- 	int cmsg_level;
- 	int cmsg_type;
-	in_pktinfo pktinfo;
-+  #ifdef __FreeBSD__
-+  // Arbitrary size, when the size is required we use sizeof
-+  unsigned char pktinfo[100];
-+  #else
-+  in_pktinfo pktinfo;
-+  #endif
- };
- 
- #if defined(__hppa__) || \
-@@ -713,7 +720,7 @@
- 	union
- 	{
- 		int broadCastVal;
-		bool pktinfoVal;
-+		int pktinfoVal;
- 	};
- 	union
- 	{
--- a/dns/dualserver/pkg-descr
+++ b/dns/dualserver/pkg-descr
@ -1,6 +0,0 @@
-Combined DHCP/DNS Server for Small LAN. Dynamic DHCP allocates/renew host
-addresses while Caching DNS Server first try resolving from DHCP allotted
-names then from Cache then only forwarding to External DNS Servers. Auto
-Config and auto Dynamic DNS update.
-
-WWW: https://sourceforge.net/projects/dhcp-dns-server/
--- a/security/Makefile
+++ b/security/Makefile
@ -182,7 +182,6 @@
    SUBDIR += gnomint
    SUBDIR += gnupg
    SUBDIR += gnupg1
-    SUBDIR += gnupg20
    SUBDIR += gnutls
    SUBDIR += go-cve-dictionary
    SUBDIR += go.crypto
--- a/security/gnupg20/Makefile
+++ b/security/gnupg20/Makefile
@ -1,77 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	gnupg
-PORTVERSION=	2.0.30
-PORTREVISION=	2
-CATEGORIES=	security
-MASTER_SITES=	GNUPG
-PKGNAMESUFFIX=	20
-
-MAINTAINER=	adamw@FreeBSD.org
-COMMENT=	The GNU Privacy Guard (stable version)
-
-LICENSE=	GPLv3 LGPL3
-LICENSE_COMB=	multi
-LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
-LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LIB
-
-LIB_DEPENDS=	libassuan.so:security/libassuan \
-		libgcrypt.so:security/libgcrypt \
-		libgpg-error.so:security/libgpg-error \
-		libksba.so:security/libksba \
-		libpth.so:devel/pth
-BUILD_DEPENDS=	libgpg-error>=1.11:security/libgpg-error
-RUN_DEPENDS=	pinentry:security/pinentry
-
-CONFLICTS=	gnupg-2.1.* gnupg-2.2.*
-CPE_VENDOR=	gnupg
-
-DEPRECATED=	Will reach EOL upstream on 2017-12-31
-EXPIRATION_DATE=2017-12-31
-
-USES=		cpe gmake iconv readline tar:bzip2
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-symcryptrun
-INFO=		gnupg
-
-OPTIONS_DEFINE=	LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS DOCS SUID_GPG
-OPTIONS_DEFAULT=CURL SCDAEMON
-NO_OPTIONS_SORT=yes
-OPTIONS_SUB=	yes
-
-GPGSM_DESC=	Enable GPGSM (requires LDAP)
-LDAP_DESC=	LDAP keyserver interface
-KDNS_DESC=	Use DNS CERT helper
-SCDAEMON_DESC=	Enable Smartcard daemon (with libusb)
-STD_SOCKET_DESC=Use standard socket for agent
-SUID_GPG_DESC=	Install GPG setuid
-
-CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
-
-GPGSM_RUN_DEPENDS=	dirmngr:security/dirmngr
-GPGSM_CONFIGURE_ENABLE=	gpgsm
-GPGSM_IMPLIES=		LDAP
-
-KDNS_LIB_DEPENDS=	libadns.so:dns/adns
-KDNS_CONFIGURE_WITH=	adns=${LOCALBASE}
-
-LDAP_USE=		OPENLDAP=yes
-LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
-
-NLS_USES=		gettext
-NLS_CONFIGURE_ENABLE=	nls
-
-SCDAEMON_CONFIGURE_ENABLE=	scdaemon
-
-STD_SOCKET_CONFIGURE_ENABLE=	standard-socket
-
-post-patch:
-	@${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
-		${WRKSRC}/tools/symcryptrun.c
-
-post-install:
-	@${MV} ${STAGEDIR}${DATADIR}/*.txt ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
--- a/security/gnupg20/distinfo
+++ b/security/gnupg20/distinfo
@ -1,3 +0,0 @@
-TIMESTAMP = 1484437262
-SHA256 (gnupg-2.0.30.tar.bz2) = e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71
-SIZE (gnupg-2.0.30.tar.bz2) = 4414652
--- a/security/gnupg20/pkg-descr
+++ b/security/gnupg20/pkg-descr
@ -1,9 +0,0 @@
-GnuPG is a complete and free replacement for PGP. This is the "stable"
-version.
-
-GnuPG allows encrypting and signing your data and communication, and
-features a versatile key management system as well as access modules
-for many public key directories. GnuPG, also known as GPG, is a command
-line tool with features for easy integration with other applications.
-
-WWW: https://www.gnupg.org/
--- a/security/gnupg20/pkg-plist
+++ b/security/gnupg20/pkg-plist
@ -1,115 +0,0 @@
-bin/gpg-agent
-bin/gpg-connect-agent
-%%SUID_GPG%%@(,,4555) bin/gpg2
-%%NO_SUID_GPG%%bin/gpg2
-bin/gpgconf
-bin/gpgkey2ssh
-bin/gpgparsemail
-%%GPGSM%%bin/gpgsm
-bin/gpgsm-gencert.sh
-bin/gpgv2
-%%GPGSM%%bin/kbxutil
-bin/symcryptrun
-bin/watchgnupg
-libexec/gpg-check-pattern
-%%SCDAEMON%%libexec/gnupg-pcsc-wrapper
-libexec/gpg-preset-passphrase
-libexec/gpg-protect-tool
-libexec/gpg2keys_curl
-libexec/gpg2keys_finger
-libexec/gpg2keys_hkp
-%%KDNS%%libexec/gpg2keys_kdns
-%%LDAP%%libexec/gpg2keys_ldap
-%%SCDAEMON%%libexec/scdaemon
-man/man1/gpg-agent.1.gz
-man/man1/gpg-connect-agent.1.gz
-man/man1/gpg-preset-passphrase.1.gz
-man/man1/gpg2.1.gz
-man/man1/gpgconf.1.gz
-man/man1/gpgparsemail.1.gz
-man/man1/gpgsm-gencert.sh.1.gz
-man/man1/gpgsm.1.gz
-man/man1/gpgv2.1.gz
-man/man1/scdaemon.1.gz
-man/man1/symcryptrun.1.gz
-man/man1/watchgnupg.1.gz
-man/man8/addgnupghome.8.gz
-man/man8/applygnupgdefaults.8.gz
-sbin/addgnupghome
-sbin/applygnupgdefaults
-%%PORTDOCS%%%%DOCSDIR%%/DETAILS
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/KEYSERVER
-%%PORTDOCS%%%%DOCSDIR%%/OpenPGP
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TRANSLATE
-%%PORTDOCS%%%%DOCSDIR%%/examples/README
-%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf
-%%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list
-%%PORTDOCS%%%%DOCSDIR%%/examples/scd-event
-%%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.be.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.ca.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.cs.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.da.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.de.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.el.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.eo.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.es.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.et.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.fi.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.fr.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.gl.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.hu.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.id.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.it.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.ja.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.nb.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.pl.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.pt.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.pt_BR.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.ro.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.ru.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.sk.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.sv.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.tr.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.zh_CN.txt
-%%PORTDOCS%%%%DOCSDIR%%/help.zh_TW.txt
-%%PORTDOCS%%%%DOCSDIR%%/qualified.txt
-%%DATADIR%%/com-certs.pem
-%%DATADIR%%/gpg-conf.skel
-%%NLS%%share/locale/be/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/da/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/el/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/et/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/id/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
-@postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg
-@postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg
--- a/sysutils/DTraceToolkit/Makefile
+++ b/sysutils/DTraceToolkit/Makefile
@ -1,93 +0,0 @@
-# Created by: Steven Kreuzer <steven@exit2shell.com>
-# $FreeBSD$
-
-PORTNAME=	dtrace-toolkit
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	sysutils
-
-MAINTAINER=	skreuzer@FreeBSD.org
-COMMENT=	Collection of useful scripts for DTrace
-
-DEPRECATED=     Now maintained as part of the base system
-EXPIRATION_DATE=        2018-01-01
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	opendtrace
-GH_PROJECT=	toolkit
-GH_TAGNAME=	f36d00b
-USES=		shebangfix
-SHEBANG_LANG=	sh
-sh_OLD_CMD=	/usr/bin/sh ./sh
-sh_CMD=		${SH}
-perl_OLD_CMD=	\\./perl
-ruby_OLD_CMD=	\\./ruby
-SHEBANG_FILES=	Apps/shellsnoop \
-		Code/Perl/func_abc.pl \
-		Code/Perl/func_malloc.pl \
-		Code/Perl/func_slow.pl \
-		Code/Perl/hello.pl \
-		Code/Perl/hello_strict.pl \
-		Code/Python/func_abc.py \
-		Code/Python/func_slow.py \
-		Code/Ruby/func_abc.rb \
-		Code/Ruby/func_slow.rb \
-		Code/Shell/func_abc.sh \
-		Code/Shell/func_slow.sh \
-		Code/Shell/func_waste.sh \
-		Disk/diskhits \
-		Disk/iopending \
-		FS/vopstat \
-		Include/test.ksh \
-		Kernel/cpudists \
-		Kernel/cputimes \
-		Kernel/dnlcstat \
-		Mem/xvmstat \
-		Net/connections \
-		Net/tcpsnoop \
-		Net/tcpsnoop_snv \
-		Net/tcptop \
-		Net/tcptop_snv \
-		Proc/dappprof \
-		Proc/dapptrace \
-		Proc/fddist \
-		Proc/lastwords \
-		Proc/pfilestat \
-		Proc/sampleproc \
-		Proc/topsysproc \
-		System/topsyscall \
-		Zones/zvmstat \
-		dexplorer \
-		dtruss \
-		dvmstat \
-		errinfo \
-		execsnoop \
-		hotkernel \
-		hotuser \
-		install \
-		iopattern \
-		iosnoop \
-		iotop \
-		opensnoop \
-		procsystime \
-		rwsnoop \
-		rwtop \
-		statsnoop
-
-NO_BUILD=	yes
-
-do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC}; ${TAR} --exclude '*.orig' -cf - . ) | \
-		(cd ${STAGEDIR}${DATADIR}/; ${TAR} xvf -)
-	${LN} -fs ${DATADIR}/hotkernel ${STAGEDIR}${PREFIX}/bin/hotkernel
-	${LN} -fs ${DATADIR}/procsystime ${STAGEDIR}${PREFIX}/bin/procsystime
-	${LN} -fs ${DATADIR}/opensnoop ${STAGEDIR}${PREFIX}/bin/opensnoop
-	${LN} -fs ${DATADIR}/Apps/shellsnoop ${STAGEDIR}${PREFIX}/bin/shellsnoop
-
-.for MANPAGE in hotkernel procsystime opensnoop shellsnoop
-	${INSTALL_MAN} ${WRKSRC}/Man/man1m/${MANPAGE}.1m \
-		${STAGEDIR}${MAN1PREFIX}/man/man1/${MANPAGE}.1
-.endfor
-
-.include <bsd.port.mk>
--- a/sysutils/DTraceToolkit/distinfo
+++ b/sysutils/DTraceToolkit/distinfo
@ -1,3 +0,0 @@
-TIMESTAMP = 1463628205
-SHA256 (opendtrace-toolkit-1.0-f36d00b_GH0.tar.gz) = 28d2ab2c846792286e30eac8e052313d2f1b1335242be85cfa4b6f52b18165c8
-SIZE (opendtrace-toolkit-1.0-f36d00b_GH0.tar.gz) = 438889
--- a/sysutils/DTraceToolkit/pkg-descr
+++ b/sysutils/DTraceToolkit/pkg-descr
@ -1,4 +0,0 @@
-The DTraceToolkit is a collection of useful documented scripts developed
-by the DTrace community and maintained as part of Open DTrace.
-
-WWW: https://github.com/opendtrace/toolkit
--- a/sysutils/DTraceToolkit/pkg-message
+++ b/sysutils/DTraceToolkit/pkg-message
@ -1,6 +0,0 @@
-**************************************************************
-* At this point it is prudent to remind you that DTrace      *
-* support in FreeBSD is incomplete and experimental. Many of *
-* these scripts will not work as they are either too Solaris *
-* specific or use probes which are unsupported at this time. *
-**************************************************************
--- a/sysutils/DTraceToolkit/pkg-plist
+++ b/sysutils/DTraceToolkit/pkg-plist
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@ -6,7 +6,6 @@
    SUBDIR += 3dm
    SUBDIR += 44bsd-more
    SUBDIR += 915resolution
-    SUBDIR += DTraceToolkit
    SUBDIR += LPRng
    SUBDIR += LPRngTool
    SUBDIR += UEFITool