From 71ffdb8e0c1dd749dc123c787f10d3dc8d7c2ea6 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@FreeBSD.org>
Date: Wed, 7 Nov 2001 11:01:38 +0000
Subject: [PATCH] Update to 3.21b, fixing a Makefile bogon and a file
 descriptor leak. Add a new knob, PEM_DIR, to specify the path to install the
 certificate generated during the stunnel build, and later, the one generated
 using the 'cert' target of the port Makefile.

Approved by:	maintainer
---
 security/stunnel/Makefile | 8 +++++---
 security/stunnel/distinfo | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 96052f56b5eb..b29eff051e86 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	3.21
+PORTVERSION=	3.21b
 CATEGORIES=	security
 MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
 		ftp://stunnel.mirt.net/stunnel/ \
@@ -19,10 +19,12 @@ USE_OPENSSL=	YES
 IS_INTERACTIVE=	YES	# prompts for information while generating certificate
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var/run
+CONFIGURE_ARGS=	--localstatedir=/var/run --with-pem-dir=${PEM_DIR}
 
 MAN8=		stunnel.8
 
+PEM_DIR?=	${PREFIX}/etc
+
 post-install:
 	@${SED} "s+!!PREFIX!!+${PREFIX}+g" < ${FILESDIR}/stunnel.sh \
 		> ${PREFIX}/etc/rc.d/stunnel.sh.sample
@@ -42,6 +44,6 @@ cert:
 	@${ECHO} "**************************************************************************"
 	@${ECHO} ""
 	@(cd ${WRKSRC}; make cert)
-	${INSTALL} -m 600 ${WRKSRC}/stunnel.pem ${PREFIX}/etc/
+	${INSTALL} -m 600 ${WRKSRC}/stunnel.pem ${PEM_DIR}/
 
 .include <bsd.port.mk>
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 157c4d851c3b..1cf83898d0f3 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1 +1 @@
-MD5 (stunnel-3.21.tar.gz) = b4c71ef60a7a8810132881b69ebf680a
+MD5 (stunnel-3.21b.tar.gz) = f0f830e935f8ba39860722df320220b5