diff options
| -rw-r--r-- | databases/mysql-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql4-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/openldap/Makefile | 7 | ||||
| -rw-r--r-- | mail/cyrus-imapd22/Makefile | 3 | ||||
| -rw-r--r-- | mk/pthread.buildlink3.mk | 4 |
5 files changed, 6 insertions, 16 deletions
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 53353f97906..08ab8374a4f 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2004/11/23 16:07:02 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.36 2004/11/25 19:34:03 jlam Exp $ DISTNAME= mysql-4.0.22 CATEGORIES= databases @@ -72,8 +72,6 @@ CFLAGS+= -DHAVE_CURSES_H CXXFLAGS+= -DHAVE_CURSES_H .endif -PTHREAD_AUTO_VARS= no - .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index e51cf6d4a10..4c6a36f78f5 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2004/11/23 16:07:02 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.26 2004/11/25 19:34:03 jlam Exp $ DISTNAME= mysql-4.1.7 CATEGORIES= databases @@ -72,8 +72,6 @@ CFLAGS+= -DHAVE_CURSES_H CXXFLAGS+= -DHAVE_CURSES_H .endif -PTHREAD_AUTO_VARS= no - .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 9528a28345c..d65eeed6fd4 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2004/11/19 16:35:26 jlam Exp $ +# $NetBSD: Makefile,v 1.89 2004/11/25 19:34:03 jlam Exp $ DISTNAME= openldap-2.2.18 SVR4_PKGNAME= oldap @@ -96,11 +96,6 @@ OPENLDAP_PTHREAD_OPTS?= native OPENLDAP_PTHREAD_OPTS?= require PTHREAD_OPTS+= ${OPENLDAP_PTHREAD_OPTS} -# We don't actually want everything to be built with pthreads -- only -# libldap_r and slurpd. -# -PTHREAD_AUTO_VARS= no - .include "../../security/openssl/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index 0dfdc1b3ee0..d682b738698 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/11/17 21:16:45 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2004/11/25 19:34:03 jlam Exp $ DISTNAME= cyrus-imapd-2.2.8 PKGREVISION= 4 @@ -129,7 +129,6 @@ PERL5_PACKLIST= \ # Only imap/mupdate needs to be build with pthreads support, so selectively # enable it via patches for just that one program. # -PTHREAD_AUTO_VARS= no .include "../../mk/pthread.buildlink3.mk" # Change references of some manpages from foo.8 to cyrus-foo.8 to avoid diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk index 893f1742d27..51b2339fb2d 100644 --- a/mk/pthread.buildlink3.mk +++ b/mk/pthread.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pthread.buildlink3.mk,v 1.17 2004/11/17 21:05:24 jlam Exp $ +# $NetBSD: pthread.buildlink3.mk,v 1.18 2004/11/25 19:34:03 jlam Exp $ # # The pthreads strategy for pkgsrc is to "bless" a particular pthread # package as the Official Pthread Replacement (OPR). A package that uses @@ -144,7 +144,7 @@ PKG_SKIP_REASON= "${PKGNAME} requires a working pthreads implementation." . endif .endif -PTHREAD_AUTO_VARS?= yes +PTHREAD_AUTO_VARS?= no .if ${PTHREAD_TYPE} == "native" BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npthread} |