Sat Aug 21 03:12:46 2010 UTC ()
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)


(obache)
diff -r1.160 -r1.161 pkgsrc/lang/perl5/Makefile
diff -r1.66 -r1.67 pkgsrc/lang/perl5/distinfo
diff -r1.7 -r1.8 pkgsrc/lang/perl5/patches/patch-ca
diff -r0 -r1.1 pkgsrc/lang/perl5/patches/patch-cp
cvs diff -r1.160 -r1.161 pkgsrc/lang/perl5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2010/08/19 20:47:09 1.160
+++ pkgsrc/lang/perl5/Makefile 2010/08/21 03:12:46 1.161
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.160 2010/08/19 20:47:09 seb Exp $ 1# $NetBSD: Makefile,v 1.161 2010/08/21 03:12:46 obache Exp $
2 2
3.include "license.mk" 3.include "license.mk"
4 4
5DISTNAME= perl-5.12.1 5DISTNAME= perl-5.12.1
6CATEGORIES= lang devel perl5 6CATEGORIES= lang devel perl5
7#PKGREVISION= 1 7#PKGREVISION= 1
8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,} 8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,}
9DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.perl.org/ 12HOMEPAGE= http://www.perl.org/
13COMMENT= Practical Extraction and Report Language 13COMMENT= Practical Extraction and Report Language
14LICENSE= ${PERL5_LICENSE} 14LICENSE= ${PERL5_LICENSE}
@@ -345,16 +345,19 @@ perl5-post-install: @@ -345,16 +345,19 @@ perl5-post-install:
345 strip ${DESTDIR}${PREFIX}/bin/a2p; \ 345 strip ${DESTDIR}${PREFIX}/bin/a2p; \
346 fi 346 fi
347 ${RUN}${INSTALL_SCRIPT} ${WRKDIR}/perllink.sh ${DESTDIR}${PERL5_SCRIPTDIR}/perllink; \ 347 ${RUN}${INSTALL_SCRIPT} ${WRKDIR}/perllink.sh ${DESTDIR}${PERL5_SCRIPTDIR}/perllink; \
348 ${INSTALL_MAN} ${FILESDIR}/perllink.1 ${DESTDIR}${PERL5_MAN1DIR}/perllink.1; \ 348 ${INSTALL_MAN} ${FILESDIR}/perllink.1 ${DESTDIR}${PERL5_MAN1DIR}/perllink.1; \
349 ${RM} -f ${DESTDIR}${PREFIX}/bin/perllink \ 349 ${RM} -f ${DESTDIR}${PREFIX}/bin/perllink \
350 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1; \ 350 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1; \
351 ${LN} -s ${PERL5_SCRIPTDIR}/perllink ${DESTDIR}${PREFIX}/bin/perllink; \ 351 ${LN} -s ${PERL5_SCRIPTDIR}/perllink ${DESTDIR}${PREFIX}/bin/perllink; \
352 ${LN} -s ${PERL5_MAN1DIR}/perllink.1 \ 352 ${LN} -s ${PERL5_MAN1DIR}/perllink.1 \
353 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1; \ 353 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1; \
354 { ${CAT} ${PKGDIR}/PLIST; \ 354 { ${CAT} ${PKGDIR}/PLIST; \
355 ${ECHO} "${PERL5_SCRIPTDIR}/perllink"; \ 355 ${ECHO} "${PERL5_SCRIPTDIR}/perllink"; \
356 ${ECHO} "${PERL5_MAN1DIR}/perllink.1"; \ 356 ${ECHO} "${PERL5_MAN1DIR}/perllink.1"; \
357 } | ${SED} -e "s,^"${PREFIX:Q}"/,," > ${PLIST_SRC} 357 } | ${SED} -e "s,^"${PREFIX:Q}"/,," > ${PLIST_SRC}
 358.if ${OPSYS} == "Haiku"
 359 ${CHMOD} a+x ${DESTDIR}${PREFIX}/bin/perl
 360.endif
