summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2007-08-11 14:41:36 +0000
committerschmonz <schmonz@pkgsrc.org>2007-08-11 14:41:36 +0000
commitd76d670a371abbb25aae8b3541b9670c93b2385e (patch)
tree080f1b4d2e64b3b06603789060d24afba418878a
parent1d2084981e8f4029647f2e8b3ab8c5821cb3d7d6 (diff)
downloadpkgsrc-d76d670a371abbb25aae8b3541b9670c93b2385e.tar.gz
Make pthreads support optional. Bump PKGREVISION.
-rw-r--r--security/stunnel/Makefile15
-rw-r--r--security/stunnel/options.mk18
2 files changed, 19 insertions, 14 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 114c74f2b55..d50ee94406e 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -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 @@ RCD_SCRIPTS= stunnel
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 --git a/security/stunnel/options.mk b/security/stunnel/options.mk
index 4a1993b0e85..6fcaf194329 100644
--- a/security/stunnel/options.mk
+++ b/security/stunnel/options.mk
@@ -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 @@ CONFIGURE_ARGS+= --enable-ipv6
.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