aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.perl.mk2
-rw-r--r--Mk/bsd.port.mk2
-rw-r--r--UPDATING12
-rw-r--r--lang/perl5.12/Makefile2
-rw-r--r--lang/perl5.12/Makefile.man1
-rw-r--r--lang/perl5.12/distinfo4
-rw-r--r--lang/perl5.12/pkg-plist1
7 files changed, 19 insertions, 5 deletions
diff --git a/Mk/bsd.perl.mk b/Mk/bsd.perl.mk
index fb52341bc82b..82b9b5256038 100644
--- a/Mk/bsd.perl.mk
+++ b/Mk/bsd.perl.mk
@@ -84,7 +84,7 @@ PERL_Include_MAINTAINER= perl@FreeBSD.org
# to set one of the conditionals that force the inclusion of bsd.perl.mk
.if defined(_PERL_REFACTORING_COMPLETE)
-PERL_VERSION?= 5.12.3
+PERL_VERSION?= 5.12.4
.if !defined(PERL_LEVEL) && defined(PERL_VERSION)
perl_major= ${PERL_VERSION:C|\..*||}
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 9689eb7b4156..0d7b6d0aac46 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1443,7 +1443,7 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
# to set one of the conditionals that force the inclusion of bsd.perl.mk
.if !defined(_PERL_REFACTORING_COMPLETE)
-PERL_VERSION?= 5.12.3
+PERL_VERSION?= 5.12.4
.if !defined(PERL_LEVEL) && defined(PERL_VERSION)
perl_major= ${PERL_VERSION:C|^([1-9]+).*|\1|}
diff --git a/UPDATING b/UPDATING
index 58e1bca00752..d88b952147de 100644
--- a/UPDATING
+++ b/UPDATING
@@ -88,6 +88,18 @@ you update your ports collection, before attempting any port upgrades.
or
# portupgrade -o databases/py-sqlalchemy06 databases/py-sqlalchemy
+20110622:
+ AFFECTS: users of lang/perl5.12
+ AUTHOR: skv@FreeBSD.org
+
+ lang/perl5.12 has been updated to 5.12.4. You should update everything
+ that depends on perl. The easiest way to do that is to use
+ "perl-after-upgrade" script supplied with lang/perl5.12.
+ Please see its manual page for details.
+
+ If you want to switch to lang/perl5.12 from lang/perl5.{8,10} please
+ follow instructions in the entry 20100715 in this file.
+
20110620:
AFFECTS: users of net/samba35
AUTHOR: timur@FreeBSD.org
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index d10e6b22a653..314f393d6cbe 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -38,7 +38,7 @@ OPTIONS= DEBUGGING "Build with debugging support" off \
PORTSCOUT= limitw:1,even
-PERL_VERSION= 5.12.3
+PERL_VERSION= 5.12.4
PERL_ARCH= mach
SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VERSION}
SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL}
diff --git a/lang/perl5.12/Makefile.man b/lang/perl5.12/Makefile.man
index f60d682024cb..4d1f0048e286 100644
--- a/lang/perl5.12/Makefile.man
+++ b/lang/perl5.12/Makefile.man
@@ -30,6 +30,7 @@ MAN1+= perl5120delta.1
MAN1+= perl5121delta.1
MAN1+= perl5122delta.1
MAN1+= perl5123delta.1
+MAN1+= perl5124delta.1
MAN1+= perl561delta.1
MAN1+= perl56delta.1
MAN1+= perl570delta.1
diff --git a/lang/perl5.12/distinfo b/lang/perl5.12/distinfo
index 8306d6710fd1..5f242ee11e97 100644
--- a/lang/perl5.12/distinfo
+++ b/lang/perl5.12/distinfo
@@ -1,4 +1,4 @@
-SHA256 (perl/perl-5.12.3.tar.bz2) = 7e3ce3f19f2290c2a2a43a98bcf8cb0ccb69b652d67ddc629544339edc6c7343
-SIZE (perl/perl-5.12.3.tar.bz2) = 12041247
+SHA256 (perl/perl-5.12.4.tar.bz2) = c920fa01a34b7752e8cbbc99c6921b908df60611d84a29c4377e4a798604767e
+SIZE (perl/perl-5.12.4.tar.bz2) = 12350353
SHA256 (perl/BSDPAN-5.12.1_20100713.tar.bz2) = f700acc5ca29c6ef94460d23acffde77834e883cdb7cd043dbdb7c7d709a9392
SIZE (perl/BSDPAN-5.12.1_20100713.tar.bz2) = 8430
diff --git a/lang/perl5.12/pkg-plist b/lang/perl5.12/pkg-plist
index dbabe38a3055..6c5cd0ecff16 100644
--- a/lang/perl5.12/pkg-plist
+++ b/lang/perl5.12/pkg-plist
@@ -1042,6 +1042,7 @@ lib/perl5/%%PERL_VER%%/pod/perl5120delta.pod
lib/perl5/%%PERL_VER%%/pod/perl5121delta.pod
lib/perl5/%%PERL_VER%%/pod/perl5122delta.pod
lib/perl5/%%PERL_VER%%/pod/perl5123delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl5124delta.pod
lib/perl5/%%PERL_VER%%/pod/perl561delta.pod
lib/perl5/%%PERL_VER%%/pod/perl56delta.pod
lib/perl5/%%PERL_VER%%/pod/perl570delta.pod