[69686] trunk/dports/perl/p5-math-pari

ricci at macports.org ricci at macports.org
Tue Jul 13 08:53:31 PDT 2010


Revision: 69686
          http://trac.macports.org/changeset/69686
Author:   ricci at macports.org
Date:     2010-07-13 08:53:27 -0700 (Tue, 13 Jul 2010)
Log Message:
-----------
fix patchfile names

Modified Paths:
--------------
    trunk/dports/perl/p5-math-pari/Portfile

Added Paths:
-----------
    trunk/dports/perl/p5-math-pari/files/patch-libPARI-Makefile.PL.diff
    trunk/dports/perl/p5-math-pari/files/patch-pari-2_1_7-src-kernel-ix86-level0.h.diff
    trunk/dports/perl/p5-math-pari/files/patch-utils-Math-PariBuild.pm.diff

Removed Paths:
-------------
    trunk/dports/perl/p5-math-pari/files/patch-pari-2-1-7_src_kernel_ix86_level0.h.diff
    trunk/dports/perl/p5-math-pari/files/patch_libPARI_Makefile.PL.diff
    trunk/dports/perl/p5-math-pari/files/patch_utils_Math_PariBuild.pm.diff

Modified: trunk/dports/perl/p5-math-pari/Portfile
===================================================================
--- trunk/dports/perl/p5-math-pari/Portfile	2010-07-13 15:23:13 UTC (rev 69685)
+++ trunk/dports/perl/p5-math-pari/Portfile	2010-07-13 15:53:27 UTC (rev 69686)
@@ -16,11 +16,12 @@
                     rmd160  05a9ea99adf21a1011c37d0fd4e5caa58b981150
 
 post-patch {
-	file copy ${filespath}/patch-pari-2-1-7_src_kernel_ix86_level0.h.diff ${worksrcpath}/patches/
+	file copy ${filespath}/patch-pari-2_1_7-src-kernel-ix86-level0.h.diff ${worksrcpath}/patches/
 }
 
 platform darwin 9 i386 {
-	patchfiles-append	patch_libPARI_Makefile.PL.diff	\
-				patch_utils_Math_PariBuild.pm.diff	\
+	patchfiles-append	\
+                patch-libPARI-Makefile.PL.diff  \
+                patch-utils-Math-PariBuild.pm.diff  \
 				patch-MANIFEST.diff
 }

Copied: trunk/dports/perl/p5-math-pari/files/patch-libPARI-Makefile.PL.diff (from rev 69667, trunk/dports/perl/p5-math-pari/files/patch_libPARI_Makefile.PL.diff)
===================================================================
--- trunk/dports/perl/p5-math-pari/files/patch-libPARI-Makefile.PL.diff	                        (rev 0)
+++ trunk/dports/perl/p5-math-pari/files/patch-libPARI-Makefile.PL.diff	2010-07-13 15:53:27 UTC (rev 69686)
@@ -0,0 +1,33 @@
+--- libPARI/Makefile.PL.orig	2009-11-06 19:21:40.000000000 -0800
++++ libPARI/Makefile.PL	2010-07-12 16:54:09.000000000 -0700
+@@ -120,7 +120,7 @@
+   if ($Config{osname} eq 'os2' and not $extra_inc =~ /os2(?!\S)/) {
+     # 2.1.3 does not include dlctl.h
+     $mycflags .= ' -DRTLD_LAZY=0 -DRTLD_GLOBAL=0';
+-    $inc .= ' -I $(PERL_INC)';
++    $inc .= ' -I$(PERL_INC)';
+   }
+ } elsif ($machine eq 'hppa') {
+   $mycflags="-Aa -DHPPA";	#$mycflags="-O -Aa -DHPPA";
+@@ -216,7 +216,7 @@
+ 		    CFG_CCCDLFLAGS => $Config{cccdlflags},
+ 		   },
+     DEFINE	=> $mycflags,
+-    INC		=> $extra_inc . ' -I $(PARI_DIR)/src/headers -I $(PARI_DIR)/src/graph -I .'
++    INC		=> $extra_inc . ' -I$(PARI_DIR)/src/headers -I$(PARI_DIR)/src/graph -I.'
+ 			. $inc,
+     C		=> \@cfiles,
+     SKIP	=> [qw( distclean test dist makeaperl xs_o static)],
+@@ -237,10 +237,10 @@
+   my $inlines = $inlines2[1];
+   $converted = <<EOC if $kernel{convert};
+ $kernel{converted1}: $kernel{file1} $kernel{header1}
+-	\$(CPP) -I . \$(INC) -I $kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file1} | perl -ne "s/%\\s+/%/g; print unless /^\\s*#/" > \$@
++	\$(CPP) -I. \$(INC) -I$kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file1} | perl -ne "s/%\\s+/%/g; s/##//g; print unless /^#/" > \$@
+ 
+ kernel2.s: $kernel{file2}
+-	\$(CPP) -I . \$(INC) -I $kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file2} | perl -ne "s/%\\s+/%/g; print unless /^\\s*#/" > \$@
++	\$(CPP) -I. \$(INC) -I$kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file2} | perl -ne "s/%\\s+/%/g; s/##//g; print unless /^#/" > \$@
+ 
+ EOC
+   my $create_mp = '';

