3 files changed, 13 insertions, 60 deletions

diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile
index 75cef9f8dd77..2fafa811e574 100644
--- a/sysutils/burp/Makefile
+++ b/sysutils/burp/Makefile
@@ -3,12 +3,14 @@
 
 PORTNAME=	burp
 PORTVERSION?=	2.2.18
+PORTREVISION?=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	phascolarctos@protonmail.ch
 COMMENT=	Network backup and restore program
 
-LICENSE=	AGPLv3
+LICENSE=	AGPLv3 PD
+LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash \
@@ -17,7 +19,6 @@ LIB_DEPENDS=	librsync.so:net/librsync2
 
 USES=		autoreconf gmake libtool ncurses pkgconfig ssl
 USE_GITHUB=	yes
-USE_RC_SUBR=	burp
 
 GH_ACCOUNT=	grke
 
@@ -29,7 +30,15 @@ INSTALL_TARGET=	install-all
 CONFLICTS_INSTALL?=	burp-devel
 PORTSCOUT?=		limit:^2\.2\.
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 OPTIONS_DEFINE=		IPV6
 IPV6_CONFIGURE_ENABLE=	ipv6
 
+post-patch:
+	${REINPLACE_CMD} "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/freebsd/rc.d/burp
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/freebsd/rc.d/burp ${STAGEDIR}${PREFIX}/etc/rc.d/burp
+
 .include <bsd.port.mk>
diff --git a/sysutils/burp/files/burp.in b/sysutils/burp/files/burp.in
deleted file mode 100644
index b31b386828f4..000000000000
--- a/sysutils/burp/files/burp.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# Burp rc.d script, placed in the public domain by Jarkko Kniivilä @ 2014-05-14
-
-# PROVIDE: burp
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable Burp:
-#
-#  burp_enable="YES"
-#  # optional
-#  burp_config="%%PREFIX%%/etc/burp/burp-server.conf"
-#
-#
-
-export PATH="$PATH:/usr/local/bin:/usr/local/sbin"
-
-. /etc/rc.subr
-
-name=burp
-rcvar=burp_enable
-monitor_cmd="${name}_monitor"
-summary_cmd="${name}_summary"
-
-load_rc_config $name
-
-# Set some defaults
-: ${burp_enable:="NO"}
-: ${burp_config:="%%PREFIX%%/etc/burp/burp-server.conf"}
-
-burp_flags="-c ${burp_config}"
-
-command="/usr/local/sbin/${name}"
-command_args="> /dev/null 2>&1"
-
-pidfile="/var/run/${name}.server.pid"  # this really depends on the config file so make sure they concur
-required_files="${burp_config}"
-sig_reload="HUP"
-extra_commands="reload monitor summary"
-
-burp_monitor()
-{
-    rc_flags="-a s ${rc_flags}"
-    ${command} ${rc_flags}
-}
-
-burp_summary()
-{
-    # This allows you to get the output of the '-a S' flag thusly:
-    # service burp summary -C $my_client
-
-    rc_flags="-a S ${rc_flags}"
-    ${command} ${rc_flags} "$@"
-}
-
-run_rc_command "$@"
diff --git a/sysutils/burp/pkg-plist b/sysutils/burp/pkg-plist
index 180981cadde1..bd5b3fd05bbc 100644
--- a/sysutils/burp/pkg-plist
+++ b/sysutils/burp/pkg-plist
@@ -4,6 +4,7 @@ bin/vss_strip
 %%ETCDIR%%/burp.conf
 %%ETCDIR%%/clientconfdir/incexc/example
 %%ETCDIR%%/clientconfdir/testclient
+etc/rc.d/burp
 man/man8/bedup.8.gz
 man/man8/bsigs.8.gz
 man/man8/bsparse.8.gz
@@ -22,5 +23,5 @@ sbin/burp_ca
 %%DATADIR%%/scripts/timer_script
 @dir %%ETCDIR%%/CA-client
 @dir %%ETCDIR%%/autoupgrade/server/win32
-@dir %%ETCDIR%%/autoupgrade/server/win64/2.2.18
+@dir %%ETCDIR%%/autoupgrade/server/win64/%%PORTVERSION%%
 @dir /var/spool/burp