pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/perl5 Restore perllocal.pod-generating behavior o...
details: https://anonhg.NetBSD.org/pkgsrc/rev/48f142110795
branches: trunk
changeset: 498110:48f142110795
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Aug 12 19:59:03 2005 +0000
description:
Restore perllocal.pod-generating behavior of ExtUtils::MakeMaker
because some Perl modules make some (bad) assumptions about the
structure of a MakeMaker-generated Makefile. Instead, remove the
perllocal.pod file whenever a p5-* module or perl itself is removed.
While here, rename some of the install/deinstall templates to more
descriptive names.
Bump the PKGREVISION to 3.
diffstat:
lang/perl5/Makefile | 8 +++---
lang/perl5/buildlink3.mk | 4 +-
lang/perl5/distinfo | 6 +---
lang/perl5/files/deinstall.tmpl | 23 ++++++++++++++++++++
lang/perl5/files/deinstall_link.tmpl | 16 --------------
lang/perl5/files/install.tmpl | 29 ++++++-------------------
lang/perl5/files/install_link.tmpl | 11 ---------
lang/perl5/files/install_threads.tmpl | 26 ++++++++++++++++++++++
lang/perl5/module.mk | 6 ++--
lang/perl5/patches/patch-aa | 20 +----------------
lang/perl5/patches/patch-al | 21 ------------------
lang/perl5/patches/patch-ao | 40 -----------------------------------
12 files changed, 68 insertions(+), 142 deletions(-)
diffs (truncated from 320 to 300 lines):
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/Makefile
--- a/lang/perl5/Makefile Fri Aug 12 19:57:50 2005 +0000
+++ b/lang/perl5/Makefile Fri Aug 12 19:59:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2005/08/08 16:39:58 jlam Exp $
+# $NetBSD: Makefile,v 1.100 2005/08/12 19:59:03 jlam Exp $
# The following two variables should have empty values unless we're
# building a perl snapshot or release candidate.
@@ -14,7 +14,7 @@
.if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
DISTNAME= perl-${PERL5_VERS}
PKGNAME= perl-${PERL5_VERS}
-PKGREVISION= 2
+PKGREVISION= 3
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
.else
. if !empty(PERL5_SNAPSHOT)
@@ -268,8 +268,8 @@
SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d"
USE_PKGINSTALL= yes
-INSTALL_EXTRA_TMPL+= ${FILESDIR}/install_link.tmpl
-DEINSTALL_EXTRA_TMPL+= ${FILESDIR}/deinstall_link.tmpl
+INSTALL_EXTRA_TMPL+= ${FILESDIR}/install.tmpl
+DEINSTALL_EXTRA_TMPL+= ${FILESDIR}/deinstall.tmpl
FILES_SUBST+= PERL5_PACKLIST=
FILES_SUBST+= PERL5_COMMENT=\#
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/buildlink3.mk
--- a/lang/perl5/buildlink3.mk Fri Aug 12 19:57:50 2005 +0000
+++ b/lang/perl5/buildlink3.mk Fri Aug 12 19:59:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2005/08/06 06:18:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2005/08/12 19:59:03 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+
@@ -22,7 +22,7 @@
PERL5_OPTIONS?= # empty
. if !empty(PERL5_OPTIONS:Mthreads)
USE_PKGINSTALL= yes
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../lang/perl5/files/install.tmpl
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../lang/perl5/files/install_threads.tmpl
. endif
. if ${PKG_INSTALLATION_TYPE} == "overwrite"
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/distinfo
--- a/lang/perl5/distinfo Fri Aug 12 19:57:50 2005 +0000
+++ b/lang/perl5/distinfo Fri Aug 12 19:59:03 2005 +0000
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.26 2005/08/08 16:39:58 jlam Exp $
+$NetBSD: distinfo,v 1.27 2005/08/12 19:59:03 jlam Exp $
SHA1 (perl-5.8.7.tar.bz2) = c9477c6fe76b200033694bdc555a0276523d4228
RMD160 (perl-5.8.7.tar.bz2) = 110c286d73fd89e25da8ea394e763f209a76d283
Size (perl-5.8.7.tar.bz2) = 9839086 bytes
-SHA1 (patch-aa) = 44b08347f78c203f71f98797a213a3828b0954eb
+SHA1 (patch-aa) = 965df39b13e67783e851838cf51b34bb248642e8
SHA1 (patch-ae) = 044ac094cd475a16483552aa6f1bde03bd11f592
SHA1 (patch-ah) = 7847562d35cd4834a45139b6a8cfe766aa45fa0a
-SHA1 (patch-al) = 7b86ec658c09077bec513eadc02006525a548d6f
SHA1 (patch-am) = f82f8fd7fa372f1d47b057b6051613d66dc4bc23
SHA1 (patch-an) = 25c0991dba16ebe11422a97f544cb100e8da56b8
-SHA1 (patch-ao) = 2f9ed4f04bac7349ca3ce4ee41c66bd7656c7962
SHA1 (patch-ba) = 096835f71a69f29e50bdad47944afa838dba5aec
SHA1 (patch-bd) = 9f96ba1912f2a8db93db31f7a63c0b49a045318d
SHA1 (patch-ca) = 8eef6a9f96b8f1c6a7c34b521b7c633d396757e3
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/files/deinstall.tmpl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/perl5/files/deinstall.tmpl Fri Aug 12 19:59:03 2005 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: deinstall.tmpl,v 1.1 2005/08/12 19:59:03 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+ eval `${PERL5} -V:prefix -V:archlib -V:scriptdir`
+ PERL5_PACKLIST="@PERL5_PACKLIST@"
+
+ # Remove the perllocal.pod file.
+ case "$archlib" in
+ $prefix/*) archlib="${PKG_PREFIX}/${archlib#$prefix/}" ;;
+ esac
+ ${RM} -f $archlib/perllocal.pod
+ ${RMDIR} -p $archlib 2>/dev/null || ${TRUE}
+
+ # Remove any symlinked bits that belong to this module.
+ $scriptdir/perllink -f -p ${PKG_PREFIX} delete ${PERL5_PACKLIST}
+
+ # If this is not the perl package, then re-link any perl bits
+ # back into place.
+ #
+ @PERL5_COMMENT@$scriptdir/perllink -p ${PKG_PREFIX} add
+ ;;
+esac
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/files/deinstall_link.tmpl
--- a/lang/perl5/files/deinstall_link.tmpl Fri Aug 12 19:57:50 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: deinstall_link.tmpl,v 1.1 2005/08/06 06:18:45 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
- eval `${PERL5} -V:scriptdir`
- PERL5_PACKLIST="@PERL5_PACKLIST@"
-
- # Remove any symlinked bits that belong to this module.
- $scriptdir/perllink -f -p ${PKG_PREFIX} delete ${PERL5_PACKLIST}
-
- # If this is not the perl package, then re-link any perl bits
- # back into place.
- #
- @PERL5_COMMENT@$scriptdir/perllink -p ${PKG_PREFIX} add
- ;;
-esac
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/files/install.tmpl
--- a/lang/perl5/files/install.tmpl Fri Aug 12 19:57:50 2005 +0000
+++ b/lang/perl5/files/install.tmpl Fri Aug 12 19:59:03 2005 +0000
@@ -1,26 +1,11 @@
-# $NetBSD: install.tmpl,v 1.1 2004/12/19 00:01:43 jlam Exp $
-#
-# Require the presence of a pkgsrc Perl installation that supports threads
-# during the PRE-INSTALL stage, otherwise we bail out.
-
-PERL5="@PERL5@"
+# $NetBSD: install.tmpl,v 1.2 2005/08/12 19:59:03 jlam Exp $
case ${STAGE} in
-PRE-INSTALL)
- if [ ! -x "${PERL5}" ]; then
- ${ECHO} "==> ${PERL5} does not exist." 1>&2
- exit 1
- fi
- eval `${PERL5} -V:usethreads`
- case $usethreads in
- define*|true|[yY]*) # possible "yes" values in Perl Config.pm
- # We found what we were looking for (a threaded perl) so
- # do nothing.
- ;;
- *)
- ${ECHO} "==> ${PKGNAME} requires a Perl that supports threads." 1>&2
- exit 1
- ;;
- esac
+POST-INSTALL)
+ eval `${PERL5} -V:scriptdir`
+ PERL5_PACKLIST="@PERL5_PACKLIST@"
+
+ # Symlink the bits that belong to this module.
+ $scriptdir/perllink -f -p ${PKG_PREFIX} add ${PERL5_PACKLIST}
;;
esac
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/files/install_link.tmpl
--- a/lang/perl5/files/install_link.tmpl Fri Aug 12 19:57:50 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: install_link.tmpl,v 1.1 2005/08/06 06:18:45 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
- eval `${PERL5} -V:scriptdir`
- PERL5_PACKLIST="@PERL5_PACKLIST@"
-
- # Symlink the bits that belong to this module.
- $scriptdir/perllink -f -p ${PKG_PREFIX} add ${PERL5_PACKLIST}
- ;;
-esac
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/files/install_threads.tmpl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/perl5/files/install_threads.tmpl Fri Aug 12 19:59:03 2005 +0000
@@ -0,0 +1,26 @@
+# $NetBSD: install_threads.tmpl,v 1.1 2005/08/12 19:59:03 jlam Exp $
+#
+# Require the presence of a pkgsrc Perl installation that supports threads
+# during the PRE-INSTALL stage, otherwise we bail out.
+
+PERL5="@PERL5@"
+
+case ${STAGE} in
+PRE-INSTALL)
+ if [ ! -x "${PERL5}" ]; then
+ ${ECHO} "==> ${PERL5} does not exist." 1>&2
+ exit 1
+ fi
+ eval `${PERL5} -V:usethreads`
+ case $usethreads in
+ define*|true|[yY]*) # possible "yes" values in Perl Config.pm
+ # We found what we were looking for (a threaded perl) so
+ # do nothing.
+ ;;
+ *)
+ ${ECHO} "==> ${PKGNAME} requires a Perl that supports threads." 1>&2
+ exit 1
+ ;;
+ esac
+ ;;
+esac
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/module.mk
--- a/lang/perl5/module.mk Fri Aug 12 19:57:50 2005 +0000
+++ b/lang/perl5/module.mk Fri Aug 12 19:59:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.48 2005/08/06 06:18:45 jlam Exp $
+# $NetBSD: module.mk,v 1.49 2005/08/12 19:59:03 jlam Exp $
#
# This Makefile fragment is intended to be included by packages that build
# and install perl5 modules.
@@ -182,8 +182,8 @@
###
USE_PKGINSTALL= yes
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../lang/perl5/files/install_link.tmpl
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../lang/perl5/files/deinstall_link.tmpl
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../lang/perl5/files/install.tmpl
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../lang/perl5/files/deinstall.tmpl
FILES_SUBST+= PERL5_COMMENT=
FILES_SUBST+= PERL5_PACKLIST=${_PERL5_PACKLIST:Q}
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/patches/patch-aa
--- a/lang/perl5/patches/patch-aa Fri Aug 12 19:57:50 2005 +0000
+++ b/lang/perl5/patches/patch-aa Fri Aug 12 19:59:03 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.28 2005/08/07 21:47:24 jlam Exp $
+$NetBSD: patch-aa,v 1.29 2005/08/12 19:59:03 jlam Exp $
--- lib/ExtUtils/MM_Unix.pm.orig 2004-01-05 17:34:59.000000000 -0500
+++ lib/ExtUtils/MM_Unix.pm
@@ -83,24 +83,6 @@
);
my %man_layouts =
-@@ -2480,13 +2501,13 @@ sub install {
- my(@m);
-
- push @m, q{
--install :: all pure_install doc_install
-+install :: all pure_install
-
--install_perl :: all pure_perl_install doc_perl_install
-+install_perl :: all pure_perl_install
-
--install_site :: all pure_site_install doc_site_install
-+install_site :: all pure_site_install
-
--install_vendor :: all pure_vendor_install doc_vendor_install
-+install_vendor :: all pure_vendor_install
-
- pure_install :: pure_$(INSTALLDIRS)_install
-
@@ -2519,7 +2540,7 @@ pure_site_install ::
$(INST_LIB) $(DESTINSTALLSITELIB) \
$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/patches/patch-al
--- a/lang/perl5/patches/patch-al Fri Aug 12 19:57:50 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.3 2005/08/06 06:18:45 jlam Exp $
-
---- lib/ExtUtils/MM_VMS.pm.orig 2004-01-05 17:34:59.000000000 -0500
-+++ lib/ExtUtils/MM_VMS.pm
-@@ -1457,13 +1457,13 @@ sub install {
- }
-
- push @m, q[
--install :: all pure_install doc_install
-+install :: all pure_install
- $(NOECHO) $(NOOP)
-
--install_perl :: all pure_perl_install doc_perl_install
-+install_perl :: all pure_perl_install
- $(NOECHO) $(NOOP)
-
--install_site :: all pure_site_install doc_site_install
-+install_site :: all pure_site_install
- $(NOECHO) $(NOOP)
-
- pure_install :: pure_$(INSTALLDIRS)_install
diff -r 1dd09c76e0de -r 48f142110795 lang/perl5/patches/patch-ao
--- a/lang/perl5/patches/patch-ao Fri Aug 12 19:57:50 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2005/08/08 16:39:58 jlam Exp $
-
---- lib/ExtUtils/t/basic.t.orig 2004-01-05 17:34:59.000000000 -0500
-+++ lib/ExtUtils/t/basic.t
-@@ -118,7 +118,7 @@ is( $?, 0,
- diag $test_out;
-
-
--my $install_out = run("$make install");
-+my $install_out = run("$make install doc_install");
- is( $?, 0, 'install' ) || diag $install_out;
- like( $install_out, qr/^Installing /m );
- like( $install_out, qr/^Writing /m );
-@@ -138,7 +138,7 @@ ok( $files{'perllocal.pod'},' perllocal
- SKIP: {
- skip "VMS install targets do not preserve $(PREFIX)", 8 if $Is_VMS;
-
-- $install_out = run("$make install PREFIX=elsewhere");
-+ $install_out = run("$make install doc_install PREFIX=elsewhere");
- is( $?, 0, 'install with PREFIX override' ) || diag $install_out;
Home |
Main Index |
Thread Index |
Old Index