aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPDATING12
-rw-r--r--devel/apr1/files/patch-apr_ldap_rebind.c15
-rw-r--r--lang/perl5.14/Makefile2
-rw-r--r--lang/perl5.14/Makefile.man1
-rw-r--r--lang/perl5.14/distinfo4
-rw-r--r--lang/perl5.14/files/perl-after-upgrade2
-rw-r--r--lang/perl5.14/pkg-plist1
-rw-r--r--lang/perl5.16/Makefile2
-rw-r--r--lang/perl5.16/Makefile.man1
-rw-r--r--lang/perl5.16/distinfo4
-rw-r--r--lang/perl5.16/files/perl-after-upgrade2
-rw-r--r--lang/perl5.16/pkg-plist1
12 files changed, 39 insertions, 8 deletions
diff --git a/UPDATING b/UPDATING
index fa5a8d85886a..19dd7f2802c5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20110619:
+ AFFECTS: users of lang/perl5.14
+ AUTHOR: skv@FreeBSD.org
+
+ lang/perl5.14 has been updated to 5.14.1. 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.14.
+ Please see its manual page for details.
+
+ If you want to switch to lang/perl5.14 from lang/perl5.{8,10,12} please
+ follow instructions in the entry 20110517 in this file.
+
20110613:
AFFECTS: users of mail/mailman with postfix
AUTHOR: crees@FreeBSD.org
diff --git a/devel/apr1/files/patch-apr_ldap_rebind.c b/devel/apr1/files/patch-apr_ldap_rebind.c
new file mode 100644
index 000000000000..e7c9cd2a17d7
--- /dev/null
+++ b/devel/apr1/files/patch-apr_ldap_rebind.c
@@ -0,0 +1,15 @@
+--- apr-util-1.3.12/ldap/apr_ldap_rebind.c.orig 2011-06-18 14:42:15.000000000 +0000
++++ apr-util-1.3.12/ldap/apr_ldap_rebind.c 2011-06-18 14:42:28.000000000 +0000
+@@ -81,11 +81,11 @@
+ get_apd
+ #endif
+
++#if APR_HAS_THREADS
+ /* run after apr_thread_mutex_create cleanup */
+ apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
+ apr_pool_cleanup_null);
+
+-#if APR_HAS_THREADS
+ if (apr_ldap_xref_lock == NULL) {
+ retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
+ }
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index e630d2dd3d37..65e2f17fa089 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -38,7 +38,7 @@ OPTIONS= DEBUGGING "Build with debugging support" off \
PORTSCOUT= limitw:1,even
-PERL_VERSION= 5.14.0
+PERL_VERSION= 5.14.1
PERL_ARCH= mach
SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VERSION}
SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL}
diff --git a/lang/perl5.14/Makefile.man b/lang/perl5.14/Makefile.man
index 71894cb857de..d7b0990b1540 100644
--- a/lang/perl5.14/Makefile.man
+++ b/lang/perl5.14/Makefile.man
@@ -44,6 +44,7 @@ MAN1+= perl5137delta.1
MAN1+= perl5138delta.1
MAN1+= perl5139delta.1
MAN1+= perl5140delta.1
+MAN1+= perl5141delta.1
MAN1+= perl561delta.1
MAN1+= perl56delta.1
MAN1+= perl570delta.1
diff --git a/lang/perl5.14/distinfo b/lang/perl5.14/distinfo
index b0893e1c706c..487c2e5d0ae8 100644
--- a/lang/perl5.14/distinfo
+++ b/lang/perl5.14/distinfo
@@ -1,4 +1,4 @@
-SHA256 (perl/perl-5.14.0.tar.bz2) = ea027d0f5279b7465f69ee942ea4015296f90429f1ead7a99fe3b03a475ee821
-SIZE (perl/perl-5.14.0.tar.bz2) = 13250162
+SHA256 (perl/perl-5.14.1.tar.bz2) = 29b4a7e7c22d4a980ab9eb1ea486c5c4ee9ec533192a1ce8f3fe9ae32fb1f862
+SIZE (perl/perl-5.14.1.tar.bz2) = 13266293
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.14/files/perl-after-upgrade b/lang/perl5.14/files/perl-after-upgrade
index bb9450fa602a..10aecd3841e3 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\.12\.\d+/;
+our $PERL_VERSION_REGEX = qr/5\.14\.\d+/;
print STDERR "- Fuzzy source re: <$PERL_VERSION_REGEX>\n" if $debug;
our @errors;
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index 60bf5c3a82f0..00a6ab938375 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -1119,6 +1119,7 @@ lib/perl5/%%PERL_VER%%/pod/perl5137delta.pod
lib/perl5/%%PERL_VER%%/pod/perl5138delta.pod
lib/perl5/%%PERL_VER%%/pod/perl5139delta.pod
lib/perl5/%%PERL_VER%%/pod/perl5140delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl5141delta.pod
lib/perl5/%%PERL_VER%%/pod/perl561delta.pod
lib/perl5/%%PERL_VER%%/pod/perl56delta.pod
lib/perl5/%%PERL_VER%%/pod/perl570delta.pod
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index e630d2dd3d37..65e2f17fa089 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -38,7 +38,7 @@ OPTIONS= DEBUGGING "Build with debugging support" off \
PORTSCOUT= limitw:1,even
-PERL_VERSION= 5.14.0
+PERL_VERSION= 5.14.1
PERL_ARCH= mach
SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VERSION}
SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL}
diff --git a/lang/perl5.16/Makefile.man b/lang/perl5.16/Makefile.man
index 71894cb857de..d7b0990b1540 100644
--- a/lang/perl5.16/Makefile.man
+++ b/lang/perl5.16/Makefile.man
@@ -44,6 +44,7 @@ MAN1+= perl5137delta.1
MAN1+= perl5138delta.1
MAN1+= perl5139delta.1
MAN1+= perl5140delta.1
+MAN1+= perl5141delta.1
MAN1+= perl561delta.1
MAN1+= perl56delta.1
MAN1+= perl570delta.1
diff --git a/lang/perl5.16/distinfo b/lang/perl5.16/distinfo
index b0893e1c706c..487c2e5d0ae8 100644
--- a/lang/perl5.16/distinfo
+++ b/lang/perl5.16/distinfo
@@ -1,4 +1,4 @@
-SHA256 (perl/perl-5.14.0.tar.bz2) = ea027d0f5279b7465f69ee942ea4015296f90429f1ead7a99fe3b03a475ee821
-SIZE (perl/perl-5.14.0.tar.bz2) = 13250162
+SHA256 (perl/perl-5.14.1.tar.bz2) = 29b4a7e7c22d4a980ab9eb1ea486c5c4ee9ec533192a1ce8f3fe9ae32fb1f862
+SIZE (perl/perl-5.14.1.tar.bz2) = 13266293
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.16/files/perl-after-upgrade b/lang/perl5.16/files/perl-after-upgrade
index bb9450fa602a..10aecd3841e3 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\.12\.\d+/;
+our $PERL_VERSION_REGEX = qr/5\.14\.\d+/;
print STDERR "- Fuzzy source re: <$PERL_VERSION_REGEX>\n" if $debug;
our @errors;
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index 60bf5c3a82f0..00a6ab938375 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -1119,6 +1119,7 @@ lib/perl5/%%PERL_VER%%/pod/perl5137delta.pod
lib/perl5/%%PERL_VER%%/pod/perl5138delta.pod
lib/perl5/%%PERL_VER%%/pod/perl5139delta.pod
lib/perl5/%%PERL_VER%%/pod/perl5140delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl5141delta.pod
lib/perl5/%%PERL_VER%%/pod/perl561delta.pod
lib/perl5/%%PERL_VER%%/pod/perl56delta.pod
lib/perl5/%%PERL_VER%%/pod/perl570delta.pod