Thu Oct 16 18:27:13 2008 UTC ()
Adjust PERL5_REQD from 5.8.7 to 5.10.0, so as to prevent attempts
at using p5-* packages built with the new perl from being installed
together with an older version of perl.  The p5-* packages will not
work because the new and old perls install modules in different
directories.  As a consequence, bump package revision.


(he)
diff -r1.139 -r1.140 pkgsrc/lang/perl5/Makefile
diff -r1.41 -r1.42 pkgsrc/lang/perl5/buildlink3.mk
cvs diff -r1.139 -r1.140 pkgsrc/lang/perl5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2008/10/11 08:59:48 1.139
+++ pkgsrc/lang/perl5/Makefile 2008/10/16 18:27:13 1.140
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.139 2008/10/11 08:59:48 seb Exp $ 1# $NetBSD: Makefile,v 1.140 2008/10/16 18:27:13 he Exp $
2 2
3DISTNAME= perl-5.10.0 3DISTNAME= perl-5.10.0
4CATEGORIES= lang devel perl5 4CATEGORIES= lang devel perl5
 5PKGREVISION= 1
5MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,} 6MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
6DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} 7DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
7 8
8MAINTAINER= jlam@pkgsrc.org 9MAINTAINER= jlam@pkgsrc.org
9HOMEPAGE= http://www.perl.org/ 10HOMEPAGE= http://www.perl.org/
10COMMENT= Practical Extraction and Report Language 11COMMENT= Practical Extraction and Report Language
11#LICENSE= gnu-gpl-v2 12#LICENSE= gnu-gpl-v2
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \ 16CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \
16 p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2] 17 p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2]
17 18
cvs diff -r1.41 -r1.42 pkgsrc/lang/perl5/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/perl5/buildlink3.mk 2007/11/21 22:49:45 1.41
+++ pkgsrc/lang/perl5/buildlink3.mk 2008/10/16 18:27:13 1.42
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: buildlink3.mk,v 1.41 2007/11/21 22:49:45 minskim Exp $ 1# $NetBSD: buildlink3.mk,v 1.42 2008/10/16 18:27:13 he Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+ 4PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= perl 7BUILDLINK_DEPENDS+= perl
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nperl} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nperl}
11BUILDLINK_PACKAGES+= perl 11BUILDLINK_PACKAGES+= perl
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perl 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perl
13 13
14.if !empty(PERL5_BUILDLINK3_MK:M+) 14.if !empty(PERL5_BUILDLINK3_MK:M+)
15.include "../../mk/bsd.fast.prefs.mk" 15.include "../../mk/bsd.fast.prefs.mk"
16PERL5_REQD+= 5.8.7 16PERL5_REQD+= 5.10.0
17.for _perl5_ver_ in ${PERL5_REQD} 17.for _perl5_ver_ in ${PERL5_REQD}
18BUILDLINK_API_DEPENDS.perl+= perl>=${_perl5_ver_} 18BUILDLINK_API_DEPENDS.perl+= perl>=${_perl5_ver_}
19.endfor 19.endfor
20BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5 20BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
21 21
22FIND_PREFIX:= PERLDIR=perl 22FIND_PREFIX:= PERLDIR=perl
23.include "../../mk/find-prefix.mk" 23.include "../../mk/find-prefix.mk"
24PERL5= ${PERLDIR}/bin/perl 24PERL5= ${PERLDIR}/bin/perl
25 25
26PERL5_OPTIONS?= # empty 26PERL5_OPTIONS?= # empty
27. if !empty(PERL5_OPTIONS:Mthreads) 27. if !empty(PERL5_OPTIONS:Mthreads)
28INSTALL_TEMPLATES+= ${.CURDIR}/../../lang/perl5/files/install_threads.tmpl 28INSTALL_TEMPLATES+= ${.CURDIR}/../../lang/perl5/files/install_threads.tmpl
29. endif 29. endif