[pkgsrc/trunk]: pkgsrc/security/stunnel Make pthreads support optional. Bump ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff3055e45162
branches:  trunk
changeset: 532099:ff3055e45162
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sat Aug 11 14:41:36 2007 +0000

description:
Make pthreads support optional. Bump PKGREVISION.

diffstat:

 security/stunnel/Makefile   |  15 +++------------
 security/stunnel/options.mk |  18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diffs (64 lines):

diff -r cc1d51516e7a -r ff3055e45162 security/stunnel/Makefile
--- a/security/stunnel/Makefile Sat Aug 11 14:18:05 2007 +0000
+++ b/security/stunnel/Makefile Sat Aug 11 14:41:36 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2007/01/23 21:53:58 smb Exp $
+# $NetBSD: Makefile,v 1.60 2007/08/11 14:41:36 schmonz Exp $
 
 DISTNAME=              stunnel-4.20
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            security
 MASTER_SITES=          ftp://ftp.fu-berlin.de/unix/security/stunnel/ \
                        ftp://stunnel.mirt.net/stunnel/ \
@@ -28,18 +28,9 @@
 REPLACE_PERL+=         src/stunnel3.in
 USE_TOOLS+=            perl:run
 
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
 .include "../../mk/pthread.buildlink3.mk"
 
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
-CONFIGURE_ARGS+=       --with-threads=fork
-.else
-CONFIGURE_ARGS+=       --with-threads=pthread
-CONFIGURE_ENV+=                CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
-                       LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
-.endif
+.include "options.mk"
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
diff -r cc1d51516e7a -r ff3055e45162 security/stunnel/options.mk
--- a/security/stunnel/options.mk       Sat Aug 11 14:18:05 2007 +0000
+++ b/security/stunnel/options.mk       Sat Aug 11 14:41:36 2007 +0000
@@ -1,7 +1,10 @@
-# $NetBSD: options.mk,v 1.2 2005/07/04 10:29:43 salo Exp $
+# $NetBSD: options.mk,v 1.3 2007/08/11 14:41:36 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.stunnel
-PKG_SUPPORTED_OPTIONS= inet6
+PKG_SUPPORTED_OPTIONS= inet6 pthread
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
+PKG_SUGGESTED_OPTIONS+=        pthread
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,3 +16,14 @@
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
+
+###
+### Support pthreads
+###
+.if !empty(PKG_OPTIONS:Mpthread)
+CONFIGURE_ARGS+=       --with-threads=pthread
+CONFIGURE_ENV+=                CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
+                       LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+.else
+CONFIGURE_ARGS+=       --with-threads=fork
+.endif