aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Skvortsov <skv@FreeBSD.org>2010-09-16 15:57:09 +0000
committerSergey Skvortsov <skv@FreeBSD.org>2010-09-16 15:57:09 +0000
commit0370d5f9889193efc51681e228bd2ee9d28ba4b0 (patch)
treedd945581504439dab37a2415af43e8ed7b89a3b7
parent336b955ced1e314dc842a8fc94071e57c84ab79e (diff)
- Fix perl-after-upgrade [1]
- Preserve perms on modified /etc/make.conf, /etc/manpath.conf [2] PR: 150622 [1], 150611 [2] Submitted by: garga [1], swell.k@gmail.com [2]
Notes
Notes: svn path=/head/; revision=261284
Diffstat
-rw-r--r--lang/perl5.12/Makefile2
-rw-r--r--lang/perl5.12/files/perl-after-upgrade2
-rw-r--r--lang/perl5.12/files/use.perl2
-rw-r--r--lang/perl5.14/Makefile2
-rw-r--r--lang/perl5.14/files/perl-after-upgrade2
-rw-r--r--lang/perl5.14/files/use.perl2
-rw-r--r--lang/perl5.16/Makefile2
-rw-r--r--lang/perl5.16/files/perl-after-upgrade2
-rw-r--r--lang/perl5.16/files/use.perl2
9 files changed, 12 insertions, 6 deletions
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index fdf3ae2ffabd..5ed31fd8e6d2 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.12/files/perl-after-upgrade b/lang/perl5.12/files/perl-after-upgrade
index 2cd3c3fe8b21..bb9450fa602a 100644
--- a/lang/perl5.12/files/perl-after-upgrade
+++ b/lang/perl5.12/files/perl-after-upgrade
@@ -264,7 +264,7 @@ while (@ARGV) {
our $PERL_VERSION = '%%PERL_VERSION%%';
our $PERL_PKGNAME = '%%PKGNAME%%';
-our $PERL_VERSION_REGEX = qr/5\.10\.\d+/;
+our $PERL_VERSION_REGEX = qr/5\.12\.\d+/;
print STDERR "- Fuzzy source re: <$PERL_VERSION_REGEX>\n" if $debug;
our @errors;
diff --git a/lang/perl5.12/files/use.perl b/lang/perl5.12/files/use.perl
index e6314754e43f..3603d6ea50ae 100644
--- a/lang/perl5.12/files/use.perl
+++ b/lang/perl5.12/files/use.perl
@@ -95,6 +95,7 @@ do_cleanup_make_conf()
{
echo -n "Cleaning up ${MAKE_CONF}..."
if [ -f ${MAKE_CONF} ] ; then
+ /bin/cp -p ${MAKE_CONF} ${MAKE_CONF}.new
/usr/bin/awk 's=0;
/^#.*use.perl/ { s=1; mode=1 }
/^#/ { s=1; if (mode != 1) { mode=0 } }
@@ -111,6 +112,7 @@ do_cleanup_manpath()
{
echo -n "Cleaning up /etc/manpath.config..."
if [ -f /etc/manpath.config ] ; then
+ /bin/cp -p /etc/manpath.config /etc/manpath.config.new
/usr/bin/awk 's=0;
/^#.*use.perl/ { s=1; mode=1 }
/^#/ { s=1; if (mode != 1) { mode=0 } }
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index fdf3ae2ffabd..5ed31fd8e6d2 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.14/files/perl-after-upgrade b/lang/perl5.14/files/perl-after-upgrade
index 2cd3c3fe8b21..bb9450fa602a 100644
--- a/lang/perl5.14/files/perl-after-upgrade
+++ b/lang/perl5.14/files/perl-after-upgrade
@@ -264,7 +264,7 @@ while (@ARGV) {
our $PERL_VERSION = '%%PERL_VERSION%%';
our $PERL_PKGNAME = '%%PKGNAME%%';
-our $PERL_VERSION_REGEX = qr/5\.10\.\d+/;
+our $PERL_VERSION_REGEX = qr/5\.12\.\d+/;
print STDERR "- Fuzzy source re: <$PERL_VERSION_REGEX>\n" if $debug;
our @errors;
diff --git a/lang/perl5.14/files/use.perl b/lang/perl5.14/files/use.perl
index e6314754e43f..3603d6ea50ae 100644
--- a/lang/perl5.14/files/use.perl
+++ b/lang/perl5.14/files/use.perl
@@ -95,6 +95,7 @@ do_cleanup_make_conf()
{
echo -n "Cleaning up ${MAKE_CONF}..."
if [ -f ${MAKE_CONF} ] ; then
+ /bin/cp -p ${MAKE_CONF} ${MAKE_CONF}.new
/usr/bin/awk 's=0;
/^#.*use.perl/ { s=1; mode=1 }
/^#/ { s=1; if (mode != 1) { mode=0 } }
@@ -111,6 +112,7 @@ do_cleanup_manpath()
{
echo -n "Cleaning up /etc/manpath.config..."
if [ -f /etc/manpath.config ] ; then
+ /bin/cp -p /etc/manpath.config /etc/manpath.config.new
/usr/bin/awk 's=0;
/^#.*use.perl/ { s=1; mode=1 }
/^#/ { s=1; if (mode != 1) { mode=0 } }
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index fdf3ae2ffabd..5ed31fd8e6d2 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.16/files/perl-after-upgrade b/lang/perl5.16/files/perl-after-upgrade
index 2cd3c3fe8b21..bb9450fa602a 100644
--- a/lang/perl5.16/files/perl-after-upgrade
+++ b/lang/perl5.16/files/perl-after-upgrade
@@ -264,7 +264,7 @@ while (@ARGV) {
our $PERL_VERSION = '%%PERL_VERSION%%';
our $PERL_PKGNAME = '%%PKGNAME%%';
-our $PERL_VERSION_REGEX = qr/5\.10\.\d+/;
+our $PERL_VERSION_REGEX = qr/5\.12\.\d+/;
print STDERR "- Fuzzy source re: <$PERL_VERSION_REGEX>\n" if $debug;
our @errors;
diff --git a/lang/perl5.16/files/use.perl b/lang/perl5.16/files/use.perl
index e6314754e43f..3603d6ea50ae 100644
--- a/lang/perl5.16/files/use.perl
+++ b/lang/perl5.16/files/use.perl
@@ -95,6 +95,7 @@ do_cleanup_make_conf()
{
echo -n "Cleaning up ${MAKE_CONF}..."
if [ -f ${MAKE_CONF} ] ; then
+ /bin/cp -p ${MAKE_CONF} ${MAKE_CONF}.new
/usr/bin/awk 's=0;
/^#.*use.perl/ { s=1; mode=1 }
/^#/ { s=1; if (mode != 1) { mode=0 } }
@@ -111,6 +112,7 @@ do_cleanup_manpath()
{
echo -n "Cleaning up /etc/manpath.config..."
if [ -f /etc/manpath.config ] ; then
+ /bin/cp -p /etc/manpath.config /etc/manpath.config.new
/usr/bin/awk 's=0;
/^#.*use.perl/ { s=1; mode=1 }
/^#/ { s=1; if (mode != 1) { mode=0 } }
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 07:36:32 +0000