git: 1d5854a31b34 - main - net-p2p/rslsync: Update 2.7.3 → 2.8.1.1390

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sat, 09 Nov 2024 17:50:39 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1d5854a31b343cd2162b9795d528734303abb28d

commit 1d5854a31b343cd2162b9795d528734303abb28d
Author:     Volodymyr Kostyrko <arcade@b1t.name>
AuthorDate: 2024-11-09 17:45:34 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-11-09 17:50:10 +0000

    net-p2p/rslsync: Update 2.7.3 → 2.8.1.1390
    
    Changelog:
    https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log
    
    Improve port: split long lines, add NO_BUILD, merge do-build and
    do-install.
    
    PR:     281567
---
 net-p2p/rslsync/Makefile | 25 +++++++++++++++----------
 net-p2p/rslsync/distinfo | 10 +++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/net-p2p/rslsync/Makefile b/net-p2p/rslsync/Makefile
index b986a6c0f444..f4ffe7c61b4a 100644
--- a/net-p2p/rslsync/Makefile
+++ b/net-p2p/rslsync/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	rslsync
-DISTVERSION=	2.7.3
+DISTVERSION=	2.8.1.1390
 CATEGORIES=	net-p2p
-MASTER_SITES=	https://download-cdn.resilio.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/ \
-		http://download-cdn.resilio.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/
+MASTER_SITES=	https://download-cdn.resilio.com/${DISTVERSION}/freebsd/${CONFIG_ARCH}/0/
 DISTNAME=	resilio-sync_freebsd_${CONFIG_ARCH}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
@@ -22,6 +21,7 @@ USE_RC_SUBR=	rslsync
 
 CONFLICTS_INSTALL=	rslsync-beta
 
+NO_BUILD=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	GROUP=${GROUPS} \
 		USER=${USERS}
@@ -42,17 +42,22 @@ CONFIG_ARCH=	x64
 CONFIG_ARCH=	${ARCH}
 .endif
 
-do-build:
-	${WRKSRC}/rslsync --nodaemon --storage ${WRKSRC} --dump-sample-config > ${WRKSRC}/rslsync.conf.sample
-	${REINPLACE_CMD} -e 's;^//\([[:space:]]*"storage_path"[[:space:]]*:[[:space:]]*\)"/.*",$$;\1"/var/db/rslsync",;' ${WRKSRC}/rslsync.conf.sample
-	${REINPLACE_CMD} -e 's;^//\([[:space:]]*"pid_file"[[:space:]]*:[[:space:]]*\)"/.*",$$;\1"/var/run/rslsync/rslsync.pid",;' ${WRKSRC}/rslsync.conf.sample
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rslsync ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/rslsync.conf.sample ${STAGEDIR}${PREFIX}/etc
 	${MKDIR} ${STAGEDIR}/var/db/rslsync
+	${STAGEDIR}${PREFIX}/bin/rslsync --nodaemon \
+		--storage ${WRKSRC} --dump-sample-config \
+		> ${STAGEDIR}${PREFIX}/etc/rslsync.conf.sample
+	${REINPLACE_CMD} -e \
+		's;^//\([[:space:]]*"storage_path"[[:space:]]*:[[:space:]]*\)"/.*",$$;\1"/var/db/rslsync",;' \
+		-e \
+		's;^//\([[:space:]]*"pid_file"[[:space:]]*:[[:space:]]*\)"/.*",$$;\1"/var/run/rslsync/rslsync.pid",;' \
+		${STAGEDIR}${PREFIX}/etc/rslsync.conf.sample
 
 maintainer-makesum:
-	for arch in ${ONLY_FOR_ARCHS}; do ${MAKE} DISTINFO_FILE=/dev/stdout ARCH=$$arch makesum; done | ${AWK} '$$1 != "TIMESTAMP" || NR == 1' > ${DISTINFO_FILE}
+	for arch in ${ONLY_FOR_ARCHS}; do \
+		${MAKE} DISTINFO_FILE=/dev/stdout ARCH=$$arch makesum; \
+	done | ${AWK} 'BEGIN{TS=0}/TIMESTAMP/{if(TS==0){print;TS=1};next}/S(HA256|IZE)/{print}' \
+		> ${DISTINFO_FILE}
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/rslsync/distinfo b/net-p2p/rslsync/distinfo
index 9cfc8382323a..ecca63d689e6 100644
--- a/net-p2p/rslsync/distinfo
+++ b/net-p2p/rslsync/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1653154443
-SHA256 (rslsync-2.7.3/resilio-sync_freebsd_i386.tar.gz) = 850f1f16a4a3bf69501483b5cc08132276fb123ac180c64a8b89867ba5e3a819
-SIZE (rslsync-2.7.3/resilio-sync_freebsd_i386.tar.gz) = 13379750
-SHA256 (rslsync-2.7.3/resilio-sync_freebsd_x64.tar.gz) = b29bf30aac4af1c87cfe3cbd300de04b1c02a7cf098dcaebed7e4a1c05218d88
-SIZE (rslsync-2.7.3/resilio-sync_freebsd_x64.tar.gz) = 13406761
+TIMESTAMP = 1731000489
+SHA256 (rslsync-2.8.1.1390/resilio-sync_freebsd_x64.tar.gz) = 1531bdce3c854084d20e89be9c378ba7c00421ebcfb4d0ced55cc7e012b7427b
+SIZE (rslsync-2.8.1.1390/resilio-sync_freebsd_x64.tar.gz) = 13407677
+SHA256 (rslsync-2.8.1.1390/resilio-sync_freebsd_i386.tar.gz) = f6374787cd1a98a401622f74965eb3844aeb46588d01b87ea30359efcf765b57
+SIZE (rslsync-2.8.1.1390/resilio-sync_freebsd_i386.tar.gz) = 13381759