diff --git a/biology/ncbi-entrez-direct/Makefile b/biology/ncbi-entrez-direct/Makefile
index 858e4734786c..7ece210acd5e 100644
--- a/biology/ncbi-entrez-direct/Makefile
+++ b/biology/ncbi-entrez-direct/Makefile
@@ -1,81 +1,83 @@
 PORTNAME=	ncbi-entrez-direct
 DISTVERSION=	14.9.20210423
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect/versions/${PORTVERSION}/
 DISTFILES=	edirect.tar.gz
 DIST_SUBDIR=	edirect-${PORTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Access to the NCBI's suite of interconnected databases
 
 LICENSE=	PD
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
 		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
-		p5-XML-Simple>=0:textproc/p5-XML-Simple
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		curl:ftp/curl
 
 USES=		go:modules perl5 shebangfix
 USE_GITHUB=	nodefault
 
 # Dependency versions:
 #	make clean extract
 # 	cd ${WRKSRC}/cmd
 #	rm -r vendor
-#	../../../files/go-build
+#	../../../files/build-cmd
 # files/modules.txt: cd ${WRKSRC}/cmd && go mod vendor
 GHSD=		vendor/github.com
 GLSD=		vendor/golang.org
 GH_TUPLE=	fatih:color:v1.10.0:a/${GHSD}/fatih/color \
 		surgebase:porter2:56e4718818e8:b/${GHSD}/surgebase/porter2 \
 		gedex:inflector:16278e9db813:c/${GHSD}/gedex/inflector \
 		klauspost:cpuid:v1.3.1:d/${GHSD}/klauspost/cpuid \
 		pbnjay:memory:b12e5d931931:e/${GHSD}/pbnjay/memory \
 		mattn:go-colorable:v0.1.8:f/${GHSD}/mattn/go-colorable \
 		mattn:go-isatty:v0.0.12:g/${GHSD}/mattn/go-isatty \
 		fiam:gounidecode:8deddbd03fec:h/${GHSD}/fiam/gounidecode \
 		golang:text:v0.3.5:i/${GLSD}/x/text \
 		golang:sys:d5e6a3e2c0ae:j/${GLSD}/x/sys
 
 SHEBANG_FILES=	nquire edirect.pl word-at-a-time accn-at-a-time \
 		amino-acid-composition between-two-genes exclude-uid-lists \
 		filter-stop-words intersect-uid-lists phrase-search \
-		skip-if-file-exists theme-aliases
+		skip-if-file-exists theme-aliases test-edirect hgvs2spdi 
 
 PSCRIPTS=	efetch efilter einfo elink epost esearch esummary nquire
 SCRIPTS=	accn-at-a-time amino-acid-composition archive-pubmed \
 		between-two-genes download-ncbi-data download-pubmed \
 		download-sequence efetch efilter einfo elink epost \
 		esample esearch esummary exclude-uid-lists expand-current \
 		fetch-pubmed filter-stop-words gbf2xml index-extras \
 		index-pubmed intersect-uid-lists join-into-groups-of \
 		nquire phrase-search pm-collect pm-index pm-invert pm-merge \
 		pm-prepare pm-promote pm-refresh pm-stash rchive \
 		reorder-columns run-ncbi-converter skip-if-file-exists \
 		ecommon.sh sort-uniq-count sort-uniq-count-rank stream-pubmed \
 		theme-aliases transmute word-at-a-time xml2tbl xtract xy-plot \
-		hlp-xtract.txt transmute xml2json xtract
+		hlp-xtract.txt transmute xml2json xtract test-edirect \
+		align-columns hgvs2spdi sort-table print-columns
 
 post-extract:
 	@${MV} ${WRKDIR}/edirect/* ${WRKSRC}
 	@${RMDIR} ${WRKDIR}/edirect
 	@${MV} ${WRKSRC}/vendor ${WRKSRC}/cmd
 
 pre-configure:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} \
 		-e 's|$$PATH:$$pth|$$PATH:${PREFIX}/bin|g' \
 		-e 's|"$$pth"|${PREFIX}/bin|g' \
 		${PSCRIPTS}
 
 do-build:
 	@${CP} ${FILESDIR}/modules.txt ${WRKSRC}/cmd/vendor
 	@${CP} -R ${WRKSRC}/eutils ${WRKSRC}/cmd/vendor
-	@cd ${WRKSRC}/cmd && ${FILESDIR}/go-build
+	@cd ${WRKSRC}/cmd && ${FILESDIR}/build-cmd
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/edirect.pl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/cmd/*.FreeBSD ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/edirect-test.sh ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/biology/ncbi-entrez-direct/distinfo b/biology/ncbi-entrez-direct/distinfo
index be93ed84e5a1..e959f316b0e8 100644
--- a/biology/ncbi-entrez-direct/distinfo
+++ b/biology/ncbi-entrez-direct/distinfo
@@ -1,23 +1,23 @@
-TIMESTAMP = 1619301195
+TIMESTAMP = 1619443745
 SHA256 (edirect-14.9.20210423/edirect.tar.gz) = 9d6534226164fc5dfae7abcf25bfdbd08db068b27f1c13b8a3c4681cda5b0cea
 SIZE (edirect-14.9.20210423/edirect.tar.gz) = 829737
 SHA256 (edirect-14.9.20210423/fatih-color-v1.10.0_GH0.tar.gz) = a00342a7ffb8b119346dce56e152a111cbb9eab3970c429cc2ed4272aec2858e
 SIZE (edirect-14.9.20210423/fatih-color-v1.10.0_GH0.tar.gz) = 1267532
 SHA256 (edirect-14.9.20210423/surgebase-porter2-56e4718818e8_GH0.tar.gz) = d06994daa4d561c2ab477a7072bb7e40a8d39904c88ebf649a1b89105aabdf35
 SIZE (edirect-14.9.20210423/surgebase-porter2-56e4718818e8_GH0.tar.gz) = 156593
 SHA256 (edirect-14.9.20210423/gedex-inflector-16278e9db813_GH0.tar.gz) = d872f3fb5fcc8d8ff25e915670f7ce867a035cfd7a38a2e01ef1550f8770331b
 SIZE (edirect-14.9.20210423/gedex-inflector-16278e9db813_GH0.tar.gz) = 6784
 SHA256 (edirect-14.9.20210423/klauspost-cpuid-v1.3.1_GH0.tar.gz) = 3bf2da7358c8ed33c05bac2ca733749ade03eadf184d81cc7b16fcbe2e230f1d
 SIZE (edirect-14.9.20210423/klauspost-cpuid-v1.3.1_GH0.tar.gz) = 367144
 SHA256 (edirect-14.9.20210423/pbnjay-memory-b12e5d931931_GH0.tar.gz) = 8903a451771edca578c2aa09848f23027dc02df2c67f675f4dd1aae257a71ad6
 SIZE (edirect-14.9.20210423/pbnjay-memory-b12e5d931931_GH0.tar.gz) = 3076
 SHA256 (edirect-14.9.20210423/mattn-go-colorable-v0.1.8_GH0.tar.gz) = 1027954f9abbe06b6e117e3047af70204dd0eb4f8c27fcd459fb2574b279755f
 SIZE (edirect-14.9.20210423/mattn-go-colorable-v0.1.8_GH0.tar.gz) = 9571
 SHA256 (edirect-14.9.20210423/mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
 SIZE (edirect-14.9.20210423/mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
 SHA256 (edirect-14.9.20210423/fiam-gounidecode-8deddbd03fec_GH0.tar.gz) = b763f4eb0d0f130821b52484565b32bae1585c4cb0edc57adb94f13b67765176
 SIZE (edirect-14.9.20210423/fiam-gounidecode-8deddbd03fec_GH0.tar.gz) = 190666
 SHA256 (edirect-14.9.20210423/golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27
 SIZE (edirect-14.9.20210423/golang-text-v0.3.5_GH0.tar.gz) = 8348127
 SHA256 (edirect-14.9.20210423/golang-sys-d5e6a3e2c0ae_GH0.tar.gz) = 6cd44aa33cb0fc4caedadde44b3a943bece0aa67d803c00bfb09b03222845f19
 SIZE (edirect-14.9.20210423/golang-sys-d5e6a3e2c0ae_GH0.tar.gz) = 1539001
diff --git a/biology/ncbi-entrez-direct/files/go-build b/biology/ncbi-entrez-direct/files/build-cmd
similarity index 55%
rename from biology/ncbi-entrez-direct/files/go-build
rename to biology/ncbi-entrez-direct/files/build-cmd
index d108b7da6209..1e2ad04bfde9 100755
--- a/biology/ncbi-entrez-direct/files/go-build
+++ b/biology/ncbi-entrez-direct/files/build-cmd
@@ -1,7 +1,10 @@
 #!/bin/sh -ex
 
+# This script replaces setup.sh, which is designed to download GO binaries
+# and dependencies and hence does not fit into a package manager build.
+
 platform=`uname -s`
 export HOME=$(pwd)
 go build -o xtract."$platform" xtract.go
 go build -o transmute."$platform" transmute.go
 go build -o rchive."$platform" rchive.go
diff --git a/biology/ncbi-entrez-direct/files/edirect-test.sh b/biology/ncbi-entrez-direct/files/edirect-test.sh
deleted file mode 100755
index 26da1db4ce88..000000000000
--- a/biology/ncbi-entrez-direct/files/edirect-test.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -ex
-
-##########################################################################
-#   Function description:
-#       Pause until user presses return
-##########################################################################
-
-pause()
-{
-    local junk
-    
-    printf "Press return to continue..."
-    read junk
-}
-
-esearch -db pubmed -query "opsin gene conversion" | \
-  elink -related | \
-  elink -target protein
-pause
-
-esearch -db pubmed -query "lycopene cyclase" | efetch -format abstract
-pause
-
-esearch -db protein -query "lycopene cyclase" | efetch -format fasta
-pause
-
-esearch -db pubmed -query "opsin gene conversion" | \
-  elink -related | efilter -query "tetrachromacy"
-pause
-
-efilter -days 60 -datetype PDAT
-efilter -mindate 1990 -maxdate 1999 -datetype PDAT
-
diff --git a/biology/ncbi-entrez-direct/pkg-plist b/biology/ncbi-entrez-direct/pkg-plist
index 536ba728e03f..2ef17c29f959 100644
--- a/biology/ncbi-entrez-direct/pkg-plist
+++ b/biology/ncbi-entrez-direct/pkg-plist
@@ -1,55 +1,59 @@
 bin/accn-at-a-time
+bin/align-columns
 bin/amino-acid-composition
 bin/archive-pubmed
 bin/between-two-genes
 bin/download-ncbi-data
 bin/download-pubmed
 bin/download-sequence
 bin/ecommon.sh
-bin/edirect-test.sh
 bin/edirect.pl
 bin/efetch
 bin/efilter
 bin/einfo
 bin/elink
 bin/epost
 bin/esample
 bin/esearch
 bin/esummary
 bin/exclude-uid-lists
 bin/expand-current
 bin/fetch-pubmed
 bin/filter-stop-words
 bin/gbf2xml
+bin/hgvs2spdi
 bin/hlp-xtract.txt
 bin/index-extras
 bin/index-pubmed
 bin/intersect-uid-lists
 bin/join-into-groups-of
 bin/nquire
 bin/phrase-search
 bin/pm-collect
 bin/pm-index
 bin/pm-invert
 bin/pm-merge
 bin/pm-prepare
 bin/pm-promote
 bin/pm-refresh
 bin/pm-stash
+bin/print-columns
 bin/rchive
 bin/rchive.FreeBSD
 bin/reorder-columns
 bin/run-ncbi-converter
 bin/skip-if-file-exists
+bin/sort-table
 bin/sort-uniq-count
 bin/sort-uniq-count-rank
 bin/stream-pubmed
+bin/test-edirect
 bin/theme-aliases
 bin/transmute
 bin/transmute.FreeBSD
 bin/word-at-a-time
 bin/xml2json
 bin/xml2tbl
 bin/xtract
 bin/xtract.FreeBSD
 bin/xy-plot