diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | lang/perl58/Makefile | 56 | ||||
| -rw-r--r-- | lang/perl58/distinfo | 8 | ||||
| -rw-r--r-- | lang/perl58/patches/patch-ah | 10 |
4 files changed, 44 insertions, 33 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 655cb323e58..b48874f963a 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.4585 2004/01/23 23:10:35 recht Exp $ +$NetBSD: CHANGES,v 1.4586 2004/01/23 23:26:28 jlam Exp $ Changes to the packages collection and infrastructure in 2004: @@ -439,3 +439,4 @@ Changes to the packages collection and infrastructure in 2004: Updated elinks to 0.9.1 [recht 2004-01-23] Updated curl to 7.11.0 [recht 2004-01-23] Updated py-curl to 7.10.8 [recht 2004-01-23] + Updated perl to 5.8.2 [jlam 2004-01-23] diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile index 44d1aa5fba1..5ff0fb649aa 100644 --- a/lang/perl58/Makefile +++ b/lang/perl58/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/01/15 13:06:00 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2004/01/23 23:26:25 jlam Exp $ # The following two variables should have empty values unless we're # building a perl snapshot or release candidate. @@ -8,7 +8,7 @@ PERL5_RC_VERS= # empty .if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS) DISTNAME= perl-${PERL5_VERS} -PKGREVISION= 1 +PKGREVISION= # empty SNAPSHOT_SITES= # empty .else . if !empty(PERL5_SNAPSHOT) @@ -24,7 +24,7 @@ SNAPSHOT_SITES= http://www.cpan.org/authors/id/J/JH/JHI/ . endif .endif -PERL5_VERS= 5.8.1 +PERL5_VERS= 5.8.2 CATEGORIES= lang devel perl5 MASTER_SITES= ${SNAPSHOT_SITES} \ ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,} @@ -41,11 +41,11 @@ CONFLICTS= perl-5.00* perl-base-[0-9]* \ PKG_INSTALLATION_TYPES= overwrite pkgviews -BUILDING_PERL5= YES -PERL5_CONFIGURE= NO +BUILDING_PERL5= yes +PERL5_CONFIGURE= no -USE_BUILDLINK3= YES -HAS_CONFIGURE= YES +USE_BUILDLINK3= yes +HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./Configure CONFIGURE_ARGS+= -sde CONFIGURE_ARGS+= -Dprefix="${PREFIX}" @@ -99,13 +99,13 @@ CONFIGURE_ARGS+= -Dcc="${PERL5_CC}" # The perl build attempts to work around case-insensitivity problems on # HFS filesystems by using GNUmakefiles, so we need to use GNU make. # -USE_GMAKE= YES +USE_GMAKE= yes # # Perl is _always_ built using shared libraries on Darwin; there's no # way to build a statically-linked perl binary. # MKPIC= yes -STATIC_PERL= NO +STATIC_PERL= no # # "installarchlib" and "installsitearch" have different forms between # Darwin and NetBSD. @@ -157,19 +157,29 @@ CONFIGURE_ARGS+= -Dlibswanted="${LIBSWANTED.${OPSYS}}" .if ${OPSYS} == "NetBSD" . if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) -MKPIC= no +MKPIC= no . endif -. if ${MACHINE_ARCH} == "sparc64" -# The toolchain on sparc64 is not really production-quality right now, but -# gcc-2.96 is supposed to fix most problems. Passing -g to the configure -# process triggers -DDEBUGGING, which plays the real trick and circumvents -# code-generation bugs, so we add -g to CFLAGS to at least have a really -# debuggable build. +.endif + +.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) +. if !defined(_GCC_IS_AT_LEAST_3_3) +_GCC_IS_AT_LEAST_3_3!= \ + if ${PKG_ADMIN} pmatch 'gcc>=3.3' ${CC_VERSION}; then \ + ${ECHO} "YES"; \ + else \ + ${ECHO} "NO"; \ + fi +MAKEFLAGS+= _GCC_IS_AT_LEAST_3_3="${_GCC_IS_AT_LEAST_3_3}" +. endif +. if !empty(_GCC_IS_AT_LEAST_3_3:M[nN][oO]) +# +# Fix brokenness when using an older toolchain (gcc<3.3) on sparc64. +# Passing -g to the configure process triggers -DDEBUGGING, which plays +# the real trick and circumvents some code-generation bugs, so we add +# -g to CFLAGS to at least have a really debuggable build. # -CFLAGS+= -g -msoft-quad-float -O2 +CFLAGS+= -g -msoft-quad-float -O2 . endif -.elif ${OPSYS} == "SunOS" -CFLAGS= .endif .if ${MKPIC} == "yes" @@ -221,17 +231,17 @@ pre-configure: .if ${MKPIC} == "yes" . for _arch_ in mipsel mipseb . if !empty(MACHINE_ARCH:M${_arch_}) -STATIC_PERL?= NO +STATIC_PERL?= no . endif . endfor .endif -STATIC_PERL?= YES +STATIC_PERL?= yes WRKSRC_PERL5= ${WRKSRC}/perl -.if defined(STATIC_PERL) && ${STATIC_PERL} == "YES" +.if defined(STATIC_PERL) && !empty(STATIC_PERL:M[yY][eE][sS]) STATIC_WRKDIR= ${WRKDIR}/static -STATIC_MAKEFLAGS= MKPIC=no STATIC_PERL=NO +STATIC_MAKEFLAGS= MKPIC=no STATIC_PERL=no STATIC_MAKEFLAGS+= WRKDIR=${STATIC_WRKDIR} STATIC_MAKEFLAGS+= ALL_TARGET=perl WRKSRC_PERL5= ${STATIC_WRKDIR}/${WRKSRC:T}/perl diff --git a/lang/perl58/distinfo b/lang/perl58/distinfo index aa47cb728cd..36c2bd526a2 100644 --- a/lang/perl58/distinfo +++ b/lang/perl58/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2004/01/05 11:25:13 salo Exp $ +$NetBSD: distinfo,v 1.11 2004/01/23 23:26:25 jlam Exp $ -SHA1 (perl-5.8.1.tar.gz) = 838a2f55927d14a9c8f239ebd8f40e33572f2800 -Size (perl-5.8.1.tar.gz) = 11857808 bytes +SHA1 (perl-5.8.2.tar.gz) = fafae27342e1730bad9d62cef28e2a42ff07841a +Size (perl-5.8.2.tar.gz) = 11896287 bytes SHA1 (patch-aa) = f9e1f13d48f50a5a0b638c26c3864071f8a20748 SHA1 (patch-ae) = fa3bbb1561192ce9214a7a7c756ccb2595a52c80 -SHA1 (patch-ah) = 2bfaf2503589ae3dbedaf7ee61561ed58054938e +SHA1 (patch-ah) = 4dfaf76dc8e152f028190adaf48e7bfceca6e0c8 SHA1 (patch-ba) = cdceb712bae08c6041e5aa175e5989d48b3a3f4e SHA1 (patch-bc) = 6bd07e902563079dd5642eac321ca7f9271ab8a6 SHA1 (patch-zc) = eb81edd1144ec46285898afc641c03a3aad54977 diff --git a/lang/perl58/patches/patch-ah b/lang/perl58/patches/patch-ah index 08511c5f767..3bbad642cf4 100644 --- a/lang/perl58/patches/patch-ah +++ b/lang/perl58/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.3 2003/10/05 07:07:14 jlam Exp $ +$NetBSD: patch-ah,v 1.4 2004/01/23 23:26:25 jlam Exp $ ---- perl.c.orig Thu Sep 11 14:42:33 2003 -+++ perl.c Tue Sep 30 01:16:04 2003 -@@ -3943,12 +3943,33 @@ +--- perl.c.orig Mon Nov 3 00:04:27 2003 ++++ perl.c +@@ -3975,12 +3975,33 @@ S_init_perllib(pTHX) } /* Use the ~-expanded versions of APPLLIB (undocumented), @@ -37,7 +37,7 @@ $NetBSD: patch-ah,v 1.3 2003/10/05 07:07:14 jlam Exp $ #ifdef ARCHLIB_EXP incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); #endif -@@ -3980,27 +4001,6 @@ +@@ -4012,27 +4033,6 @@ S_init_perllib(pTHX) incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); #else incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); |