Perl is all about loadable perl modules, so include dlopen.buildlink3.mk.

If we include pthread.buildlink3.mk, then build with Perl ithreads
support.  Bump the PKGREVISION.

Nuke the perl58-thread package.  The perl package can now be forcibly
built with thread support by setting PERL5_USE_THREADS to "yes".

5 files changed, 12 insertions, 50 deletions

diff --git a/lang/Makefile b/lang/Makefile
index d9af41b97e2..9ba3fd6259e 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.198 2004/11/25 15:10:08 wiz Exp $
+# $NetBSD: Makefile,v 1.199 2004/11/25 22:02:49 jlam Exp $
 #
 
 COMMENT=	Programming languages
@@ -102,7 +102,6 @@ SUBDIR+=	p2c
 SUBDIR+=	parrot
 SUBDIR+=	perl5
 SUBDIR+=	perl58
-SUBDIR+=	perl58-thread
 SUBDIR+=	pforth
 #SUBDIR+=	php		# only contains Makefile fragments
 #SUBDIR+=	php5		# only contains Makefile fragments
diff --git a/lang/perl58-thread/DESCR b/lang/perl58-thread/DESCR
deleted file mode 100644
index 5c744ac8a41..00000000000
--- a/lang/perl58-thread/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Perl is a high-level programming language with an eclectic heritage
-written by Larry Wall and a cast of thousands.  It derives from the
-ubiquitous C programming language and to a lesser extent from sed, awk,
-the Unix shell, and at least a dozen other tools and languages.  Perl's
-process, file, and text manipulation facilities make it particularly
-well-suited for tasks involving quick prototyping, system utilities,
-software tools, system management tasks, database access, graphical
-programming, networking, and world wide web programming.  These strengths
-make it especially popular with system administrators and CGI script
-authors, but mathematicians, geneticists, journalists, and even managers
-also use Perl.  Maybe you should, too.
-
-This package is built with threads support.
diff --git a/lang/perl58-thread/Makefile b/lang/perl58-thread/Makefile
deleted file mode 100644
index b8892270aa6..00000000000
--- a/lang/perl58-thread/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2004/05/08 21:16:53 snj Exp $
-
-PERL5_USE_THREADS=	yes
-
-DISTINFO_FILE=		${.CURDIR}/../../lang/perl58/distinfo
-PATCHDIR=		${.CURDIR}/../../lang/perl58/patches
-MESSAGE_SRC=		${.CURDIR}/../../lang/perl58/MESSAGE
-PLIST_SRC=		${.CURDIR}/../../lang/perl58/PLIST
-
-.include "../../lang/perl58/Makefile"
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index fa1581b68bb..218c6b32aa6 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2004/11/23 17:32:36 jlam Exp $
+# $NetBSD: Makefile,v 1.62 2004/11/25 22:02:49 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -8,19 +8,19 @@ PERL5_RC_VERS=	# empty
 
 .if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
 DISTNAME=	perl-${PERL5_VERS}
-PKGNAME=	perl${PERL5_PKGSUFFIX}-${PERL5_VERS}
-PKGREVISION=	2
+PKGNAME=	perl-${PERL5_VERS}
+PKGREVISION=	3
 SNAPSHOT_SITES=	# empty
 .else
 .  if !empty(PERL5_SNAPSHOT)
 DISTNAME=	perl@${PERL5_SNAPSHOT}
-PKGNAME=	perl${PERL5_PKGSUFFIX}-${PERL5_VERS}beta${PERL5_SNAPSHOT}
+PKGNAME=	perl-${PERL5_VERS}beta${PERL5_SNAPSHOT}
 SNAPSHOT_SITES=	http://www.iki.fi/jhi/
 EXTRACT_SUFX=	.tbz
 WRKSRC=		${WRKDIR}/perl
 .  else # !empty(PERL5_RC_VERS)
 DISTNAME=	perl-${PERL5_VERS}-RC${PERL5_RC_VERS}
-PKGNAME=	perl${PERL5_PKGSUFFIX}-${PERL5_VERS}rc${PERL5_RC_VERS}
+PKGNAME=	perl-${PERL5_VERS}rc${PERL5_RC_VERS}
 SNAPSHOT_SITES=	http://www.cpan.org/authors/id/J/JH/JHI/
 .  endif
 .endif
@@ -39,7 +39,7 @@ CONFLICTS=	perl-5.00* perl-base-[0-9]* \
 		p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2] \
 		p5-Data-Dumper-2.1[0-9][0-9] p5-Data-Dumper-[0-9][0-9] \
 		p5-Devel-DProf-[0-9]* p5-Devel-Peek-[0-9]* \
-		perl-mk-[0-9]*
+		perl-mk-[0-9]* perl-thread-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -149,20 +149,16 @@ PERL5_HINTS_LDDLFLAGS=	# empty
 
 PERL5_HINTS_LDFLAGS+=	${LOCLIBRPATHFLAGS}
 
-# If perl58 is built with threads support, then name the package
-# "perl-thread", otherwise it's just "perl" as usual.
-#
-PERL5_USE_THREADS?=	no
+.include "../../mk/dlopen.buildlink3.mk"
+
+PERL5_USE_THREADS?=	${DLOPEN_REQUIRE_PTHREADS}
 .if !empty(PERL5_USE_THREADS:M[nN][oO])
-PERL5_PKGSUFFIX=	# empty
-CONFLICTS+=		perl-thread-[0-9]*
 CONFIGURE_ARGS+=	-Uuseithreads
 .else
 .  include "../../mk/pthread.buildlink3.mk"
 PERL5_ARCHLIB=		${PREFIX}/lib/perl5/${PERL5_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi
-PERL5_PKGSUFFIX=	-thread
-CONFLICTS+=		perl-[0-9]*
 CONFIGURE_ARGS+=	-Duseithreads
+CFLAGS+=		${PTHREAD_CFLAGS}
 PERL5_HINTS_LDFLAGS+=	${PTHREAD_LDFLAGS}
 PERL5_HINTS_LDDLFLAGS+=	${PTHREAD_LDFLAGS}
 LIBSWANTED+=		${PTHREAD_LIBS:M-l*:S/^-l//}
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index ca3c7f77859..bcd14e8d387 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1541 2004/11/25 21:33:36 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1542 2004/11/25 22:02:49 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -306,17 +306,7 @@ USE_PERL5:=		run
 _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