Wed Nov 16 14:32:54 2011 UTC ()
Fix this so that it installs cleanly, by doing several things:
1) fix the PLIST to correspond with the files added+removed
2) fix the interpreter in some installed files
3) ignore work-directory references in 12 installed files.  Yes, this
   is wrong, and has been reported to parrot, issue #201.
PKGREVISION not bumped, since this would not create a package earlier.


(he)
diff -r1.49 -r1.50 pkgsrc/lang/parrot/Makefile
diff -r1.27 -r1.28 pkgsrc/lang/parrot/PLIST
cvs diff -r1.49 -r1.50 pkgsrc/lang/parrot/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/parrot/Makefile 2011/11/15 13:44:30 1.49
+++ pkgsrc/lang/parrot/Makefile 2011/11/16 14:32:53 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.49 2011/11/15 13:44:30 he Exp $ 1# $NetBSD: Makefile,v 1.50 2011/11/16 14:32:53 he Exp $
2# 2#
3 3
4VERSION= 3.8.0 4VERSION= 3.8.0
5RTYPE= devel 5RTYPE= devel
6DISTNAME= parrot-${VERSION} 6DISTNAME= parrot-${VERSION}
7CATEGORIES= lang 7CATEGORIES= lang
8MASTER_SITES= ftp://ftp.parrot.org/pub/parrot/releases/${RTYPE}/${VERSION}/ 8MASTER_SITES= ftp://ftp.parrot.org/pub/parrot/releases/${RTYPE}/${VERSION}/
9 9
10MAINTAINER= he@NetBSD.org 10MAINTAINER= he@NetBSD.org
11HOMEPAGE= http://www.parrotcode.org/ 11HOMEPAGE= http://www.parrotcode.org/
12COMMENT= Virtual machine made to run Perl 6 and other languages 12COMMENT= Virtual machine made to run Perl 6 and other languages
13LICENSE= artistic-2.0 13LICENSE= artistic-2.0
14 14
@@ -49,22 +49,46 @@ PLIST_SRC+= PLIST.shared @@ -49,22 +49,46 @@ PLIST_SRC+= PLIST.shared
49 49
50REPLACE_PERL+= tools/build/ops2c.pl 50REPLACE_PERL+= tools/build/ops2c.pl
51REPLACE_PERL+= tools/build/pmc2c.pl 51REPLACE_PERL+= tools/build/pmc2c.pl
52REPLACE_PERL+= tools/dev/create_language.pl 52REPLACE_PERL+= tools/dev/create_language.pl
53REPLACE_PERL+= tools/dev/gen_makefile.pl 53REPLACE_PERL+= tools/dev/gen_makefile.pl
54REPLACE_PERL+= tools/dev/pprof2cg.pl 54REPLACE_PERL+= tools/dev/pprof2cg.pl
55REPLACE_PERL+= tools/dev/reconfigure.pl 55REPLACE_PERL+= tools/dev/reconfigure.pl
56 56
57REPLACE_INTERPRETER+= parrot 57REPLACE_INTERPRETER+= parrot
58REPLACE.parrot.old= .*parrot[^[:space:]]* 58REPLACE.parrot.old= .*parrot[^[:space:]]*
59REPLACE.parrot.new= ${PREFIX}/bin/parrot 59REPLACE.parrot.new= ${PREFIX}/bin/parrot
60REPLACE_FILES.parrot+= tools/dev/pbc_to_exe.pir 60REPLACE_FILES.parrot+= tools/dev/pbc_to_exe.pir
61 61
 62REPLACE_INTERPRETER+= parrot-nqp
 63REPLACE.parrot-nqp.old= .*parrot-nqp[^[:space:]]*
 64REPLACE.parrot-nqp.new= ${PREFIX}/bin/parrot-nqp
 65REPLACE_FILES.parrot-nqp+= compilers/data_json/JSON.nqp
 66
 67REPLACE_INTERPRETER+= nqp
 68REPLACE.nqp.old= .*nqp[^[:space:]]*
 69REPLACE.nqp.new= ${PREFIX}/bin/parrot-nqp
 70REPLACE_FILES.nqp+= runtime/parrot/library/YAML/Tiny.pm
 71
 72# These have been reported to parrot, Git tracking issue #201
 73CHECK_WRKREF_SKIP+= bin/ops2c
 74CHECK_WRKREF_SKIP+= bin/parrot
 75CHECK_WRKREF_SKIP+= bin/parrot-nqp
 76CHECK_WRKREF_SKIP+= bin/parrot-prove
 77CHECK_WRKREF_SKIP+= bin/parrot_config
 78CHECK_WRKREF_SKIP+= bin/parrot_nci_thunk_gen
 79CHECK_WRKREF_SKIP+= bin/pbc_merge
 80CHECK_WRKREF_SKIP+= bin/pbc_to_exe
 81CHECK_WRKREF_SKIP+= bin/winxed
 82CHECK_WRKREF_SKIP+= lib/parrot/${PKGVERSION}/include/config.fpmc
 83CHECK_WRKREF_SKIP+= lib/parrot/${PKGVERSION}/parrot_config.o
 84CHECK_WRKREF_SKIP+= lib/parrot/${PKGVERSION}/tools/lib/Parrot/Config/Generated.pm
 85
