- 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]
This commit is contained in:
Sergey Skvortsov 2010-09-16 15:57:09 +00:00
parent 336b955ced
commit 0370d5f988
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=261284
9 changed files with 12 additions and 6 deletions

View File

@ -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/} \

View File

@ -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;

View File

@ -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 } }

View File

@ -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/} \

View File

@ -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;

View File

@ -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 } }

View File

@ -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/} \

View File

@ -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;

View File

@ -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 } }