From da4fb9e636c95087b21440899629358eaa494a97 Mon Sep 17 00:00:00 2001 From: jmmv Date: Tue, 29 Jul 2003 11:18:38 +0000 Subject: Install example file under the examples hierarchy and honour PKG_SYSCONFDIR. Bump PKGREVISION to 1. --- security/stunnel/Makefile | 9 +++++++-- security/stunnel/PLIST | 6 +++--- security/stunnel/distinfo | 6 +++--- security/stunnel/patches/patch-aa | 14 ++++++++------ security/stunnel/patches/patch-ab | 23 ++++++++++++++++------- 5 files changed, 37 insertions(+), 21 deletions(-) (limited to 'security/stunnel') diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 9fceb360e05..8689cebdd2f 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2003/07/17 22:53:18 grant Exp $ +# $NetBSD: Makefile,v 1.34 2003/07/29 11:18:38 jmmv Exp $ DISTNAME= stunnel-4.04 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.fu-berlin.de/pub/unix/security/stunnel/ \ ftp://stunnel.mirt.net/stunnel/ \ @@ -11,11 +12,15 @@ HOMEPAGE= http://www.stunnel.org/ COMMENT= Universal SSL tunnel USE_BUILDLINK2= # defined +USE_PKGINSTALL= yes GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-ssl=${SSLBASE} \ --with-cert-dir="${SSLCERTS}" \ --with-pem-dir="${SSLCERTS}" \ - --with-tcp-wrappers + --with-tcp-wrappers \ + --sysconfdir="${PKG_SYSCONFDIR}" + +PKG_SYSCONFSUBDIR= stunnel .include "../../security/openssl/buildlink2.mk" .include "../../security/tcp_wrappers/buildlink2.mk" diff --git a/security/stunnel/PLIST b/security/stunnel/PLIST index 26691db0780..688ee28d908 100644 --- a/security/stunnel/PLIST +++ b/security/stunnel/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/01/18 08:33:42 martti Exp $ -etc/stunnel/stunnel.conf-sample +@comment $NetBSD: PLIST,v 1.3 2003/07/29 11:18:39 jmmv Exp $ lib/libstunnel.la lib/libstunnel.so man/man8/stunnel.8 @@ -25,6 +24,7 @@ share/doc/stunnel/examples/stunnel.init share/doc/stunnel/examples/stunnel.spec share/doc/stunnel/stunnel.html share/doc/stunnel/stunnel.pl.html +share/examples/stunnel/stunnel.conf-sample +@dirrm share/examples/stunnel @dirrm share/doc/stunnel/examples @dirrm share/doc/stunnel -@dirrm etc/stunnel diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 559fb6ac724..8518dfe0b3c 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.13 2003/01/18 08:33:42 martti Exp $ +$NetBSD: distinfo,v 1.14 2003/07/29 11:18:40 jmmv Exp $ SHA1 (stunnel-4.04.tar.gz) = 9f0f85eb0620ee4f4f68d833eb3f39eb31960f31 Size (stunnel-4.04.tar.gz) = 309072 bytes -SHA1 (patch-aa) = 616058e0fb75ba4d3edaa079b24b5c72e7a8f1f5 -SHA1 (patch-ab) = e4001b6d4d54421bef439ee98c65fce96f6face0 +SHA1 (patch-aa) = b003ce55806452a4fc081b488db6974b4d04a3a5 +SHA1 (patch-ab) = e340b31da4c492734af82679e3765b406d7243c6 diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa index 1e1dfe46c60..3e52a4396d9 100644 --- a/security/stunnel/patches/patch-aa +++ b/security/stunnel/patches/patch-aa @@ -1,17 +1,19 @@ -$NetBSD: patch-aa,v 1.13 2003/01/18 08:33:43 martti Exp $ +$NetBSD: patch-aa,v 1.14 2003/07/29 11:18:42 jmmv Exp $ ---- tools/Makefile.in.orig Sun Jan 12 15:48:39 2003 -+++ tools/Makefile.in Sat Jan 18 08:08:05 2003 -@@ -83,7 +83,7 @@ +--- tools/Makefile.in.orig 2003-01-12 16:48:39.000000000 +0100 ++++ tools/Makefile.in +@@ -82,8 +82,8 @@ DISTCLEANFILES = stunnel.pem + EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh stunnel.spec stunnel.mak stunnel.cnf - confdir = $(sysconfdir)/stunnel +-confdir = $(sysconfdir)/stunnel -conf_DATA = stunnel.conf-sample stunnel.pem ++confdir = $(datadir)/examples/stunnel +conf_DATA = stunnel.conf-sample docdir = $(datadir)/doc/stunnel examplesdir = $(docdir)/examples -@@ -251,7 +251,7 @@ +@@ -251,7 +251,7 @@ stunnel.pem: stunnel.cnf -in stunnel.pem install-data-hook: diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab index d06a5da0a56..ed107e96bf5 100644 --- a/security/stunnel/patches/patch-ab +++ b/security/stunnel/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.11 2003/01/18 08:33:43 martti Exp $ +$NetBSD: patch-ab,v 1.12 2003/07/29 11:18:42 jmmv Exp $ ---- configure.orig Wed Jan 1 14:26:05 2003 -+++ configure Sat Jan 18 08:08:29 2003 -@@ -7471,6 +7471,7 @@ +--- configure.orig 2003-01-01 15:26:05.000000000 +0100 ++++ configure +@@ -7471,6 +7471,7 @@ _ACEOF fi @@ -10,11 +10,20 @@ $NetBSD: patch-ab,v 1.11 2003/01/18 08:33:43 martti Exp $ # OSF hack instead of simple AC_CHECK_LIB here echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -@@ -7582,6 +7583,7 @@ - _ACEOF +@@ -7583,6 +7584,7 @@ _ACEOF -+fi fi ++fi + + + +@@ -9543,7 +9545,7 @@ _ACEOF + + LIBS="$LIBS $wrap_LIB" + +-CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\"" ++CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\"" + ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init" -- cgit v1.2.3