62# Does relink internally, so allow local rpath entries 86# Does relink internally, so allow local rpath entries
63BUILDLINK_PASSTHRU_RPATHDIRS+= ${WRKSRC} 87BUILDLINK_PASSTHRU_RPATHDIRS+= ${WRKSRC}
64 88
65pre-install: 89pre-install:
66 ${CHMOD} -R g-w ${WRKSRC} 90 ${CHMOD} -R g-w ${WRKSRC}
67 91
68.include "../../textproc/icu/buildlink3.mk" 92.include "../../textproc/icu/buildlink3.mk"
69.include "../../devel/gmp/buildlink3.mk" 93.include "../../devel/gmp/buildlink3.mk"
70.include "../../mk/bsd.pkg.mk" 94.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/lang/parrot/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/parrot/PLIST 2011/08/26 08:30:30 1.27
+++ pkgsrc/lang/parrot/PLIST 2011/11/16 14:32:53 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.27 2011/08/26 08:30:30 he Exp $ 1@comment $NetBSD: PLIST,v 1.28 2011/11/16 14:32:53 he Exp $
2bin/ops2c 2bin/ops2c
3bin/parrot 3bin/parrot
4bin/parrot-nqp 4bin/parrot-nqp
5bin/parrot-prove 5bin/parrot-prove
6bin/parrot_config 6bin/parrot_config
7bin/parrot_nci_thunk_gen 7bin/parrot_nci_thunk_gen
8bin/pbc_disassemble 8bin/pbc_disassemble
9bin/pbc_dump 9bin/pbc_dump
10bin/pbc_merge 10bin/pbc_merge
11bin/pbc_to_exe 11bin/pbc_to_exe
12bin/winxed 12bin/winxed
13include/parrot/${PKGVERSION}/imcc/api.h 13include/parrot/${PKGVERSION}/imcc/api.h
14include/parrot/${PKGVERSION}/imcc/embed.h 14include/parrot/${PKGVERSION}/imcc/embed.h
@@ -183,26 +183,27 @@ include/parrot/${PKGVERSION}/pmc/pmc_unm @@ -183,26 +183,27 @@ include/parrot/${PKGVERSION}/pmc/pmc_unm
183lib/libparrot.a 183lib/libparrot.a
184lib/parrot/${PKGVERSION}/VERSION 184lib/parrot/${PKGVERSION}/VERSION
185lib/parrot/${PKGVERSION}/bin/prove.pir 185lib/parrot/${PKGVERSION}/bin/prove.pir
186lib/parrot/${PKGVERSION}/dynext/bit_ops.so 186lib/parrot/${PKGVERSION}/dynext/bit_ops.so
187lib/parrot/${PKGVERSION}/dynext/debug_ops.so 187lib/parrot/${PKGVERSION}/dynext/debug_ops.so
188lib/parrot/${PKGVERSION}/dynext/dynlexpad.so 188lib/parrot/${PKGVERSION}/dynext/dynlexpad.so
189lib/parrot/${PKGVERSION}/dynext/file.so 189lib/parrot/${PKGVERSION}/dynext/file.so
190lib/parrot/${PKGVERSION}/dynext/gziphandle.so 190lib/parrot/${PKGVERSION}/dynext/gziphandle.so
191lib/parrot/${PKGVERSION}/dynext/io_ops.so 191lib/parrot/${PKGVERSION}/dynext/io_ops.so
192lib/parrot/${PKGVERSION}/dynext/math_ops.so 192lib/parrot/${PKGVERSION}/dynext/math_ops.so
193lib/parrot/${PKGVERSION}/dynext/obscure_ops.so 193lib/parrot/${PKGVERSION}/dynext/obscure_ops.so
194lib/parrot/${PKGVERSION}/dynext/os.so 194lib/parrot/${PKGVERSION}/dynext/os.so
195lib/parrot/${PKGVERSION}/dynext/rational.so 195lib/parrot/${PKGVERSION}/dynext/rational.so
 196lib/parrot/${PKGVERSION}/dynext/select.so
