From febe05b6663a028382310816a6904edb37bbfee3 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 30 Jan 2011 21:31:42 +0000
Subject: Improve MirBSD support, from Benny Siegert in PR 44491.

---
 lang/perl5/Makefile         | 10 +++++++++-
 lang/perl5/distinfo         |  4 ++--
 lang/perl5/patches/patch-ca | 16 ++++++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'lang/perl5')

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 4291d5cc50e..f3698c701ec 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2011/01/23 19:07:26 agc Exp $
+# $NetBSD: Makefile,v 1.170 2011/01/30 21:31:42 wiz Exp $
 
 .include "license.mk"
 .include "Makefile.common"
@@ -181,6 +181,14 @@ PKG_HACKS+=			broken-vax-pthreads
 PERL5_BUILD_THREADS_SUPPORT=	no
 .endif
 
+.if !empty(MACHINE_PLATFORM:MMirBSD*)
+SUBST_CLASSES+=			mirbsd-paths
+SUBST_STAGE.mirbsd-paths=	pre-configure
+SUBST_FILES.mirbsd-paths=	hints/mirbsd.sh
+SUBST_SED.mirbsd-paths=		-e 's,/usr/mpkg,${PREFIX},g'
+SUBST_MESSAGE.mirbsd-paths=	Do not use non-pkgsrc paths on MirBSD.
+.endif
+
 .include "../../mk/compiler.mk"
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.perl
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 5b55dd8b569..cf2ed28bbc4 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2010/09/23 21:47:48 sno Exp $
+$NetBSD: distinfo,v 1.72 2011/01/30 21:31:42 wiz Exp $
 
 SHA1 (perl-5.12.2.tar.gz) = c157f214a93ce20fc06dc9d9c902c05ad1327cb1
 RMD160 (perl-5.12.2.tar.gz) = b1fd7f05d96fa6a263d3622654af6b584c308ce4
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = c1893ea4cf4b89b03b3acc5dec9b5828d50c5dad
 SHA1 (patch-ah) = aca6b4bf08809789058f3ec259c6df86df2aaf83
 SHA1 (patch-ai) = 5abdbbddcba79088996056ab88a34db5fcd16b01
 SHA1 (patch-aq) = 3ece22678e3e6dcd3cf641e6389ff203cbe351b9
-SHA1 (patch-ca) = f0f54398e7766b78be3dc8afe0fec6aac5797f58
+SHA1 (patch-ca) = e8340df59362d1d388a8b6ea36fc85d4b230a67f
 SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
 SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097
 SHA1 (patch-cn) = 7ca2b1ff19f8371637a34ec26779b37d74c74cca
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index 343edf24de8..ba733c0d92e 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,6 +1,9 @@
-$NetBSD: patch-ca,v 1.8 2010/08/21 03:12:46 obache Exp $
+$NetBSD: patch-ca,v 1.9 2011/01/30 21:31:43 wiz Exp $
 
---- Configure.orig	2010-05-13 22:01:07.000000000 +0000
+Hunk 7 (MirBSD) was submitted and accepted upstream, see
+http://rt.perl.org/rt3/Ticket/Display.html?id=82532
+
+--- Configure.orig	2010-09-06 23:30:32.000000000 +0000
 +++ Configure
 @@ -3251,13 +3251,14 @@ EOM
  			osvers="$3"
@@ -68,6 +71,15 @@ $NetBSD: patch-ca,v 1.8 2010/08/21 03:12:46 obache Exp $
  prefixvar=vendorlib
  . ./installprefix
  
+@@ -8326,7 +8331,7 @@ if "$useshrplib"; then
+ 	solaris)
+ 		xxx="-R $shrpdir"
+ 		;;
+-	freebsd|netbsd|openbsd|interix|dragonfly)
++	freebsd|mirbsd|netbsd|openbsd|interix|dragonfly)
+ 		xxx="-Wl,-R$shrpdir"
+ 		;;
+ 	bsdos|linux|irix*|dec_osf|gnu*)
 @@ -8339,7 +8344,7 @@ if "$useshrplib"; then
  		# beos doesn't like the default, either.
  		;;
-- 
cgit v1.2.3