Deleted: trunk/dports/perl/p5-math-pari/files/patch-pari-2-1-7_src_kernel_ix86_level0.h.diff
===================================================================
--- trunk/dports/perl/p5-math-pari/files/patch-pari-2-1-7_src_kernel_ix86_level0.h.diff	2010-07-13 15:23:13 UTC (rev 69685)
+++ trunk/dports/perl/p5-math-pari/files/patch-pari-2-1-7_src_kernel_ix86_level0.h.diff	2010-07-13 15:53:27 UTC (rev 69686)
@@ -1,16 +0,0 @@
---- ./src/kernel/ix86/level0.h.orig	2010-07-12 17:11:31.000000000 -0700
-+++ ./src/kernel/ix86/level0.h	2010-07-12 19:08:30.000000000 -0700
-@@ -21,6 +21,13 @@
- #define SAVE_OVERFLOW
- #define LOCAL_HIREMAINDER
- #define SAVE_HIREMAINDER
-+#define NEED_OVERFLOW_HIREMAINDER
-+
-+#ifdef NEED_OVERFLOW_HIREMAINDER
-+ulong overflow;
-+ulong hiremainder;
-+#endif	/* NEED_OVERFLOW_HIREMAINDER */
-+
- 
- BEGINEXTERN
- extern  ulong overflow;

Copied: trunk/dports/perl/p5-math-pari/files/patch-pari-2_1_7-src-kernel-ix86-level0.h.diff (from rev 69667, trunk/dports/perl/p5-math-pari/files/patch-pari-2-1-7_src_kernel_ix86_level0.h.diff)
===================================================================
--- trunk/dports/perl/p5-math-pari/files/patch-pari-2_1_7-src-kernel-ix86-level0.h.diff	                        (rev 0)
+++ trunk/dports/perl/p5-math-pari/files/patch-pari-2_1_7-src-kernel-ix86-level0.h.diff	2010-07-13 15:53:27 UTC (rev 69686)
@@ -0,0 +1,16 @@
+--- ./src/kernel/ix86/level0.h.orig	2010-07-12 17:11:31.000000000 -0700
++++ ./src/kernel/ix86/level0.h	2010-07-12 19:08:30.000000000 -0700
+@@ -21,6 +21,13 @@
+ #define SAVE_OVERFLOW
+ #define LOCAL_HIREMAINDER
+ #define SAVE_HIREMAINDER
++#define NEED_OVERFLOW_HIREMAINDER
++
++#ifdef NEED_OVERFLOW_HIREMAINDER
++ulong overflow;
++ulong hiremainder;
++#endif	/* NEED_OVERFLOW_HIREMAINDER */
++
+ 
+ BEGINEXTERN
+ extern  ulong overflow;

