Update MASTER_SITES: use upstream release tarball

- Sort PLIST
- Update pkg-descr
- Take maintainership

4 files changed, 36 insertions, 38 deletions

diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile
index 322e92e7aca5..acd31c5817bb 100644
--- a/sysutils/burp/Makefile
+++ b/sysutils/burp/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	burp
-PORTVERSION?=	2.2.18
-# whenever PORTREVISION is increased,
-# sysutils/burp-devel's PKGVERSION must also increase
-PORTREVISION?=	4
+PORTVERSION=	2.2.18
+PORTREVISION=	4
 CATEGORIES=	sysutils
+MASTER_SITES=	https://github.com/grke/burp/releases/download/${PORTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Network backup and restore program
 
 LICENSE=	AGPLv3 PD
@@ -20,33 +19,26 @@ BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash \
 LIB_DEPENDS=	librsync.so:net/librsync
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		autoreconf gmake libtool ncurses pkgconfig ssl
-USE_RC_SUBR=	burp
-USE_GITHUB=	yes
-GH_ACCOUNT=	grke
+#USES=		gmake libtool ncurses pkgconfig ssl tar:bz2
+USES=		libtool ncurses pkgconfig ssl tar:bz2
 
-GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${ETCDIR}
-
+GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-all
-
-CONFLICTS_INSTALL?=	burp-devel
-PORTSCOUT?=		limit:^2\.2\.
+USE_RC_SUBR=	burp
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=		IPV6
-IPV6_CONFIGURE_ENABLE=	ipv6
+CONFLICTS_INSTALL=	burp-devel
 
-CONFIG_FILES=	CA.cnf \
-		burp-server.conf \
-		burp.conf \
-		clientconfdir/testclient
+PORTSCOUT=	limit:^2\.2\.
+
+OPTIONS_DEFINE=	IPV6
+IPV6_CONFIGURE_ENABLE=	ipv6
 
 post-install:
-.for FILE in ${CONFIG_FILES}
-	${MV} ${STAGEDIR}${ETCDIR}/${FILE} \
-		${STAGEDIR}${ETCDIR}/${FILE}.sample
+.for file in CA.cnf burp.conf burp-server.conf clientconfdir/testclient
+	${MV} ${STAGEDIR}${ETCDIR}/${file} ${STAGEDIR}${ETCDIR}/${file}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/burp/distinfo b/sysutils/burp/distinfo
index f59cf1381bc0..519e88d7481e 100644
--- a/sysutils/burp/distinfo
+++ b/sysutils/burp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553621533
-SHA256 (grke-burp-2.2.18_GH0.tar.gz) = 7d3e4b4563dbe0b399a050462f4be01dc39a331f7a6eba760341fb1cf80cdd00
-SIZE (grke-burp-2.2.18_GH0.tar.gz) = 632805
+TIMESTAMP = 1598777616
+SHA256 (burp-2.2.18.tar.bz2) = 9c0c5298d8c2995d30d4e1a63d2882662e7056ce2b0cee1f65d7d0a6775c0f81
+SIZE (burp-2.2.18.tar.bz2) = 816545
diff --git a/sysutils/burp/pkg-descr b/sysutils/burp/pkg-descr
index 447b6e5952ff..77e7e407bd50 100644
--- a/sysutils/burp/pkg-descr
+++ b/sysutils/burp/pkg-descr
@@ -1,6 +1,12 @@
-Burp is a backup and restore program.
-It uses librsync in order to save on the amount of space that is used
-by each backup. It also uses VSS (Volume Shadow Copy Service)
-to make snapshots when backing up Windows computers.
+Burp is a network backup and restore program. It attempts to reduce network
+traffic and the amount of space that is used by each backup. There are two
+independent backup protocols to choose from:
+- Protocol 1: Optionally uses librsync.
+  Available in all burp versions and is stable.
+- Protocol 2: Uses variable length chunking for inline deduplication, and
+  sparse indexing on the server side.
+  Available from burp version 2.0.x, but is experimental and should not be used
+  in production.
 
 WWW: https://burp.grke.org/
+WWW: https://github.com/grke/burp
diff --git a/sysutils/burp/pkg-plist b/sysutils/burp/pkg-plist
index a4513bca59fa..51f25d668195 100644
--- a/sysutils/burp/pkg-plist
+++ b/sysutils/burp/pkg-plist
@@ -1,9 +1,12 @@
 bin/vss_strip
-@sample %%ETCDIR%%/CA.cnf.sample
-@sample %%ETCDIR%%/burp-server.conf.sample
-@sample %%ETCDIR%%/burp.conf.sample
-%%ETCDIR%%/clientconfdir/incexc/example
-@sample %%ETCDIR%%/clientconfdir/testclient.sample
+@dir etc/burp/CA-client
+@sample etc/burp/CA.cnf.sample
+@dir etc/burp/autoupgrade/server/win32
+@dir etc/burp/autoupgrade/server/win64/%%PORTVERSION%%
+@sample etc/burp/burp-server.conf.sample
+@sample etc/burp/burp.conf.sample
+etc/burp/clientconfdir/incexc/example
+@sample etc/burp/clientconfdir/testclient.sample
 man/man8/bedup.8.gz
 man/man8/bsigs.8.gz
 man/man8/bsparse.8.gz
@@ -20,7 +23,4 @@ sbin/burp_ca
 %%DATADIR%%/scripts/ssl_extra_checks_script
 %%DATADIR%%/scripts/summary_script
 %%DATADIR%%/scripts/timer_script
-@dir %%ETCDIR%%/CA-client
-@dir %%ETCDIR%%/autoupgrade/server/win32
-@dir %%ETCDIR%%/autoupgrade/server/win64/%%PORTVERSION%%
 @dir /var/spool/burp