From 45dd233be8d067e875f6351b8b617eca012962a9 Mon Sep 17 00:00:00 2001 From: Anton Berezin Date: Tue, 1 Feb 2005 13:36:21 +0000 Subject: Update to 5.8.6. Also: - redirect output from h2ph to /dev/null [1]; - fix File::Path insecure file/directory permissions [2]; this resolves CAN-2004-0452 (http://vuxml.freebsd.org/c418d472-6bd1-11d9-93ca-000a95bc6fae.html); - for OSVERSION < 500036, create symlinks in /usr/bin not only for perl and suidperl, but also for a2p, c2ph, find2perl, h2ph, h2xs, perlbug, perlcc, perldoc, pl2pm, pod2html, pod2latex, pod2man, pod2text, s2p, and splain; perl and suidperl are still enough for more recent FreeBSD versions [3]; - clean up created symlinks upon deinstallation [4]; - try to cleanup symlinks created by older versions of lang/perl5 and lang/perl5.8, during both installation and deinstallation [5]; - added support for DISABLE_BSDPAN environment variable [6]; - be explicit about use.perl usage after installation of 4.X systems [7]; - respect __MAKE_CONF partially (the build-time value is used) [8]; - fix threaded build - respect PTHREAD_CFLAGS and PTHREAD_LIBS [9]. - use.perl is now the same as pkg-install is now the same as pkg-deinstall; apart from the changes already mentioned above, this is a shell script now; - use.perl's logic is also simplified in several ways [10]; - fix a BSDPAN bug [11]. Outstanding issues: Module::Build support for BSDPAN, SU_CMD support (PR 70831), PR 64963 (partially), and anything else that I forgot. [1] Nudged by: krion [2] Reported by: nectar Patch from: Chris Turner @ RedHat [3] PR: 55760, 57151, 58406 [4] Requested by: kris PR: 54262 [5] PR: 51281, 51539 [6] PR: 57134 [7] PR: 60736 [8] PR: 74431 [9] PR: 73233 [10] Perl version submitted by des, implemented in sh [11] Reported by: Alexander Nagilum --- lang/perl5.12/Makefile | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) (limited to 'lang/perl5.12/Makefile') diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile index c35231a4eb29..feb908223f83 100644 --- a/lang/perl5.12/Makefile +++ b/lang/perl5.12/Makefile @@ -19,7 +19,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= tobez@FreeBSD.org COMMENT= Practical Extraction and Report Language -PERL_VER= 5.8.5 +PERL_VER= 5.8.6 PERL_ARCH= mach PERL_VERSION= ${PERL_VER} @@ -39,8 +39,6 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ -Dcc="${CC}" -Doptimize="${CFLAGS}" -Duseshrplib \ -Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\" -INCLUDEDIR= /usr/include - .include "Makefile.man" .include @@ -51,7 +49,6 @@ PLIST_SUB+= ENABLE_SUIDPERL="" CONFIGURE_ARGS+= -Ud_dosuid PLIST_SUB+= ENABLE_SUIDPERL="@comment " .endif -# INSTALLS_SHLIB= yes .if defined(WITH_GDBM) CONFIGURE_ARGS+= -Di_gdbm @@ -69,10 +66,16 @@ WITH_PERL_MALLOC= yes .endif .if defined(WITH_THREADS) +.if ${ARCH} == "amd64" +IGNORE= Threaded perl does not pass tests on ${ARCH} +.endif CONFIGURE_ARGS+= -Dusethreads=y PKGNAMESUFFIX= -threaded # it seems perl malloc has problems with threaded perl on FreeBSD .undef WITH_PERL_MALLOC +.if ${OSVERSION} < 492000 +CONFIGURE_ARGS+= -Ud_gethostbyaddr_r +.endif .else CONFIGURE_ARGS+= -Dusethreads=n .endif @@ -89,8 +92,10 @@ CONFIGURE_ARGS+= -Duse64bitint .if ${OSVERSION} < 502100 LATEST_LINK= perl5.8 +PLIST_SUB+= NEED_USE_PERL="" .else PKGMESSAGE= ${PKGDIR}/.not-here +PLIST_SUB+= NEED_USE_PERL="@comment " .endif .if defined(WITH_GDBM) @@ -103,16 +108,34 @@ test: BSDPAN_DEST= ${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN BSDPAN_FILES= BSDPAN.pm BSDPAN/Override.pm Config.pm \ - ExtUtils/MM_Unix.pm ExtUtils/Packlist.pm -BSDPAN_WRKSRC= ${WRKDIR}/BSDPAN-5.8.5 + ExtUtils/MM_Unix.pm \ + ExtUtils/MakeMaker.pm \ + ExtUtils/Packlist.pm +BSDPAN_WRKSRC= ${WRKDIR}/BSDPAN-${PORTVERSION} + +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +USE_REINPLACE= yes post-patch: ${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \ -e 's|%%PERL_VER%%|${PERL_VER}|g;' \ -e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \ -e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \ + -e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \ ${FILESDIR}/use.perl \ > ${WRKDIR}/use.perl + ${CP} ${WRKDIR}/use.perl ${PKGINSTALL} + ${CP} ${WRKDIR}/use.perl ${PKGDEINSTALL} +.if defined(WITH_THREADS) + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \ + -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \ + ${WRKSRC}/hints/freebsd.sh +.else + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ + -e 's|%%PTHREAD_CFLAGS%%||g;' \ + ${WRKSRC}/hints/freebsd.sh +.endif pre-install: @${RM} -f ${PREFIX}/bin/perl${PERL_VER} @@ -122,20 +145,15 @@ post-install: @${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VER} @${STRIP_CMD} ${PREFIX}/bin/perl @${LN} -sf ${PREFIX}/bin/perl${PERL_VER} ${PREFIX}/bin/perl5 - ${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl .for files in ${BSDPAN_FILES} ${MKDIR} ${BSDPAN_DEST}/${files:H} ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files} .endfor - @(cd ${INCLUDEDIR} && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h) - ${MKDIR} ${PREFIX}/${SITE_PERL_REL}/auto - ${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto - ${MKDIR} ${PREFIX}/lib/perl5/${PERL_VER}/man/man3 + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if ${OSVERSION} < 502100 + ${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl @fmt ${PKGMESSAGE} -.else - @${PREFIX}/bin/use.perl port .endif .include -- cgit v1.2.3