9 files changed, 2 insertions, 315 deletions

diff --git a/MOVED b/MOVED
index 3f91fbdd852b..2da74e16a43a 100644
--- a/MOVED
+++ b/MOVED
@@ -15166,3 +15166,4 @@ databases/postgresql94-plpython|databases/postgresql95-plpython|2020-07-24|Has e
 databases/postgresql94-server|databases/postgresql95-server|2020-07-24|Has expired: PostgreSQL-9.4 has reached end-of-life
 databases/postgresql94-pltcl|databases/postgresql95-pltcl|2020-07-24|Has expired: PostgreSQL-9.4 has reached end-of-life
 databases/postgresql94-plperl|databases/postgresql95-plperl|2020-07-24|Has expired: PostgreSQL-9.4 has reached end-of-life
+net/dshell||2020-07-24|Uses deprecated version of python
diff --git a/net/Makefile b/net/Makefile
index d4ff73831d45..5e5e3bf0722f 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -131,7 +131,6 @@
     SUBDIR += drive
     SUBDIR += dropbox-api-command
     SUBDIR += dropbox-uploader
-    SUBDIR += dshell
     SUBDIR += dtcp
     SUBDIR += dtcpclient
     SUBDIR += dual-dhclient
diff --git a/net/dshell/Makefile b/net/dshell/Makefile
deleted file mode 100644
index 56c68566b74d..000000000000
--- a/net/dshell/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# Created by: Nobutaka Mantani <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	dshell
-PORTVERSION=	3.0.${SNAPDATE}
-CATEGORIES=	net
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	Extensible network forensic analysis framework
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-09-15
-
-BUILD_DEPENDS=	bash:shells/bash \
-		${PYTHON_PKGNAMEPREFIX}GeoIP2>0:net/py-GeoIP2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-USES=		python:2.7 shebangfix
-USE_GITHUB=	yes
-
-NO_ARCH=	yes
-SHEBANG_FILES=	bin/*.py
-
-GH_ACCOUNT=	USArmyResearchLab
-GH_PROJECT=	Dshell
-GH_TAGNAME=	2c63476
-SNAPDATE=	20200302
-
-OPTIONS_DEFINE=	DOCS
-
-MAKE_ENV+=	PYTHON_CMD=${PYTHON_CMD}
-
-post-patch:
-.for f in bin/generate-dshellrc.py doc/generate-doc.sh
-	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/${f}
-	${REINPLACE_CMD} -e 's|pydoc|${LOCALBASE}/bin/pydoc${PYTHON_VER}|' ${WRKSRC}/${f}
-.endfor
-
-post-build:
-	${RM} -r ${WRKSRC}/lib/${PYTHON_VERSION}
-	${REINPLACE_CMD} -e 's|${WRKSRC}|${ETCDIR}|' ${WRKSRC}/dshell ${WRKSRC}/dshell-decode
-	${REINPLACE_CMD} -e 's|BINPATH=${WRKSRC}/bin|BINPATH=${PREFIX}/libexec/dshell|' \
-		-e 's|DSHELL=${WRKSRC}|DSHELL=${PYTHON_SITELIBDIR}|' \
-		-e 's|DATAPATH=${WRKSRC}/share|DATAPATH=${DATADIR}|' \
-		-e 's|DECODERPATH=${WRKSRC}/decoders|DECODERPATH=${PYTHON_SITELIBDIR}/dshell/decoders|' \
-		-e 's|LIBPATH=${WRKSRC}/lib|LIBPATH=${PYTHON_SITELIBDIR}/dshell|' \
-		${WRKSRC}/.dshellrc
-	(cd ${WRKSRC}/doc; ${REINPLACE_CMD} -e 's|${WRKSRC}|${PYTHON_SITELIBDIR}/dshell|g' *.html)
-
-do-install:
-.for f in dshell dshell-decode
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}/${PREFIX}/bin
-.endfor
-	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/dshell
-.for f in decode.py pcapanon.py
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}/${PREFIX}/libexec/dshell
-.endfor
-	(cd ${STAGEDIR}/${PREFIX}/libexec/dshell; \
-		${LN} -sf decode.py decode)
-	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dshell
-	${INSTALL_DATA} ${WRKSRC}/.dshellrc ${STAGEDIR}/${PREFIX}/etc/dshell
-	(cd ${WRKSRC}/lib; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell)
-	(cd ${WRKSRC}/decoders; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell/decoders)
-	${MKDIR} ${STAGEDIR}/${DATADIR}/GeoIP
-
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}/${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR}
-	(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} "-name *\.html")
-
-.include <bsd.port.mk>
diff --git a/net/dshell/distinfo b/net/dshell/distinfo
deleted file mode 100644
index cbc4dc091032..000000000000
--- a/net/dshell/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1584791197
-SHA256 (USArmyResearchLab-Dshell-3.0.20200302-2c63476_GH0.tar.gz) = bf45410ba1e4cfb52a90abc1ead17c85a3ea678ccc72bbd1cd4d54f662b36da6
-SIZE (USArmyResearchLab-Dshell-3.0.20200302-2c63476_GH0.tar.gz) = 717485
diff --git a/net/dshell/files/patch-Makefile b/net/dshell/files/patch-Makefile
deleted file mode 100644
index 9b35fbf56ddd..000000000000
--- a/net/dshell/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2019-05-22 22:16:29 UTC
-+++ Makefile
-@@ -6,7 +6,7 @@ dshell: rc initpy pydoc
- 
- rc:
- 	# Generating .dshellrc and dshell files
--	python $(PWD)/bin/generate-dshellrc.py $(PWD)
-+	$(PYTHON_CMD) $(PWD)/bin/generate-dshellrc.py $(PWD)
- 	chmod 755 $(PWD)/dshell
- 	chmod 755 $(PWD)/dshell-decode
- 	chmod 755 $(PWD)/bin/decode.py
-@@ -15,7 +15,7 @@ rc:
- initpy:
- 	find $(PWD)/decoders -type d -not -path \*.svn\* -print -exec touch {}/__init__.py \;
- 
--pydoc:
-+pydoc: rc
- 	(cd $(PWD)/doc && ./generate-doc.sh $(PWD) )
- 
- clean: clean_pyc clean_ln
diff --git a/net/dshell/pkg-descr b/net/dshell/pkg-descr
deleted file mode 100644
index c28345225426..000000000000
--- a/net/dshell/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-DShell is an extensible network forensic analysis framework.
-Enables rapid development of plugins to support the dissection of
-network packet captures.
-
-Key features:
-
-Robust stream reassembly
-IPv4 and IPv6 support
-Custom output handlers
-Chainable decoders
-
-WWW: https://github.com/USArmyResearchLab/Dshell
diff --git a/net/dshell/pkg-message b/net/dshell/pkg-message
deleted file mode 100644
index 6131283f2704..000000000000
--- a/net/dshell/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To use the GeoIP Databases from DShell, please download
-GeoLite2-Country.tar.gz and GeoLite2-ASN.tar.gz from the
-following URL and place GeoLite2-Country.mmdb and
-GeoLite2-ASN.mmdb into ${PREFIX}/share/dshell/GeoIP.
-
-https://dev.maxmind.com/geoip/geoip2/geolite2/
-EOM
-}
-]
diff --git a/net/dshell/pkg-plist b/net/dshell/pkg-plist
deleted file mode 100644
index e07be96901a3..000000000000
--- a/net/dshell/pkg-plist
+++ /dev/null
@@ -1,188 +0,0 @@
-bin/dshell
-bin/dshell-decode
-%%ETCDIR%%/.dshellrc
-libexec/dshell/decode.py
-libexec/dshell/decode
-libexec/dshell/pcapanon.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dhcp/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dhcp/dhcp.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dhcp/dhcp.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns-asn.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns-asn.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns-cc.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns-cc.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/dns.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/innuendo-dns.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/innuendo-dns.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/reservedips.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/dns/reservedips.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/asn-filter.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/asn-filter.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/country.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/country.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/snort.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/snort.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/track.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/filter/track.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/large-flows.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/large-flows.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/long-flows.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/long-flows.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/netflow.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/netflow.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/reverse-flow.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/flows/reverse-flow.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/ftp/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/ftp/ftp.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/ftp/ftp.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/flash-detect.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/flash-detect.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/httpdump.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/httpdump.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/joomla-cve-2015-8562.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/joomla-cve-2015-8562.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/ms15-034.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/ms15-034.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/peht.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/peht.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/rip-http.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/rip-http.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/web.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/http/web.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/malware/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/malware/emdivi/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/malware/emdivi/emdivi_c2.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/malware/emdivi/emdivi_c2.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/followstream.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/followstream.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/grep.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/grep.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/merge.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/merge.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/synrst.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/synrst.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/writer.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/writer.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/xor.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/misc/xor.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/nbns/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/nbns/nbns.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/nbns/nbns.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/bitcoin.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/bitcoin.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/ether.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/ether.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/ip.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/ip.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/protocol.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/protocol/protocol.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/psexec.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/psexec.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/rip-smb-uploads.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/rip-smb-uploads.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/smbfiles.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/smb/smbfiles.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/templates/PacketDecoder.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/templates/PacketDecoder.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/templates/SessionDecoder.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/templates/SessionDecoder.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/templates/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/tftp/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/tftp/tftp.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/tftp/tftp.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/__init__.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/rtp.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/rtp.pyc
-%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/sip.py
-%%PYTHON_SITELIBDIR%%/dshell/decoders/voip/sip.pyc
-%%PYTHON_SITELIBDIR%%/dshell/dfile.py
-%%PYTHON_SITELIBDIR%%/dshell/dfile.pyc
-%%PYTHON_SITELIBDIR%%/dshell/dnsdecoder.py
-%%PYTHON_SITELIBDIR%%/dshell/dnsdecoder.pyc
-%%PYTHON_SITELIBDIR%%/dshell/dshell.py
-%%PYTHON_SITELIBDIR%%/dshell/dshell.pyc
-%%PYTHON_SITELIBDIR%%/dshell/httpdecoder.py
-%%PYTHON_SITELIBDIR%%/dshell/httpdecoder.pyc
-%%PYTHON_SITELIBDIR%%/dshell/output/colorout.py
-%%PYTHON_SITELIBDIR%%/dshell/output/colorout.pyc
-%%PYTHON_SITELIBDIR%%/dshell/output/csvout.py
-%%PYTHON_SITELIBDIR%%/dshell/output/csvout.pyc
-%%PYTHON_SITELIBDIR%%/dshell/output/elasticout.py
-%%PYTHON_SITELIBDIR%%/dshell/output/elasticout.pyc
-%%PYTHON_SITELIBDIR%%/dshell/output/jsonout.py
-%%PYTHON_SITELIBDIR%%/dshell/output/jsonout.pyc
-%%PYTHON_SITELIBDIR%%/dshell/output/netflowout.py
-%%PYTHON_SITELIBDIR%%/dshell/output/netflowout.pyc
-%%PYTHON_SITELIBDIR%%/dshell/output/output.py
-%%PYTHON_SITELIBDIR%%/dshell/output/output.pyc
-%%PYTHON_SITELIBDIR%%/dshell/output/xmlout.py
-%%PYTHON_SITELIBDIR%%/dshell/output/xmlout.pyc
-%%PYTHON_SITELIBDIR%%/dshell/smbdecoder.py
-%%PYTHON_SITELIBDIR%%/dshell/smbdecoder.pyc
-%%PYTHON_SITELIBDIR%%/dshell/util.py
-%%PYTHON_SITELIBDIR%%/dshell/util.pyc
-%%PORTDOCS%%%%DOCSDIR%%/PacketDecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/SessionDecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/asn-filter.html
-%%PORTDOCS%%%%DOCSDIR%%/bitcoin.html
-%%PORTDOCS%%%%DOCSDIR%%/colorout.html
-%%PORTDOCS%%%%DOCSDIR%%/country.html
-%%PORTDOCS%%%%DOCSDIR%%/csvout.html
-%%PORTDOCS%%%%DOCSDIR%%/dfile.html
-%%PORTDOCS%%%%DOCSDIR%%/dhcp.html
-%%PORTDOCS%%%%DOCSDIR%%/dns-asn.html
-%%PORTDOCS%%%%DOCSDIR%%/dns-cc.html
-%%PORTDOCS%%%%DOCSDIR%%/dns.html
-%%PORTDOCS%%%%DOCSDIR%%/dnsdecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/dshell.html
-%%PORTDOCS%%%%DOCSDIR%%/emdivi_c2.html
-%%PORTDOCS%%%%DOCSDIR%%/ether.html
-%%PORTDOCS%%%%DOCSDIR%%/flash-detect.html
-%%PORTDOCS%%%%DOCSDIR%%/followstream.html
-%%PORTDOCS%%%%DOCSDIR%%/ftp.html
-%%PORTDOCS%%%%DOCSDIR%%/grep.html
-%%PORTDOCS%%%%DOCSDIR%%/httpdecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/httpdump.html
-%%PORTDOCS%%%%DOCSDIR%%/innuendo-dns.html
-%%PORTDOCS%%%%DOCSDIR%%/ip.html
-%%PORTDOCS%%%%DOCSDIR%%/joomla-cve-2015-8562.html
-%%PORTDOCS%%%%DOCSDIR%%/jsonout.html
-%%PORTDOCS%%%%DOCSDIR%%/large-flows.html
-%%PORTDOCS%%%%DOCSDIR%%/long-flows.html
-%%PORTDOCS%%%%DOCSDIR%%/merge.html
-%%PORTDOCS%%%%DOCSDIR%%/ms15-034.html
-%%PORTDOCS%%%%DOCSDIR%%/nbns.html
-%%PORTDOCS%%%%DOCSDIR%%/netflow.html
-%%PORTDOCS%%%%DOCSDIR%%/netflowout.html
-%%PORTDOCS%%%%DOCSDIR%%/output.html
-%%PORTDOCS%%%%DOCSDIR%%/peht.html
-%%PORTDOCS%%%%DOCSDIR%%/protocol.html
-%%PORTDOCS%%%%DOCSDIR%%/psexec.html
-%%PORTDOCS%%%%DOCSDIR%%/reservedips.html
-%%PORTDOCS%%%%DOCSDIR%%/reverse-flow.html
-%%PORTDOCS%%%%DOCSDIR%%/rip-http.html
-%%PORTDOCS%%%%DOCSDIR%%/rip-smb-uploads.html
-%%PORTDOCS%%%%DOCSDIR%%/rtp.html
-%%PORTDOCS%%%%DOCSDIR%%/sip.html
-%%PORTDOCS%%%%DOCSDIR%%/smbdecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/smbfiles.html
-%%PORTDOCS%%%%DOCSDIR%%/snort.html
-%%PORTDOCS%%%%DOCSDIR%%/synrst.html
-%%PORTDOCS%%%%DOCSDIR%%/tftp.html
-%%PORTDOCS%%%%DOCSDIR%%/track.html
-%%PORTDOCS%%%%DOCSDIR%%/util.html
-%%PORTDOCS%%%%DOCSDIR%%/web.html
-%%PORTDOCS%%%%DOCSDIR%%/writer.html
-%%PORTDOCS%%%%DOCSDIR%%/xmlout.html
-%%PORTDOCS%%%%DOCSDIR%%/xor.html
-@dir %%DATADIR%%/GeoIP
diff --git a/net/py-GeoIP2/Makefile b/net/py-GeoIP2/Makefile
index 755523949616..cc2e6897b9d6 100644
--- a/net/py-GeoIP2/Makefile
+++ b/net/py-GeoIP2/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}maxminddb>=1.5.2:net/py-maxminddb@${PY_FLAVO
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.2:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 
 GH_ACCOUNT=	maxmind
 GH_PROJECT=	GeoIP2-python