pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/parrot Fix this so that it installs cleanly, by d...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ab2428806ec0
branches:  trunk
changeset: 595341:ab2428806ec0
user:      he <he%pkgsrc.org@localhost>
date:      Wed Nov 16 14:32:53 2011 +0000

description:
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.

diffstat:

 lang/parrot/Makefile |  26 +++++++++++++++++++++++++-
 lang/parrot/PLIST    |   6 ++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diffs (81 lines):

diff -r c947fc09bde8 -r ab2428806ec0 lang/parrot/Makefile
--- a/lang/parrot/Makefile      Wed Nov 16 11:16:12 2011 +0000
+++ b/lang/parrot/Makefile      Wed Nov 16 14:32:53 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2011/11/15 13:44:30 he Exp $
+# $NetBSD: Makefile,v 1.50 2011/11/16 14:32:53 he Exp $
 #
 
 VERSION=               3.8.0
@@ -59,6 +59,30 @@
 REPLACE.parrot.new=    ${PREFIX}/bin/parrot
 REPLACE_FILES.parrot+=         tools/dev/pbc_to_exe.pir
 
+REPLACE_INTERPRETER+=  parrot-nqp
+REPLACE.parrot-nqp.old=        .*parrot-nqp[^[:space:]]*
+REPLACE.parrot-nqp.new= ${PREFIX}/bin/parrot-nqp
+REPLACE_FILES.parrot-nqp+= compilers/data_json/JSON.nqp
+
+REPLACE_INTERPRETER+=  nqp
+REPLACE.nqp.old=       .*nqp[^[:space:]]*
+REPLACE.nqp.new=       ${PREFIX}/bin/parrot-nqp
+REPLACE_FILES.nqp+=    runtime/parrot/library/YAML/Tiny.pm
+
+# These have been reported to parrot, Git tracking issue #201
+CHECK_WRKREF_SKIP+=    bin/ops2c
+CHECK_WRKREF_SKIP+=    bin/parrot
+CHECK_WRKREF_SKIP+=    bin/parrot-nqp
+CHECK_WRKREF_SKIP+=    bin/parrot-prove
+CHECK_WRKREF_SKIP+=    bin/parrot_config
+CHECK_WRKREF_SKIP+=    bin/parrot_nci_thunk_gen
+CHECK_WRKREF_SKIP+=    bin/pbc_merge
+CHECK_WRKREF_SKIP+=    bin/pbc_to_exe
+CHECK_WRKREF_SKIP+=    bin/winxed
+CHECK_WRKREF_SKIP+=    lib/parrot/${PKGVERSION}/include/config.fpmc
+CHECK_WRKREF_SKIP+=    lib/parrot/${PKGVERSION}/parrot_config.o
+CHECK_WRKREF_SKIP+=    lib/parrot/${PKGVERSION}/tools/lib/Parrot/Config/Generated.pm
+
 # Does relink internally, so allow local rpath entries
 BUILDLINK_PASSTHRU_RPATHDIRS+= ${WRKSRC}
 
diff -r c947fc09bde8 -r ab2428806ec0 lang/parrot/PLIST
--- a/lang/parrot/PLIST Wed Nov 16 11:16:12 2011 +0000
+++ b/lang/parrot/PLIST Wed Nov 16 14:32:53 2011 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2011/08/26 08:30:30 he Exp $
+@comment $NetBSD: PLIST,v 1.28 2011/11/16 14:32:53 he Exp $
 bin/ops2c
 bin/parrot
 bin/parrot-nqp
@@ -193,6 +193,7 @@
 lib/parrot/${PKGVERSION}/dynext/obscure_ops.so
 lib/parrot/${PKGVERSION}/dynext/os.so
 lib/parrot/${PKGVERSION}/dynext/rational.so
+lib/parrot/${PKGVERSION}/dynext/select.so
 lib/parrot/${PKGVERSION}/dynext/sys_ops.so
 lib/parrot/${PKGVERSION}/dynext/trans_ops.so
 lib/parrot/${PKGVERSION}/include/call_bits.pasm
@@ -441,7 +442,6 @@
 lib/parrot/${PKGVERSION}/library/pcre.pir
 lib/parrot/${PKGVERSION}/library/postgres.declarations
 lib/parrot/${PKGVERSION}/library/postgres.pir
-lib/parrot/${PKGVERSION}/library/random_lib.pir
 lib/parrot/${PKGVERSION}/library/uuid.pbc
 lib/parrot/${PKGVERSION}/library/uuid.pir
 lib/parrot/${PKGVERSION}/library/yaml_dumper.pir
@@ -541,7 +541,6 @@
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Harness.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/PGE.pm
-lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/PIR_PGE.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Pod.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Pod/Utils.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Test/Util.pm
@@ -550,7 +549,6 @@
 share/doc/parrot/${PKGVERSION}/CREDITS
 share/doc/parrot/${PKGVERSION}/DONORS.pod
 share/doc/parrot/${PKGVERSION}/LICENSE
-share/doc/parrot/${PKGVERSION}/NEWS
 share/doc/parrot/${PKGVERSION}/PBC_COMPAT
 share/doc/parrot/${PKGVERSION}/PLATFORMS
 share/doc/parrot/${PKGVERSION}/README



Home | Main Index | Thread Index | Old Index