358 361
359.include "packlist.mk" 362.include "packlist.mk"
360.include "../../mk/bsd.pkg.mk" 363.include "../../mk/bsd.pkg.mk"
cvs diff -r1.66 -r1.67 pkgsrc/lang/perl5/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/perl5/distinfo 2010/08/19 20:47:09 1.66
+++ pkgsrc/lang/perl5/distinfo 2010/08/21 03:12:46 1.67
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.66 2010/08/19 20:47:09 seb Exp $ 1$NetBSD: distinfo,v 1.67 2010/08/21 03:12:46 obache Exp $
2 2
3SHA1 (perl-5.12.1.tar.gz) = 83b99f08379782dc06594a85eeb279edc5b0ca44 3SHA1 (perl-5.12.1.tar.gz) = 83b99f08379782dc06594a85eeb279edc5b0ca44
4RMD160 (perl-5.12.1.tar.gz) = 2e2d08821bdf3ed87360af828e3b31f5861b4fdd 4RMD160 (perl-5.12.1.tar.gz) = 2e2d08821bdf3ed87360af828e3b31f5861b4fdd
5Size (perl-5.12.1.tar.gz) = 15122057 bytes 5Size (perl-5.12.1.tar.gz) = 15122057 bytes
6SHA1 (patch-aa) = 4c8197cdc0595a17ba377a28c7457f923c2d9bf9 6SHA1 (patch-aa) = 4c8197cdc0595a17ba377a28c7457f923c2d9bf9
7SHA1 (patch-ab) = e3aa6bf9695addb9b754297120caf8683a625d1a 7SHA1 (patch-ab) = e3aa6bf9695addb9b754297120caf8683a625d1a
8SHA1 (patch-ah) = 7f4c84249cb804af69db389078f7b7cbfc97896c 8SHA1 (patch-ah) = 7f4c84249cb804af69db389078f7b7cbfc97896c
9SHA1 (patch-ai) = 5abdbbddcba79088996056ab88a34db5fcd16b01 9SHA1 (patch-ai) = 5abdbbddcba79088996056ab88a34db5fcd16b01
10SHA1 (patch-aq) = 3ece22678e3e6dcd3cf641e6389ff203cbe351b9 10SHA1 (patch-aq) = 3ece22678e3e6dcd3cf641e6389ff203cbe351b9
11SHA1 (patch-ca) = bc3472f62773045916261e8e434af8f2e25b4f9a 11SHA1 (patch-ca) = f0f54398e7766b78be3dc8afe0fec6aac5797f58
12SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099 12SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
13SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097 13SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097
14SHA1 (patch-cn) = 7ca2b1ff19f8371637a34ec26779b37d74c74cca 14SHA1 (patch-cn) = 7ca2b1ff19f8371637a34ec26779b37d74c74cca
 15SHA1 (patch-cp) = 0b22d334df24d128142855464bf6dd61d4d82975
15SHA1 (patch-ta) = 69f0d2df022eb8ff0dbcc77bde638cdc9c6391b1 16SHA1 (patch-ta) = 69f0d2df022eb8ff0dbcc77bde638cdc9c6391b1
16SHA1 (patch-zc) = 187b79978285058f37991278b99bbd4109344a2f 17SHA1 (patch-zc) = 187b79978285058f37991278b99bbd4109344a2f
17SHA1 (patch-zd) = 15532739b4a582da322d3e51fc364905bacbcd7e 18SHA1 (patch-zd) = 15532739b4a582da322d3e51fc364905bacbcd7e
18SHA1 (patch-ze) = 42ccdd60c8dc5c6e93ebcebd276aa5f7e60d07fe 19SHA1 (patch-ze) = 42ccdd60c8dc5c6e93ebcebd276aa5f7e60d07fe
cvs diff -r1.7 -r1.8 pkgsrc/lang/perl5/patches/Attic/patch-ca (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-ca 2009/12/14 06:36:57 1.7
+++ pkgsrc/lang/perl5/patches/Attic/patch-ca 2010/08/21 03:12:46 1.8
@@ -1,98 +1,107 @@ @@ -1,98 +1,107 @@
1$NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $ 1$NetBSD: patch-ca,v 1.8 2010/08/21 03:12:46 obache Exp $
2 2
3--- Configure.orig 2009-12-06 17:23:10.000000000 +0000 3--- Configure.orig 2010-05-13 22:01:07.000000000 +0000
4+++ Configure 2009-12-06 17:51:02.000000000 +0000 4+++ Configure
5@@ -3233,13 +3233,14 @@ 5@@ -3251,13 +3251,14 @@ EOM
6 osvers="$3" 6 osvers="$3"
7 ;; 7 ;;
8 dragonfly) osname=dragonfly 8 dragonfly) osname=dragonfly
9- osvers="$3" 9- osvers="$3"
10+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` 10+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
11 ;; 11 ;;
12 dynixptx*) osname=dynixptx 12 dynixptx*) osname=dynixptx
13 osvers=`echo "$4"|sed 's/^v//'` 13 osvers=`echo "$4"|sed 's/^v//'`
14 ;; 14 ;;
15 freebsd) osname=freebsd 15 freebsd) osname=freebsd
16- osvers="$3" ;; 16- osvers="$3" ;;
17+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` 17+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
18+ ;; 18+ ;;
19 genix) osname=genix ;; 19 genix) osname=genix ;;
20 gnu) osname=gnu 20 gnu) osname=gnu
21 osvers="$3" ;; 21 osvers="$3" ;;
22@@ -3261,7 +3262,7 @@ 22@@ -3279,7 +3280,7 @@ EOM
23 MiNT) osname=mint 23 MiNT) osname=mint
24 ;; 24 ;;
25 netbsd*) osname=netbsd 25 netbsd*) osname=netbsd
26- osvers="$3" 26- osvers="$3"
27+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` 27+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
28 ;; 28 ;;
29 news-os) osvers="$3" 29 news-os) osvers="$3"
30 case "$3" in 30 case "$3" in
31@@ -3272,7 +3273,7 @@ 31@@ -3290,7 +3291,7 @@ EOM
32 next*) osname=next ;; 32 next*) osname=next ;;
33 nonstop-ux) osname=nonstopux ;; 33 nonstop-ux) osname=nonstopux ;;
34 openbsd) osname=openbsd 34 openbsd) osname=openbsd
35- osvers="$3" 35- osvers="$3"
36+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` 36+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
37 ;; 37 ;;
38 os2) osname=os2 38 os2) osname=os2
39 osvers="$4" 39 osvers="$4"
40@@ -4772,7 +4773,7 @@ 40@@ -4790,7 +4791,7 @@ case "$plibpth" in
41 esac 41 esac
42 case "$libpth" in 42 case "$libpth" in
43 ' ') dlist='';; 43 ' ') dlist='';;
44-'') dlist="$loclibpth $plibpth $glibpth";; 44-'') dlist="$loclibpth $plibpth $glibpth";;
45+'') dlist="$plibpth $glibpth $loclibpth";; 45+'') dlist="$plibpth $glibpth $loclibpth";;
46 *) dlist="$libpth";; 46 *) dlist="$libpth";;
47 esac 47 esac
48  48
49@@ -6503,7 +6504,9 @@ 49@@ -6521,7 +6522,9 @@ rp='Pathname for the site-specific libra
50 . ./getfile 50 . ./getfile
51 prefixvar=sitelib 51 prefixvar=sitelib
52 . ./setprefixvar 52 . ./setprefixvar
53-sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"` 53-sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
54+if $test -z "$sitelib_stem"; then 54+if $test -z "$sitelib_stem"; then
55+ sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"` 55+ sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
56+fi 56+fi
57  57
58 : Determine list of previous versions to include in @INC 58 : Determine list of previous versions to include in @INC
59 $cat > getverlist <<EOPL 59 $cat > getverlist <<EOPL
60@@ -7015,7 +7018,9 @@ 60@@ -7033,7 +7036,9 @@ case "$vendorprefix" in
61 vendorlibexp="$ansexp" 61 vendorlibexp="$ansexp"
62 ;; 62 ;;
63 esac 63 esac
64-vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"` 64-vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
65+if $test -z "$vendorlib_stem"; then 65+if $test -z "$vendorlib_stem"; then
66+ vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"` 66+ vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
67+fi 67+fi
68 prefixvar=vendorlib 68 prefixvar=vendorlib
69 . ./installprefix 69 . ./installprefix
70  70
71@@ -9381,6 +9386,13 @@ 71@@ -8339,7 +8344,7 @@ if "$useshrplib"; then
 72 # beos doesn't like the default, either.
 73 ;;
 74 haiku)
 75- # Haiku doesn't like the default, either.
 76+ xxx="-Wl,-rpath,$shrpdir"
 77 ;;
 78 hpux*)
 79 # hpux doesn't like the default, either.
 80@@ -9410,6 +9415,13 @@ EOCP
