[pkgsrc/trunk]: pkgsrc/mk Move selection of the default perl58 (whether it is...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/30c3f27e51d6
branches:  trunk
changeset: 483718:30c3f27e51d6
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Nov 17 22:55:14 2004 +0000

description:
Move selection of the default perl58 (whether it is threaded or not) into
bsd.pkg.mk.  lang/perl58 now always builds perl58, while lang/perl58-thread
builds perl58-thread (POLS).  Fixes PR pkg/28343.

diffstat:

 lang/perl58/Makefile |  14 ++------------
 mk/bsd.pkg.mk        |  12 +++++++++++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (58 lines):

diff -r 2402dcbbf478 -r 30c3f27e51d6 lang/perl58/Makefile
--- a/lang/perl58/Makefile      Wed Nov 17 21:42:11 2004 +0000
+++ b/lang/perl58/Makefile      Wed Nov 17 22:55:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2004/11/14 07:48:30 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2004/11/17 22:55:15 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -149,20 +149,10 @@
 
 PERL5_HINTS_LDFLAGS+=  ${LOCLIBRPATHFLAGS}
 
-# On platforms that have native pthreads, default to installing the
-# threaded perl.  This can be overridden by explicitly setting
-# PERL5_USE_THREADS.
-#
-.if exists(/usr/include/pthread.h) && \
-    !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS])
-PERL5_USE_THREADS?=    yes
-.else
-PERL5_USE_THREADS?=    no
-.endif
-
 # If perl58 is built with threads support, then name the package
 # "perl-thread", otherwise it's just "perl" as usual.
 #
+PERL5_USE_THREADS?=    no
 .if !empty(PERL5_USE_THREADS:M[nN][oO])
 PERL5_PKGSUFFIX=       # empty
 CONFLICTS+=            perl-thread-[0-9]*
diff -r 2402dcbbf478 -r 30c3f27e51d6 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Nov 17 21:42:11 2004 +0000
+++ b/mk/bsd.pkg.mk     Wed Nov 17 22:55:14 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1539 2004/11/16 18:04:00 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1540 2004/11/17 22:55:14 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -306,7 +306,17 @@
 _PERL5_DEPMETHOD=      DEPENDS
 .  endif
 _PERL5_DEPENDS=                {perl>=${_PERL5_REQD},perl-thread>=${_PERL5_REQD}}
+#
+# On platforms that have native pthreads, default to installing the
+# threaded perl.  This can be overridden by explicitly setting
+# PERL5_USE_THREADS.
+#
+.  if exists(/usr/include/pthread.h) && \
+      !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS])
+PERL5_PKGSRCDIR?=      ../../lang/perl58-thread
+.  else
 PERL5_PKGSRCDIR?=      ../../lang/perl58
+.  endif
 .  if !defined(BUILDLINK_DEPENDS.perl)
 ${_PERL5_DEPMETHOD}+=  ${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
 .  endif