aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorskv <skv@FreeBSD.org>2010-09-16 23:57:09 +0800
committerskv <skv@FreeBSD.org>2010-09-16 23:57:09 +0800
commit7b16bba317b96a5132a0985a81c8e8212ae8b318 (patch)
treed9ac4f70e39230db7842117c41af294f6407c459 /lang
parentc9fac5eb80bb8cc1c11d15054e633bb00d5e4bc0 (diff)
downloadfreebsd-ports-graphics-7b16bba317b96a5132a0985a81c8e8212ae8b318.tar.gz
freebsd-ports-graphics-7b16bba317b96a5132a0985a81c8e8212ae8b318.tar.zst
freebsd-ports-graphics-7b16bba317b96a5132a0985a81c8e8212ae8b318.zip
- 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]
Diffstat (limited to 'lang')
-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 fdf3ae2ffab..5ed31fd8e6d 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 2cd3c3fe8b2..bb9450fa602 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 e6314754e43..3603d6ea50a 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 fdf3ae2ffab..5ed31fd8e6d 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 2cd3c3fe8b2..bb9450fa602 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 e6314754e43..3603d6ea50a 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 fdf3ae2ffab..5ed31fd8e6d 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 2cd3c3fe8b2..bb9450fa602 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 e6314754e43..3603d6ea50a 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 (git 2.34.1) at 2024-12-17 16:09:40 +0800