Copied: trunk/dports/perl/p5-math-pari/files/patch-utils-Math-PariBuild.pm.diff (from rev 69667, trunk/dports/perl/p5-math-pari/files/patch_utils_Math_PariBuild.pm.diff)
===================================================================
--- trunk/dports/perl/p5-math-pari/files/patch-utils-Math-PariBuild.pm.diff	                        (rev 0)
+++ trunk/dports/perl/p5-math-pari/files/patch-utils-Math-PariBuild.pm.diff	2010-07-13 15:53:27 UTC (rev 69686)
@@ -0,0 +1,19 @@
+--- utils/Math/PariBuild.pm.orig	2010-07-12 19:38:13.000000000 -0700
++++ utils/Math/PariBuild.pm	2010-07-12 19:37:54.000000000 -0700
+@@ -486,6 +486,7 @@
+ 			      'patches/diff_2.1.7_-O',
+ 			      'patches/diff_2.1.7_div',
+ 			      'patches/diff_2.1.6_align_power_of_2',
++			      'patches/patch-pari-2-1-7_src_kernel_ix86_level0.h.diff',
+ 			      'patches/diff_2.1.7_restart'],
+ 		);
+   print "Looking for patches for $v...\n";
+@@ -1317,7 +1318,7 @@
+ sub extra_includes {
+   my $pari_dir = shift;
+   # Some #include directives assume us inside $pari_dir/OARCH; replace by src
+-  return join ' -I ', '', grep -d, "$pari_dir/src/systems/$^O", "$pari_dir/src";
++  return join ' -I', '', grep -d, "$pari_dir/src/systems/$^O", "$pari_dir/src";
+ }
+ 
+ sub build_funclists_ourselves ($) {

Deleted: trunk/dports/perl/p5-math-pari/files/patch_libPARI_Makefile.PL.diff
===================================================================
--- trunk/dports/perl/p5-math-pari/files/patch_libPARI_Makefile.PL.diff	2010-07-13 15:23:13 UTC (rev 69685)
+++ trunk/dports/perl/p5-math-pari/files/patch_libPARI_Makefile.PL.diff	2010-07-13 15:53:27 UTC (rev 69686)
@@ -1,33 +0,0 @@
---- libPARI/Makefile.PL.orig	2009-11-06 19:21:40.000000000 -0800
-+++ libPARI/Makefile.PL	2010-07-12 16:54:09.000000000 -0700
-@@ -120,7 +120,7 @@
-   if ($Config{osname} eq 'os2' and not $extra_inc =~ /os2(?!\S)/) {
-     # 2.1.3 does not include dlctl.h
-     $mycflags .= ' -DRTLD_LAZY=0 -DRTLD_GLOBAL=0';
--    $inc .= ' -I $(PERL_INC)';
-+    $inc .= ' -I$(PERL_INC)';
-   }
- } elsif ($machine eq 'hppa') {
-   $mycflags="-Aa -DHPPA";	#$mycflags="-O -Aa -DHPPA";
-@@ -216,7 +216,7 @@
- 		    CFG_CCCDLFLAGS => $Config{cccdlflags},
- 		   },
-     DEFINE	=> $mycflags,
--    INC		=> $extra_inc . ' -I $(PARI_DIR)/src/headers -I $(PARI_DIR)/src/graph -I .'
-+    INC		=> $extra_inc . ' -I$(PARI_DIR)/src/headers -I$(PARI_DIR)/src/graph -I.'
- 			. $inc,
-     C		=> \@cfiles,
-     SKIP	=> [qw( distclean test dist makeaperl xs_o static)],
-@@ -237,10 +237,10 @@
-   my $inlines = $inlines2[1];
-   $converted = <<EOC if $kernel{convert};
- $kernel{converted1}: $kernel{file1} $kernel{header1}
--	\$(CPP) -I . \$(INC) -I $kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file1} | perl -ne "s/%\\s+/%/g; print unless /^\\s*#/" > \$@
-+	\$(CPP) -I. \$(INC) -I$kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file1} | perl -ne "s/%\\s+/%/g; s/##//g; print unless /^#/" > \$@
- 
- kernel2.s: $kernel{file2}
--	\$(CPP) -I . \$(INC) -I $kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file2} | perl -ne "s/%\\s+/%/g; print unless /^\\s*#/" > \$@
-+	\$(CPP) -I. \$(INC) -I$kernel{dir1} \$(DEFINE) \$(ASSCPPDEFINE) $kernel{file2} | perl -ne "s/%\\s+/%/g; s/##//g; print unless /^#/" > \$@
- 
- EOC
-   my $create_mp = '';

Deleted: trunk/dports/perl/p5-math-pari/files/patch_utils_Math_PariBuild.pm.diff
===================================================================
--- trunk/dports/perl/p5-math-pari/files/patch_utils_Math_PariBuild.pm.diff	2010-07-13 15:23:13 UTC (rev 69685)
+++ trunk/dports/perl/p5-math-pari/files/patch_utils_Math_PariBuild.pm.diff	2010-07-13 15:53:27 UTC (rev 69686)
@@ -1,19 +0,0 @@
---- utils/Math/PariBuild.pm.orig	2010-07-12 19:38:13.000000000 -0700
-+++ utils/Math/PariBuild.pm	2010-07-12 19:37:54.000000000 -0700
-@@ -486,6 +486,7 @@
- 			      'patches/diff_2.1.7_-O',
- 			      'patches/diff_2.1.7_div',
- 			      'patches/diff_2.1.6_align_power_of_2',
-+			      'patches/patch-pari-2-1-7_src_kernel_ix86_level0.h.diff',
- 			      'patches/diff_2.1.7_restart'],
- 		);
-   print "Looking for patches for $v...\n";
-@@ -1317,7 +1318,7 @@
- sub extra_includes {
-   my $pari_dir = shift;
-   # Some #include directives assume us inside $pari_dir/OARCH; replace by src
--  return join ' -I ', '', grep -d, "$pari_dir/src/systems/$^O", "$pari_dir/src";
-+  return join ' -I', '', grep -d, "$pari_dir/src/systems/$^O", "$pari_dir/src";
- }
- 
- sub build_funclists_ourselves ($) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100713/6099fe6a/attachment-0001.html>


More information about the macports-changes mailing list