Improve Haiku Support

* Make perl executable
* Add rpath for linkage, to allow using libraries outside of default LIB_PATH.
* Allow PREFIX != /boot/common (patch-cp)

4 files changed, 40 insertions, 14 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 8264fdf5eae..0d463f319a3 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2010/08/19 20:47:09 seb Exp $
+# $NetBSD: Makefile,v 1.161 2010/08/21 03:12:46 obache Exp $
 
 .include "license.mk"
 
@@ -355,6 +355,9 @@ perl5-post-install:
 	  ${ECHO} "${PERL5_SCRIPTDIR}/perllink";			\
 	  ${ECHO} "${PERL5_MAN1DIR}/perllink.1";			\
 	} | ${SED} -e "s,^"${PREFIX:Q}"/,," > ${PLIST_SRC}
+.if ${OPSYS} == "Haiku"
+	${CHMOD} a+x ${DESTDIR}${PREFIX}/bin/perl
+.endif
 
 .include "packlist.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 03835eb164b..02f6ec6e2bb 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2010/08/19 20:47:09 seb Exp $
+$NetBSD: distinfo,v 1.67 2010/08/21 03:12:46 obache Exp $
 
 SHA1 (perl-5.12.1.tar.gz) = 83b99f08379782dc06594a85eeb279edc5b0ca44
 RMD160 (perl-5.12.1.tar.gz) = 2e2d08821bdf3ed87360af828e3b31f5861b4fdd
@@ -8,10 +8,11 @@ SHA1 (patch-ab) = e3aa6bf9695addb9b754297120caf8683a625d1a
 SHA1 (patch-ah) = 7f4c84249cb804af69db389078f7b7cbfc97896c
 SHA1 (patch-ai) = 5abdbbddcba79088996056ab88a34db5fcd16b01
 SHA1 (patch-aq) = 3ece22678e3e6dcd3cf641e6389ff203cbe351b9
-SHA1 (patch-ca) = bc3472f62773045916261e8e434af8f2e25b4f9a
+SHA1 (patch-ca) = f0f54398e7766b78be3dc8afe0fec6aac5797f58
 SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
 SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097
 SHA1 (patch-cn) = 7ca2b1ff19f8371637a34ec26779b37d74c74cca
+SHA1 (patch-cp) = 0b22d334df24d128142855464bf6dd61d4d82975
 SHA1 (patch-ta) = 69f0d2df022eb8ff0dbcc77bde638cdc9c6391b1
 SHA1 (patch-zc) = 187b79978285058f37991278b99bbd4109344a2f
 SHA1 (patch-zd) = 15532739b4a582da322d3e51fc364905bacbcd7e
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index bf0adf8ebf8..343edf24de8 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $
+$NetBSD: patch-ca,v 1.8 2010/08/21 03:12:46 obache Exp $
 
---- Configure.orig	2009-12-06 17:23:10.000000000 +0000
-+++ Configure	2009-12-06 17:51:02.000000000 +0000
-@@ -3233,13 +3233,14 @@
+--- Configure.orig	2010-05-13 22:01:07.000000000 +0000
++++ Configure
+@@ -3251,13 +3251,14 @@ EOM
  			osvers="$3"
  			;;
  		dragonfly) osname=dragonfly
@@ -19,7 +19,7 @@ $NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $
  		genix)	osname=genix ;;
  		gnu)	osname=gnu
  			osvers="$3" ;;
-@@ -3261,7 +3262,7 @@
+@@ -3279,7 +3280,7 @@ EOM
  		MiNT)	osname=mint
  			;;
  		netbsd*) osname=netbsd
@@ -28,7 +28,7 @@ $NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $
  			;;
  		news-os) osvers="$3"
  			case "$3" in
-@@ -3272,7 +3273,7 @@
+@@ -3290,7 +3291,7 @@ EOM
  		next*) osname=next ;;
  		nonstop-ux) osname=nonstopux ;;
  		openbsd) osname=openbsd
@@ -37,7 +37,7 @@ $NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $
                  	;;
  		os2)	osname=os2
  			osvers="$4"
-@@ -4772,7 +4773,7 @@
+@@ -4790,7 +4791,7 @@ case "$plibpth" in
  esac
  case "$libpth" in
  ' ') dlist='';;
@@ -46,7 +46,7 @@ $NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $
  *) dlist="$libpth";;
  esac
  
-@@ -6503,7 +6504,9 @@
+@@ -6521,7 +6522,9 @@ rp='Pathname for the site-specific libra
  . ./getfile
  prefixvar=sitelib
  . ./setprefixvar
@@ -57,7 +57,7 @@ $NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $
  
  : Determine list of previous versions to include in @INC
  $cat > getverlist <<EOPL
-@@ -7015,7 +7018,9 @@
+@@ -7033,7 +7036,9 @@ case "$vendorprefix" in
  	vendorlibexp="$ansexp"
  	;;
  esac
@@ -68,7 +68,16 @@ $NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $
  prefixvar=vendorlib
  . ./installprefix
  
-@@ -9381,6 +9386,13 @@
+@@ -8339,7 +8344,7 @@ if "$useshrplib"; then
+ 		# beos doesn't like the default, either.
+ 		;;
+ 	haiku)
+-		# Haiku doesn't like the default, either.
++		xxx="-Wl,-rpath,$shrpdir"
+ 		;;
+ 	hpux*)
+ 		# hpux doesn't like the default, either.
+@@ -9410,6 +9415,13 @@ EOCP
  	;;
  esac
  
@@ -82,7 +91,7 @@ $NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $
  : Set the vendorbin variables
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
-@@ -18816,7 +18828,15 @@
+@@ -18925,7 +18937,15 @@ RCAT(Rei,ser)
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
diff --git a/lang/perl5/patches/patch-cp b/lang/perl5/patches/patch-cp
new file mode 100644
index 00000000000..4307f8887a5
--- /dev/null
+++ b/lang/perl5/patches/patch-cp
@@ -0,0 +1,13 @@
+$NetBSD: patch-cp,v 1.1 2010/08/21 03:12:46 obache Exp $
+
+Allow to install our prefix.
+
+--- hints/haiku.sh.orig	2010-04-26 08:09:20.000000000 +0000
++++ hints/haiku.sh
+@@ -3,3 +3,5 @@
+ 
+-prefix="/boot/common"
++case "$prefix" in
++'') prefix="/boot/common" ;;
++esac
+