summaryrefslogtreecommitdiff
path: root/net/bind99
diff options
context:
space:
mode:
authorsbd <sbd@pkgsrc.org>2012-07-10 07:52:46 +0000
committersbd <sbd@pkgsrc.org>2012-07-10 07:52:46 +0000
commitc0ac3de428a6f35b3217829d749d8ba1a1d0920d (patch)
treefdb02f1f25ab8041b8e165d965ebcec7e4ec04bf /net/bind99
parent84ace64c2c193d87c66990813e7058038c090bbf (diff)
downloadpkgsrc-c0ac3de428a6f35b3217829d749d8ba1a1d0920d.tar.gz
Only set PTHREAD_AUTO_VARS if the threads options is enabled.
Also move PTHREAD_OPTS to just above where pthread.buildlink3.mk is included.
Diffstat (limited to 'net/bind99')
-rw-r--r--net/bind99/Makefile4
-rw-r--r--net/bind99/options.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/net/bind99/Makefile b/net/bind99/Makefile
index f94a6c9bed6..d13f45c5549 100644
--- a/net/bind99/Makefile
+++ b/net/bind99/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/14 07:45:39 sbd Exp $
+# $NetBSD: Makefile,v 1.7 2012/07/10 07:52:46 sbd Exp $
DISTNAME= bind-${BIND_VERSION}
PKGNAME= ${DISTNAME:S/-P/pl/}
@@ -54,8 +54,6 @@ PKG_USERS= ${BIND_USER}:${BIND_GROUP}
PKG_GECOS.${BIND_USER}= Named pseudo-user
PKG_HOME.${BIND_USER}= ${BIND_DIR}
-PTHREAD_OPTS+= native
-PTHREAD_AUTO_VARS= yes
DOCS= CHANGES FAQ README REDIRECT-NOTES
FILES_SUBST+= BIND_GROUP=${BIND_GROUP:Q} \
diff --git a/net/bind99/options.mk b/net/bind99/options.mk
index 067430395aa..38c931d910b 100644
--- a/net/bind99/options.mk
+++ b/net/bind99/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
+# $NetBSD: options.mk,v 1.2 2012/07/10 07:52:46 sbd Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.bind99
PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server
PKG_SUPPORTED_OPTIONS+= inet6 threads mysql pgsql ldap dlz-filesystem
+PTHREAD_OPTS+= native
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") || \
@@ -74,6 +75,7 @@ CONFIGURE_ARGS+= --disable-ipv6
### pthreads support (also see magic above)
###
.if !empty(PKG_OPTIONS:Mthreads)
+PTHREAD_AUTO_VARS= yes
CONFIGURE_ARGS+= --enable-threads
.else
CONFIGURE_ARGS+= --disable-threads