[21245] trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jan 15 13:46:02 PST 2007
Revision: 21245
http://trac.macosforge.org/projects/macports/changeset/21245
Author: mgrimes at macports.org
Date: 2007-01-15 13:46:01 -0800 (Mon, 15 Jan 2007)
Log Message:
-----------
Now compiles and runs on Intel-based Macs. Additionally cleaned up patches per portstyle(7).
Update tested on both Intel and PPC systems. Closes tickets #7269 and #11068.
Modified Paths:
--------------
trunk/dports/archivers/par2/Portfile
Added Paths:
-----------
trunk/dports/archivers/par2/files/patch-commandline_cpp
trunk/dports/archivers/par2/files/patch-par2repairer_cpp
trunk/dports/archivers/par2/files/patch-reedsolomon_cpp
Removed Paths:
-------------
trunk/dports/archivers/par2/files/stricmp-define.patch
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21292
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
f2dd1c64-7982-4318-98ce-263798263e0a:/local:21203
+ 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21307
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
f2dd1c64-7982-4318-98ce-263798263e0a:/local:21203
Modified: trunk/dports/archivers/par2/Portfile
===================================================================
--- trunk/dports/archivers/par2/Portfile 2007-01-15 19:56:16 UTC (rev 21244)
+++ trunk/dports/archivers/par2/Portfile 2007-01-15 21:46:01 UTC (rev 21245)
@@ -1,26 +1,31 @@
# $Id$
-PortSystem 1.0
-name par2
-version 0.4
-description Parchive: Parity Archive Volume Set for data recovery
-long_description Parchive takes .par files and can regenerate missing data \
- based upon a Reed-Soloman Code. This is useful for restoring \
- missing pieces of a multi-part archive like the kinds used \
- on Usenet. Version 2 does not require like-sized pieces, \
- so it is useful for many more kinds of data recovery.
-maintainers julian at jabber.org
-categories archivers
-platforms darwin
-homepage http://parchive.sourceforge.net/
-master_sites sourceforge:parchive
-checksums md5 1551b63e57e3c232254dc62073b723a9
-distname par2cmdline-${version}
-patchfiles stricmp-define.patch
-configure.args --mandir=${prefix}/share/man
-configure.env CPPFLAGS="-L${prefix}/lib -I${prefix}/include" \
- CFLAGS="-no-cpp-precomp -flat_namespace -undefined suppress"
+PortSystem 1.0
+name par2
+version 0.4
+description Parchive: Parity Archive Volume Set for data recovery
+long_description Parchive takes .par files and can regenerate missing data \
+ based upon a Reed-Soloman Code. This is useful for \
+ restoring missing pieces of a multi-part archive like the \
+ kinds used on Usenet. Version 2 does not require \
+ like-sized pieces, so it is useful for many more kinds of \
+ data recovery.
+maintainers julian at jabber.org
+categories archivers
+platforms darwin
+homepage http://parchive.sourceforge.net/
+master_sites sourceforge:parchive
+checksums md5 1551b63e57e3c232254dc62073b723a9
+distname par2cmdline-${version}
+patchfiles patch-commandline_cpp patch-par2repairer_cpp
+configure.args --mandir=${prefix}/share/man
+configure.env CPPFLAGS="-L${prefix}/lib -I${prefix}/include" \
+ CFLAGS="-no-cpp-precomp -flat_namespace -undefined suppress"
-platform darwin 8 {
+platform darwin 8 powerpc {
configure.env-append CC=/usr/bin/gcc-3.3 CXX=/usr/bin/g++-3.3
}
+
+platform darwin 8 i386 {
+ patchfiles ${patchfiles} patch-reedsolomon_cpp
+}
Copied: trunk/dports/archivers/par2/files/patch-commandline_cpp (from rev 20960, trunk/dports/archivers/par2/files/stricmp-define.patch)
===================================================================
--- trunk/dports/archivers/par2/files/patch-commandline_cpp (rev 0)
+++ trunk/dports/archivers/par2/files/patch-commandline_cpp 2007-01-15 21:46:01 UTC (rev 21245)
@@ -0,0 +1,11 @@
+--- commandline.cpp~ Tue Jun 24 09:11:02 2003
++++ commandline.cpp Tue Nov 4 19:28:09 2003
+@@ -27,6 +27,8 @@
+ #endif
+ #endif
+
++#define stricmp(s1,s2) strcasecmp(s1,s2)
++
+ CommandLine::ExtraFile::ExtraFile(void)
+ : filename()
+ , filesize(0)
Added: trunk/dports/archivers/par2/files/patch-par2repairer_cpp
===================================================================
--- trunk/dports/archivers/par2/files/patch-par2repairer_cpp (rev 0)
+++ trunk/dports/archivers/par2/files/patch-par2repairer_cpp 2007-01-15 21:46:01 UTC (rev 21245)
@@ -0,0 +1,11 @@
+--- par2repairer.cpp~ Mon May 26 14:01:26 2003
++++ par2repairer.cpp Tue Nov 4 19:38:53 2003
+@@ -27,6 +27,8 @@
+ #endif
+ #endif
+
++#define stricmp(s1,s2) strcasecmp(s1,s2)
++
+ Par2Repairer::Par2Repairer(void)
+ {
+ firstpacket = true;
Added: trunk/dports/archivers/par2/files/patch-reedsolomon_cpp
===================================================================
--- trunk/dports/archivers/par2/files/patch-reedsolomon_cpp (rev 0)
+++ trunk/dports/archivers/par2/files/patch-reedsolomon_cpp 2007-01-15 21:46:01 UTC (rev 21245)
@@ -0,0 +1,56 @@
+--- reedsolomon.cpp.orig 2007-01-15 09:15:27.000000000 -0800
++++ reedsolomon.cpp 2007-01-15 09:19:46.000000000 -0800
+@@ -51,7 +51,7 @@ u32 gcd(u32 a, u32 b)
+ }
+ }
+
+-bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
++template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
+ {
+ inputcount = (u32)present.size();
+
+@@ -80,7 +80,7 @@ bool ReedSolomon<Galois8>::SetInput(cons
+ return true;
+ }
+
+-bool ReedSolomon<Galois8>::SetInput(u32 count)
++template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
+ {
+ inputcount = count;
+
+@@ -101,7 +101,7 @@ bool ReedSolomon<Galois8>::SetInput(u32
+ return true;
+ }
+
+-bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
++template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
+ {
+ // Look up the appropriate element in the RS matrix
+ Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex];
+@@ -189,7 +189,7 @@ bool ReedSolomon<Galois8>::Process(size_
+
+ // Set which of the source files are present and which are missing
+ // and compute the base values to use for the vandermonde matrix.
+-bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
++template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
+ {
+ inputcount = (u32)present.size();
+
+@@ -233,7 +233,7 @@ bool ReedSolomon<Galois16>::SetInput(con
+
+ // Record that the specified number of source files are all present
+ // and compute the base values to use for the vandermonde matrix.
+-bool ReedSolomon<Galois16>::SetInput(u32 count)
++template <> bool ReedSolomon<Galois16>::SetInput(u32 count)
+ {
+ inputcount = count;
+
+@@ -267,7 +267,7 @@ bool ReedSolomon<Galois16>::SetInput(u32
+ return true;
+ }
+
+-bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
++template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
+ {
+ // Look up the appropriate element in the RS matrix
+
Deleted: trunk/dports/archivers/par2/files/stricmp-define.patch
===================================================================
--- trunk/dports/archivers/par2/files/stricmp-define.patch 2007-01-15 19:56:16 UTC (rev 21244)
+++ trunk/dports/archivers/par2/files/stricmp-define.patch 2007-01-15 21:46:01 UTC (rev 21245)
@@ -1,22 +0,0 @@
---- commandline.cpp~ Tue Jun 24 09:11:02 2003
-+++ commandline.cpp Tue Nov 4 19:28:09 2003
-@@ -27,6 +27,8 @@
- #endif
- #endif
-
-+#define stricmp(s1,s2) strcasecmp(s1,s2)
-+
- CommandLine::ExtraFile::ExtraFile(void)
- : filename()
- , filesize(0)
---- par2repairer.cpp~ Mon May 26 14:01:26 2003
-+++ par2repairer.cpp Tue Nov 4 19:38:53 2003
-@@ -27,6 +27,8 @@
- #endif
- #endif
-
-+#define stricmp(s1,s2) strcasecmp(s1,s2)
-+
- Par2Repairer::Par2Repairer(void)
- {
- firstpacket = true;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070115/4cffb580/attachment.html
More information about the macports-changes
mailing list