From 0d35bbc9aaaccaa306a00ac0895b42d7d9a8d7f1 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 13 Jan 2001 18:39:44 +0000
Subject: Use SSLCERTS for location of OpenSSL certificates directory.

---
 security/stunnel/Makefile | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'security/stunnel')

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 71b11307b6c..9f259d11889 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/12/19 07:03:21 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/01/13 18:41:33 jlam Exp $
 #
 
 DISTNAME=		stunnel-3.9
@@ -14,23 +14,9 @@ DEPENDS+=		pth>=1.3.5:../../devel/pth
 USE_SSL=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
-CONFIGURE_ARGS+=	--with-cert-dir="${SSL_CERT_DIR}"
+CONFIGURE_ARGS+=	--with-cert-dir="${SSLCERTS}"
 
 pre-configure:
 	cd ${WRKSRC} && autoreconf
 
 .include "../../mk/bsd.pkg.mk"
-
-# The in-tree OpenSSL uses /etc/openssl/certs as the default location for
-# certificates, while the pkgsrc OpenSSL uses ${PREFIX}/certs.  Define
-# SSL_CERT_DIR appropriately using a shell expression, and make sure that
-# it's only executed once to optimize the build.
-#
-.if !defined(SSL_CERT_DIR)
-SSL_CERT_DIR!=		if ${TEST} -d /etc/openssl/certs; then	\
-				${ECHO} /etc/openssl/certs;	\
-			else					\
-				${ECHO} ${PREFIX}/certs;	\
-			fi
-MAKEFLAGS+=		SSL_CERT_DIR="${SSL_CERT_DIR}"
-.endif
-- 
cgit v1.2.3