pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Use a more correct patch from upstream.

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%NetBSD.org@localhost>
Pushed By:	bsiegert
Date:		Mon Dec 28 15:04:43 2015 +0100
Changeset:	0e4223a12598c80588e73cb4560a11458b97e6fb

Modified Files:
	rakudo/Makefile
	rakudo/PLIST
	rakudo/distinfo
Added Files:
	rakudo/patches/patch-tools_build_Makefile-Moar.in
	rakudo/patches/patch-tools_build_install-core-dist.pl
Removed Files:
	rakudo/patches/patch-src_core_CompUnit_Repository_Installation.pm

Log Message:
Use a more correct patch from upstream.

Also remove precomp files from the package, as their hashes change
every time the package is rebuilt.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0e4223a12598c80588e73cb4560a11458b97e6fb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rakudo/Makefile                                         | 10 ++++------
 rakudo/PLIST                                            | 17 +++++++++--------
 rakudo/distinfo                                         |  3 ++-
 .../patch-src_core_CompUnit_Repository_Installation.pm  | 15 ---------------
 rakudo/patches/patch-tools_build_Makefile-Moar.in       | 15 +++++++++++++++
 rakudo/patches/patch-tools_build_install-core-dist.pl   | 16 ++++++++++++++++
 6 files changed, 46 insertions(+), 30 deletions(-)

diffs:
diff --git a/rakudo/Makefile b/rakudo/Makefile
index 9f0d359..78f7612 100644
--- a/rakudo/Makefile
+++ b/rakudo/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.9 2015/10/10 01:57:53 ryoon Exp $
 
 DISTNAME=	rakudo-2015.12
+PKGREVISION=	1
 CATEGORIES=	lang perl6
 MASTER_SITES=	http://rakudo.org/downloads/rakudo/
 
@@ -11,20 +12,17 @@ LICENSE=	artistic-2.0
 
 MAKE_JOBS_SAFE=	no
 
-.include "../../mk/bsd.prefs.mk"
-
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		perl gmake
-PLIST_SRC+=		${PLIST_SRC_DFLT}
-.if (${OPSYS} != "Darwin")
-PLIST_SRC+=		PLIST.shared
-.endif
 
 HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${PERL5}
 CONFIGURE_SCRIPT=	Configure.pl
 CONFIGURE_ARGS=		--prefix=${PREFIX:Q} --backends=moar
 
