Index: head/net/scamper/Makefile
===================================================================
--- head/net/scamper/Makefile	(revision 549913)
+++ head/net/scamper/Makefile	(revision 549914)
@@ -1,20 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	scamper
-DISTVERSION=	20200717
+DISTVERSION=	20200923
 CATEGORIES=	net
-MASTER_SITES=	http://www.caida.org/tools/measurement/scamper/code/
+MASTER_SITES=	https://www.caida.org/tools/measurement/scamper/code/
 DISTNAME=	${PORTNAME}-cvs-${PORTVERSION}
 
 MAINTAINER=	mjl@luckie.org.nz
 COMMENT=	Tool for parallelised IPv4 and IPv6 measurement
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake libtool ssl
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFINE=	HOIHO UPTIME
+OPTIONS_SUB=	yes
+
+HOIHO_DESC=	Install sc_hoiho
+UPTIME_DESC=	Install sc_uptime
+
+HOIHO_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
+HOIHO_USES=		localbase:ldflags
+HOIHO_CONFIGURE_WITH=	pcre2 sc_hoiho
+
+UPTIME_USES=		localbase:ldflags sqlite:3
+UPTIME_CONFIGURE_WITH=	sc_uptime
 
 .include <bsd.port.mk>
Index: head/net/scamper/distinfo
===================================================================
--- head/net/scamper/distinfo	(revision 549913)
+++ head/net/scamper/distinfo	(revision 549914)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594940403
-SHA256 (scamper-cvs-20200717.tar.gz) = adaabbc4f480d1d85e3c0414b1d7f47918f686451a452bfa7e1f21c8c99210b2
-SIZE (scamper-cvs-20200717.tar.gz) = 1873657
+TIMESTAMP = 1600829286
+SHA256 (scamper-cvs-20200923.tar.gz) = dc9988d9a696152b5066f9d52dfc24cb898275b5c22a9f420cb901115901c324
+SIZE (scamper-cvs-20200923.tar.gz) = 1885843
Index: head/net/scamper/pkg-plist
===================================================================
--- head/net/scamper/pkg-plist	(revision 549913)
+++ head/net/scamper/pkg-plist	(revision 549914)
@@ -1,69 +1,73 @@
 bin/scamper
 bin/sc_ally
 bin/sc_analysis_dump
 bin/sc_attach
 bin/sc_bdrmap
 bin/sc_erosprober
 bin/sc_filterpolicy
+%%HOIHO%%bin/sc_hoiho
 bin/sc_ipiddump
 bin/sc_pinger
 bin/sc_prefixscan
 bin/sc_radargun
 bin/sc_remoted
 bin/sc_speedtrap
 bin/sc_tbitblind
 bin/sc_tbitpmtud
 bin/sc_tracediff
 bin/sc_ttlexp
+%%UPTIME%%bin/sc_uptime
 bin/sc_warts2csv
 bin/sc_warts2json
 bin/sc_warts2pcap
 bin/sc_warts2text
 bin/sc_wartscat
 bin/sc_wartsdump
 bin/sc_wartsfilter
 bin/sc_wartsfix
 lib/libscamperfile.a
 lib/libscamperfile.so.1
 lib/libscamperfile.so.1.0.0
 lib/libscamperfile.so
 man/man1/sc_ally.1.gz
 man/man1/sc_analysis_dump.1.gz
 man/man1/sc_attach.1.gz
 man/man1/sc_bdrmap.1.gz
 man/man1/sc_erosprober.1.gz
 man/man1/sc_filterpolicy.1.gz
+%%HOIHO%%man/man1/sc_hoiho.1.gz
 man/man1/sc_ipiddump.1.gz
 man/man1/sc_pinger.1.gz
 man/man1/sc_prefixscan.1.gz
 man/man1/sc_radargun.1.gz
 man/man1/sc_remoted.1.gz
 man/man1/sc_speedtrap.1.gz
 man/man1/sc_tbitblind.1.gz
 man/man1/sc_tbitpmtud.1.gz
 man/man1/sc_tracediff.1.gz
 man/man1/sc_ttlexp.1.gz
+%%UPTIME%%man/man1/sc_uptime.1.gz
 man/man1/sc_warts2csv.1.gz
 man/man1/sc_warts2json.1.gz
 man/man1/sc_warts2pcap.1.gz
 man/man1/sc_warts2text.1.gz
 man/man1/sc_wartscat.1.gz
 man/man1/sc_wartsdump.1.gz
 man/man1/sc_wartsfilter.1.gz
 man/man1/sc_wartsfix.1.gz
 man/man1/scamper.1.gz
 man/man3/libscamperfile.3.gz
 man/man5/warts.5.gz
 include/scamper_addr.h
 include/scamper_dealias.h
 include/scamper_file.h
 include/scamper_host.h
 include/scamper_icmpext.h
 include/scamper_list.h
 include/scamper_neighbourdisc.h
 include/scamper_ping.h
 include/scamper_sniff.h
 include/scamper_sting.h
 include/scamper_tbit.h
 include/scamper_trace.h
 include/scamper_tracelb.h