[pkgsrc/trunk]: pkgsrc/security/stunnel nb1: Put conf and pid files back wher...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c924d00524f
branches:  trunk
changeset: 520175:1c924d00524f
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Oct 16 20:14:26 2006 +0000

description:
nb1: Put conf and pid files back where they belong after the 4.15 update.

(PKG_SYSCONFDIR already includes "stunnel" by default, so avoid the
package adding another and making $PREFIX/etc/stunnel/stunnel/stunnel.conf;
the pidfile does not normally belong under $PREFIX as $PREFIX/var/run is
not normally cleaned/checked by OS-supplied processes.)

diffstat:

 security/stunnel/Makefile         |   3 ++-
 security/stunnel/distinfo         |   3 ++-
 security/stunnel/patches/patch-ac |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r 448764e6346d -r 1c924d00524f security/stunnel/Makefile
--- a/security/stunnel/Makefile Mon Oct 16 19:20:27 2006 +0000
+++ b/security/stunnel/Makefile Mon Oct 16 20:14:26 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2006/10/14 11:12:19 obache Exp $
+# $NetBSD: Makefile,v 1.57 2006/10/16 20:14:26 tv Exp $
 
 DISTNAME=              stunnel-4.15
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ftp://ftp.fu-berlin.de/unix/security/stunnel/ \
                        ftp://stunnel.mirt.net/stunnel/ \
diff -r 448764e6346d -r 1c924d00524f security/stunnel/distinfo
--- a/security/stunnel/distinfo Mon Oct 16 19:20:27 2006 +0000
+++ b/security/stunnel/distinfo Mon Oct 16 20:14:26 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.20 2006/10/14 11:12:19 obache Exp $
+$NetBSD: distinfo,v 1.21 2006/10/16 20:14:26 tv Exp $
 
 SHA1 (stunnel-4.15.tar.gz) = 735406c1ca94904581158a434214e1f6568539d0
 RMD160 (stunnel-4.15.tar.gz) = a8d5c9d3fb24d0518975cbb347729f5eba3d3f12
 Size (stunnel-4.15.tar.gz) = 497103 bytes
 SHA1 (patch-aa) = e54eed598bb069b9131ed42721df8f49069b15b8
 SHA1 (patch-ab) = 947f8ee20b28fa782786976ac19d0f7ef895f254
+SHA1 (patch-ac) = 64a24088f3a6e55bd59324a17bbcf74786ed2cb2
diff -r 448764e6346d -r 1c924d00524f security/stunnel/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/stunnel/patches/patch-ac Mon Oct 16 20:14:26 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.7 2006/10/16 20:14:26 tv Exp $
+
+--- src/Makefile.in.orig       2006-03-06 15:52:41.000000000 -0500
++++ src/Makefile.in
+@@ -222,7 +222,7 @@ libstunnel_la_LDFLAGS = -avoid-version
+ INCLUDES = -I/usr/kerberos/include
+ 
+ # Additional compiler flags
+-AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(prefix)/var/run/stunnel/stunnel.pid"'
++AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"/var/run/stunnel/stunnel.pid"'
+ 
+ # Win32 executable
+ EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c