+post-install:
+	${RM} -rf ${DESTDIR}${PREFIX}/share/perl6/precomp/*
+
 .include "../../wip/MoarVM/buildlink3.mk"
 .include "../../wip/nqp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/rakudo/PLIST b/rakudo/PLIST
index 3cf8a00..053a0cd 100644
--- a/rakudo/PLIST
+++ b/rakudo/PLIST
@@ -15,6 +15,7 @@ share/nqp/lib/Perl6/Optimizer.moarvm
 share/nqp/lib/Perl6/Pod.moarvm
 share/nqp/lib/Perl6/World.moarvm
 share/perl6/dist/3FD70CCCD6914FAEC84AFAE6F97AF461A3EE1588
+share/perl6/precomp/.lock
 share/perl6/repo.lock
 share/perl6/runtime/CORE.setting.moarvm
 share/perl6/runtime/RESTRICTED.setting.moarvm
@@ -29,11 +30,11 @@ share/perl6/short/640AB2BAE07BEDC4C163F679A746F7AB7FB5D1FA
 share/perl6/short/6B7A1AECF02807F30DDAD99C02C34440CA036AF6
 share/perl6/short/B879776A8AE66092E34488CFD4956F8700BDB9DD
 share/perl6/short/F6FD7A4346B3BB0E3124991926D729836808DA54
-share/perl6/sources/110A5AF7C5F3DD995D0172F8129704D458D2DE96
-share/perl6/sources/4F66E73BB5A560B0F3C240DBDAB98EF01C6B9A6D
-share/perl6/sources/5E15899A0DA02DC7DD789D67F1DB7F641F46F17F
-share/perl6/sources/65105D49F79A48B40A63EBE80BBF33BE38B79180
-share/perl6/sources/6B4F22FF5543746B2CD401B10F52E82F0C7EAF9F
-share/perl6/sources/6BBEA6F6CADB164998298C9C199A2BBD3B274FD1
-share/perl6/sources/F31640571C2C816343CDE72A9490EB9CECA6E427
-share/perl6/sources/FB2B85425BF916990BB5B3D70798E1673B5DF46A
+share/perl6/sources/234FBDC9163AC571722E9354D3165BE5ED439D09
+share/perl6/sources/31A82A0CFD41C66EE35588C0C02A1BDE45E30031
+share/perl6/sources/33488A0703F6FA4A045A7872BD926A0BB57D1D97
+share/perl6/sources/4047FCFDF1B71F5E939F5BBDF82FE62A379F71F7
+share/perl6/sources/93E5A4AC19C84C84E5C7BED9DCC123A87A1A1486
+share/perl6/sources/A1AA699D3331C26E060ADCE2AFF4D605EB23E0D3
+share/perl6/sources/D00828BC5A428CCF99E4D7AF87AFCD1ABCA6FC82
+share/perl6/sources/FF30B68A5FEC75A541C0A5566D779A5A604F8469
diff --git a/rakudo/distinfo b/rakudo/distinfo
index 7964a03..48c8328 100644
--- a/rakudo/distinfo
+++ b/rakudo/distinfo
@@ -4,4 +4,5 @@ SHA1 (rakudo-2015.12.tar.gz) = b425629ad7bf407d4e08564084e0fa63dcecec9d
 RMD160 (rakudo-2015.12.tar.gz) = d26d8b45375407f46872dfb5835152dcec623071
 SHA512 (rakudo-2015.12.tar.gz) = 48e4c98bbff67a52f68a835cc87a19a0b17f2d67790f8162ffd9f167f080d09180d375b5ea9a8577d1de5036c78e604473a2140107d448aff3630c138fd16114
 Size (rakudo-2015.12.tar.gz) = 2669528 bytes
-SHA1 (patch-src_core_CompUnit_Repository_Installation.pm) = 654e8a61ee10c029fbb15f290ff90d99fb5aa08c
+SHA1 (patch-tools_build_Makefile-Moar.in) = a2da23b50c54fa2619512cc41d3c3357b134738c
+SHA1 (patch-tools_build_install-core-dist.pl) = aeab5b43e097a2c1b461b576a1cddaeea660af08
diff --git a/rakudo/patches/patch-src_core_CompUnit_Repository_Installation.pm b/rakudo/patches/patch-src_core_CompUnit_Repository_Installation.pm
deleted file mode 100644
index 612ec22..0000000
--- a/rakudo/patches/patch-src_core_CompUnit_Repository_Installation.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- src/core/CompUnit/Repository/Installation.pm.orig	2015-12-25 19:23:19.000000000 +0000
-+++ src/core/CompUnit/Repository/Installation.pm
-@@ -6,6 +6,10 @@ class CompUnit::Repository::Installation
- 
-     submethod BUILD(:$!prefix, :$!lock, :$!WHICH, :$!next-repo) { }
- 
-+    method prefix {
-+	IO::Path.new(%*ENV<DESTDIR> ~ $!prefix)
-+    }
-+
-     method writeable-path {
-         $.prefix.w ?? $.prefix !! IO::Path;
-     }
diff --git a/rakudo/patches/patch-tools_build_Makefile-Moar.in b/rakudo/patches/patch-tools_build_Makefile-Moar.in
new file mode 100644
index 0000000..4acb4f9
--- /dev/null
+++ b/rakudo/patches/patch-tools_build_Makefile-Moar.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+DESTDIR support.
+https://github.com/flussence/rakudo/commit/fb00ed3d71f9407a776c82f03855d1242997878c
+--- tools/build/Makefile-Moar.in.orig	2015-12-25 19:23:19.000000000 +0000
++++ tools/build/Makefile-Moar.in
+@@ -246,7 +246,7 @@ m-install: m-all tools/build/create-moar
+ 	$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/resources
+ 	$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/bin
+ 	$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/short
+-	.@slash@$(M_RUNNER) tools/build/install-core-dist.pl
++	.@slash@$(M_RUNNER) tools/build/install-core-dist.pl $(DESTDIR)$(PERL6_LANG_DIR)
+ 	$(PERL) tools/build/create-moar-runner.pl "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-m "$(PERL6_LANG_DIR)/runtime" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"
+ 	$(PERL) tools/build/create-moar-runner.pl "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_LANG_DIR)/runtime" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"
+ 	$(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/perl6-m$(M_BAT)
diff --git a/rakudo/patches/patch-tools_build_install-core-dist.pl b/rakudo/patches/patch-tools_build_install-core-dist.pl
new file mode 100644
index 0000000..46810ae
--- /dev/null
+++ b/rakudo/patches/patch-tools_build_install-core-dist.pl
@@ -0,0 +1,16 @@
+$NetBSD$
+
+DESTDIR support.
+https://github.com/flussence/rakudo/commit/fb00ed3d71f9407a776c82f03855d1242997878c
+--- tools/build/install-core-dist.pl.orig	2015-12-25 19:23:19.000000000 +0000
++++ tools/build/install-core-dist.pl
+@@ -9,7 +9,8 @@ my %provides = 
+     "experimental"               => "lib/experimental.pm6",
+ ;
+ 
+-CompUnit::RepositoryRegistry.repository-for-name('perl').install(
++PROCESS::<$REPO> := CompUnit::RepositoryRegistry.repository-for-spec("inst#@*ARGS[0]");
++$*REPO.install(
+     Distribution.new(
+         name     => "CORE",
+         auth     => "perl",
Home | Main Index | Thread Index | Old Index