From 37efb16b990e1ea2699bbfe4b13fc635af9947fe Mon Sep 17 00:00:00 2001
From: schmonz <schmonz>
Date: Thu, 29 May 2008 00:44:30 +0000
Subject: Restore PKG_SYSCONFDIR support, lost in the last update. Bump
 PKGREVISION.

---
 security/stunnel/Makefile         |  4 +++-
 security/stunnel/distinfo         |  3 ++-
 security/stunnel/patches/patch-ac | 13 +++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 security/stunnel/patches/patch-ac

(limited to 'security/stunnel')

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 550a89bbee4..78c1bad984f 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2008/05/27 11:51:32 tnn Exp $
+# $NetBSD: Makefile,v 1.63 2008/05/29 00:44:30 schmonz Exp $
 
 DISTNAME=		stunnel-4.24
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.fu-berlin.de/unix/security/stunnel/ \
 			ftp://stunnel.mirt.net/stunnel/ \
@@ -18,6 +19,7 @@ CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q} \
 			--with-cert-dir=${SSLCERTS:Q} \
 			--with-pem-dir=${SSLCERTS:Q} \
 			--with-tcp-wrappers \
+			--sysconfdir=${PKG_SYSCONFDIR:Q} \
 			--localstatedir=${VARBASE:Q}
 
 PTHREAD_OPTS?=		optional
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 8a5c6d6e218..ea35ba98828 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.24 2008/05/27 11:51:32 tnn Exp $
+$NetBSD: distinfo,v 1.25 2008/05/29 00:44:30 schmonz Exp $
 
 SHA1 (stunnel-4.24.tar.gz) = ec6db4080199d11e020b780da0f1cc37d37d9233
 RMD160 (stunnel-4.24.tar.gz) = a397ba5dd51d5224f2458948ef985e0785ef8fbb
 Size (stunnel-4.24.tar.gz) = 531714 bytes
 SHA1 (patch-aa) = 70dfbc793ec882715d2ddaa7b4248b8f238701b6
+SHA1 (patch-ac) = 7b4c4331e97f575b0bb82e6ce8a2b7d9a1483da6
diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac
new file mode 100644
index 00000000000..e85467daea5
--- /dev/null
+++ b/security/stunnel/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.11 2008/05/29 00:44:30 schmonz Exp $
+
+--- src/Makefile.in.orig	2008-05-18 07:46:06.000000000 -0400
++++ src/Makefile.in
+@@ -224,7 +224,7 @@ libstunnel_la_LDFLAGS = -avoid-version
+ INCLUDES = -I/usr/kerberos/include
+ 
+ # Additional compiler flags
+-AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
++AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"$(localstatedir)/run/stunnel.pid"'
+ 
+ # Win32 executable
+ EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c os2.mak
-- 
cgit v1.2.3