196lib/parrot/${PKGVERSION}/dynext/sys_ops.so 197lib/parrot/${PKGVERSION}/dynext/sys_ops.so
197lib/parrot/${PKGVERSION}/dynext/trans_ops.so 198lib/parrot/${PKGVERSION}/dynext/trans_ops.so
198lib/parrot/${PKGVERSION}/include/call_bits.pasm 199lib/parrot/${PKGVERSION}/include/call_bits.pasm
199lib/parrot/${PKGVERSION}/include/cclass.pasm 200lib/parrot/${PKGVERSION}/include/cclass.pasm
200lib/parrot/${PKGVERSION}/include/config.fpmc 201lib/parrot/${PKGVERSION}/include/config.fpmc
201lib/parrot/${PKGVERSION}/include/datatypes.pasm 202lib/parrot/${PKGVERSION}/include/datatypes.pasm
202lib/parrot/${PKGVERSION}/include/dlopenflags.pasm 203lib/parrot/${PKGVERSION}/include/dlopenflags.pasm
203lib/parrot/${PKGVERSION}/include/errors.pasm 204lib/parrot/${PKGVERSION}/include/errors.pasm
204lib/parrot/${PKGVERSION}/include/except_severity.pasm 205lib/parrot/${PKGVERSION}/include/except_severity.pasm
205lib/parrot/${PKGVERSION}/include/except_types.pasm 206lib/parrot/${PKGVERSION}/include/except_types.pasm
206lib/parrot/${PKGVERSION}/include/fp_equality.pasm 207lib/parrot/${PKGVERSION}/include/fp_equality.pasm
207lib/parrot/${PKGVERSION}/include/hash_key_type.pasm 208lib/parrot/${PKGVERSION}/include/hash_key_type.pasm
208lib/parrot/${PKGVERSION}/include/hllmacros.pir 209lib/parrot/${PKGVERSION}/include/hllmacros.pir
@@ -431,27 +432,26 @@ lib/parrot/${PKGVERSION}/library/nqp-rx. @@ -431,27 +432,26 @@ lib/parrot/${PKGVERSION}/library/nqp-rx.
431lib/parrot/${PKGVERSION}/library/nqp-setting.pbc 432lib/parrot/${PKGVERSION}/library/nqp-setting.pbc
432lib/parrot/${PKGVERSION}/library/openssl.declarations 433lib/parrot/${PKGVERSION}/library/openssl.declarations
433lib/parrot/${PKGVERSION}/library/opsc.pbc 434lib/parrot/${PKGVERSION}/library/opsc.pbc
434lib/parrot/${PKGVERSION}/library/osutils.pbc 435lib/parrot/${PKGVERSION}/library/osutils.pbc
435lib/parrot/${PKGVERSION}/library/osutils.pir 436lib/parrot/${PKGVERSION}/library/osutils.pir
436lib/parrot/${PKGVERSION}/library/parrotlib.pbc 437lib/parrot/${PKGVERSION}/library/parrotlib.pbc
437lib/parrot/${PKGVERSION}/library/parrotlib.pir 438lib/parrot/${PKGVERSION}/library/parrotlib.pir
438lib/parrot/${PKGVERSION}/library/pcore.pbc 439lib/parrot/${PKGVERSION}/library/pcore.pbc
439lib/parrot/${PKGVERSION}/library/pcore.pir 440lib/parrot/${PKGVERSION}/library/pcore.pir
440lib/parrot/${PKGVERSION}/library/pcre.pbc 441lib/parrot/${PKGVERSION}/library/pcre.pbc
441lib/parrot/${PKGVERSION}/library/pcre.pir 442lib/parrot/${PKGVERSION}/library/pcre.pir
442lib/parrot/${PKGVERSION}/library/postgres.declarations 443lib/parrot/${PKGVERSION}/library/postgres.declarations
443lib/parrot/${PKGVERSION}/library/postgres.pir 444lib/parrot/${PKGVERSION}/library/postgres.pir
444lib/parrot/${PKGVERSION}/library/random_lib.pir 
445lib/parrot/${PKGVERSION}/library/uuid.pbc 445lib/parrot/${PKGVERSION}/library/uuid.pbc
446lib/parrot/${PKGVERSION}/library/uuid.pir 446lib/parrot/${PKGVERSION}/library/uuid.pir
447lib/parrot/${PKGVERSION}/library/yaml_dumper.pir 447lib/parrot/${PKGVERSION}/library/yaml_dumper.pir
448lib/parrot/${PKGVERSION}/parrot_config.o 448lib/parrot/${PKGVERSION}/parrot_config.o
449lib/parrot/${PKGVERSION}/tools/build/ops2c.pl 449lib/parrot/${PKGVERSION}/tools/build/ops2c.pl
450lib/parrot/${PKGVERSION}/tools/build/pmc2c.pl 450lib/parrot/${PKGVERSION}/tools/build/pmc2c.pl
451lib/parrot/${PKGVERSION}/tools/dev/create_language.pl 451lib/parrot/${PKGVERSION}/tools/dev/create_language.pl
452lib/parrot/${PKGVERSION}/tools/dev/gen_makefile.pl 452lib/parrot/${PKGVERSION}/tools/dev/gen_makefile.pl
453lib/parrot/${PKGVERSION}/tools/dev/mk_language_shell.pl 453lib/parrot/${PKGVERSION}/tools/dev/mk_language_shell.pl
454lib/parrot/${PKGVERSION}/tools/dev/pbc_to_exe.pir 454lib/parrot/${PKGVERSION}/tools/dev/pbc_to_exe.pir
455lib/parrot/${PKGVERSION}/tools/dev/pprof2cg.pl 455lib/parrot/${PKGVERSION}/tools/dev/pprof2cg.pl
456lib/parrot/${PKGVERSION}/tools/dev/reconfigure.pl 456lib/parrot/${PKGVERSION}/tools/dev/reconfigure.pl
457lib/parrot/${PKGVERSION}/tools/lib/File/Which.pm 457lib/parrot/${PKGVERSION}/tools/lib/File/Which.pm
@@ -531,36 +531,34 @@ lib/parrot/${PKGVERSION}/tools/lib/Parro @@ -531,36 +531,34 @@ lib/parrot/${PKGVERSION}/tools/lib/Parro
531lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/PMC/PrintTree.pm 531lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/PMC/PrintTree.pm
532lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/PMC/RO.pm 532lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/PMC/RO.pm
533lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/PMC/default.pm 533lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/PMC/default.pm
534lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/Parser.pm 534lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/Parser.pm
535lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/Pmc2cMain.pm 535lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/Pmc2cMain.pm
536lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/UtilFunctions.pm 536lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/UtilFunctions.pm
537lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/VTable.pm 537lib/parrot/${PKGVERSION}/tools/lib/Parrot/Pmc2c/VTable.pm
538lib/parrot/${PKGVERSION}/tools/lib/Parrot/Revision.pm 538lib/parrot/${PKGVERSION}/tools/lib/Parrot/Revision.pm
539lib/parrot/${PKGVERSION}/tools/lib/Parrot/SHA1.pm 539lib/parrot/${PKGVERSION}/tools/lib/Parrot/SHA1.pm
540lib/parrot/${PKGVERSION}/tools/lib/Parrot/SearchOps.pm 540lib/parrot/${PKGVERSION}/tools/lib/Parrot/SearchOps.pm
541lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test.pm 541lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test.pm
542lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Harness.pm 542lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Harness.pm
543lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/PGE.pm 543lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/PGE.pm
544lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/PIR_PGE.pm 
545lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Pod.pm 544lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Pod.pm
546lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Pod/Utils.pm 545lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Pod/Utils.pm
547lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Util.pm 546lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Util.pm
548lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Util/Runloop.pm 547lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Util/Runloop.pm
549lib/parrot/${PKGVERSION}/tools/lib/Parrot/Vtable.pm 548lib/parrot/${PKGVERSION}/tools/lib/Parrot/Vtable.pm
550share/doc/parrot/${PKGVERSION}/CREDITS 549share/doc/parrot/${PKGVERSION}/CREDITS
551share/doc/parrot/${PKGVERSION}/DONORS.pod 550share/doc/parrot/${PKGVERSION}/DONORS.pod
552share/doc/parrot/${PKGVERSION}/LICENSE 551share/doc/parrot/${PKGVERSION}/LICENSE
553share/doc/parrot/${PKGVERSION}/NEWS 
554share/doc/parrot/${PKGVERSION}/PBC_COMPAT 552share/doc/parrot/${PKGVERSION}/PBC_COMPAT
555share/doc/parrot/${PKGVERSION}/PLATFORMS 553share/doc/parrot/${PKGVERSION}/PLATFORMS
556share/doc/parrot/${PKGVERSION}/README 554share/doc/parrot/${PKGVERSION}/README
557share/doc/parrot/${PKGVERSION}/README_cygwin.pod 555share/doc/parrot/${PKGVERSION}/README_cygwin.pod
558share/doc/parrot/${PKGVERSION}/README_win32.pod 556share/doc/parrot/${PKGVERSION}/README_win32.pod
559share/doc/parrot/${PKGVERSION}/RESPONSIBLE_PARTIES 557share/doc/parrot/${PKGVERSION}/RESPONSIBLE_PARTIES
560share/doc/parrot/${PKGVERSION}/TODO 558share/doc/parrot/${PKGVERSION}/TODO
561src/parrot/${PKGVERSION}/pmc/addrregistry.dump 559src/parrot/${PKGVERSION}/pmc/addrregistry.dump
562src/parrot/${PKGVERSION}/pmc/arrayiterator.dump 560src/parrot/${PKGVERSION}/pmc/arrayiterator.dump
563src/parrot/${PKGVERSION}/pmc/bigint.dump 561src/parrot/${PKGVERSION}/pmc/bigint.dump
564src/parrot/${PKGVERSION}/pmc/bignum.dump 562src/parrot/${PKGVERSION}/pmc/bignum.dump
565src/parrot/${PKGVERSION}/pmc/boolean.dump 563src/parrot/${PKGVERSION}/pmc/boolean.dump
566src/parrot/${PKGVERSION}/pmc/bytebuffer.dump 564src/parrot/${PKGVERSION}/pmc/bytebuffer.dump