git: 889e1cee765e - main - security/stunnel: Update MASTER_SITES and do minor tweaking

From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sat, 01 Jan 2022 21:54:42 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=889e1cee765e89647cce19c2ac6416213764cf9b

commit 889e1cee765e89647cce19c2ac6416213764cf9b
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-01-01 21:50:56 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2022-01-01 21:51:34 +0000

    security/stunnel: Update MASTER_SITES and do minor tweaking
    
    Rework MASTER_SITES, remove old/dead/unofficial mirrors and use
    upstream's primary site as fallback
    Replace PORTVERSION with DISTVERSION
    Replace @unexec with @preunexec
    
    PR:             260855
    Approved by:    zi (maintainer), mentors (implicit)
---
 security/stunnel/Makefile  | 19 ++++---------------
 security/stunnel/pkg-plist |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 92bbb0b58e83..6b1163964864 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,23 +1,12 @@
 # Created by: Martti Kuparinen <martti.kuparinen@ericsson.com>
 
 PORTNAME=	stunnel
-PORTVERSION=	5.61
+DISTVERSION=	5.61
 PORTEPOCH=	1
 CATEGORIES=	security
-MASTER_SITES=	https://www.stunnel.org/downloads/%SUBDIR%/ \
-		https://www.stunnel.org/downloads/beta/ \
-		http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
-		http://mirrors.go-part.com/stunnel/%SUBDIR%/ \
-		http://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \
-		ftp://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \
-		http://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \
-		ftp://ftp.surfnet.nl/pub/networking/stunnel/%SUBDIR%/ \
-		http://ftp.surfnet.nl/pub/networking/stunnel/%SUBDIR%/ \
-		ftp://stunnel.mirt.net/stunnel/%SUBDIR%/ \
-		http://www.namesdir.com/mirrors/stunnel/%SUBDIR%/ \
-		http://stunnel.cybermirror.org/%SUBDIR%/ \
-		http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
-		ZI
+MASTER_SITES=	https://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/ \
+		https://www.stunnel.org/downloads/archive/5.x/ \
+		http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	SSL encryption wrapper for standard network daemons
diff --git a/security/stunnel/pkg-plist b/security/stunnel/pkg-plist
index 902aae236b37..b80cc8cd4490 100644
--- a/security/stunnel/pkg-plist
+++ b/security/stunnel/pkg-plist
@@ -35,4 +35,4 @@ man/man8/stunnel.pl.8.gz
 @dir lib/stunnel
 @dir etc/stunnel
 @dir etc/stunnel/conf.d
-@unexec if [ -d %D/etc/stunnel ]; then echo "If you are permanently removing this port, you should run ``rm -rf %D/etc/stunnel`` to remove any configuration files left."; fi
+@preunexec if [ -d %D/etc/stunnel ]; then echo "If you are permanently removing this port, you should run ``rm -rf %D/etc/stunnel`` to remove any configuration files left."; fi