72 ;; 81 ;;
73 esac 82 esac
74  83
75+: Look for a hint-file generated 'call-back-unit'. We need 84+: Look for a hint-file generated 'call-back-unit'. We need
76+: to set some defaults for building perl in pkgsrc. 85+: to set some defaults for building perl in pkgsrc.
77+if $test -f pkgsrc.cbu; then 86+if $test -f pkgsrc.cbu; then
78+ echo "Setting pkgsrc-specific hints regarding compiler/linker flags..." 87+ echo "Setting pkgsrc-specific hints regarding compiler/linker flags..."
79+ . ./pkgsrc.cbu 88+ . ./pkgsrc.cbu
80+fi 89+fi
81+ 90+
82 : Set the vendorbin variables 91 : Set the vendorbin variables
83 case "$vendorprefix" in 92 case "$vendorprefix" in
84 '') d_vendorbin="$undef" 93 '') d_vendorbin="$undef"
85@@ -18816,7 +18828,15 @@ 94@@ -18925,7 +18937,15 @@ RCAT(Rei,ser)
86 ACAT(Cir,cus) 95 ACAT(Cir,cus)
87 EOCP 96 EOCP
88 $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1 97 $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
89-if $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then 98-if $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
90+# yuck, what a hack. 99+# yuck, what a hack.
91+# MIPSPro compiler/preprocessor behaves differently if invoked on 100+# MIPSPro compiler/preprocessor behaves differently if invoked on
92+# stdin vs file. Here we test for stdin, but lateron we use files. 101+# stdin vs file. Here we test for stdin, but lateron we use files.
93+# So force it to work the way we know it does: 102+# So force it to work the way we know it does:
94+if [ x"${OPSYS}" = x"IRIX" ]; then 103+if [ x"${OPSYS}" = x"IRIX" ]; then
95+ echo "Hacking MIPSPro on file vs. stdin..." >&4 104+ echo "Hacking MIPSPro on file vs. stdin..." >&4
96+ echo "We know we can catify or stringify, separately or together!" 105+ echo "We know we can catify or stringify, separately or together!"
97+ cpp_stuff=42 106+ cpp_stuff=42
98+elif $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then 107+elif $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
File Added: pkgsrc/lang/perl5/patches/Attic/patch-cp
$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