Index: head/archivers/par2cmdline/Makefile =================================================================== --- head/archivers/par2cmdline/Makefile (revision 545298) +++ head/archivers/par2cmdline/Makefile (revision 545299) @@ -1,28 +1,42 @@ # Created by: Chris Larsen # $FreeBSD$ PORTNAME= par2cmdline -PORTVERSION= 0.4 -PORTREVISION= 4 +PORTVERSION= 0.8.1 +DISTVERSIONPREFIX= v CATEGORIES= archivers -MASTER_SITES= SF/parchive/${PORTNAME}/${PORTVERSION} MAINTAINER= martymac@FreeBSD.org COMMENT= Tools for using Parity v2 Archive files LICENSE= GPLv2 +USES= autoreconf GNU_CONFIGURE= yes +USE_GITHUB= yes +GH_ACCOUNT= Parchive +GH_PROJECT= par2cmdline + PORTDOCS= README CONFLICTS= par2cmdline-tbb-[0-9]* -PLIST_FILES= bin/par2 bin/par2create bin/par2repair bin/par2verify +PLIST_FILES= bin/par2 bin/par2create bin/par2repair bin/par2verify man/man1/par2.1.gz OPTIONS_DEFINE= DOCS +TEST_TARGET= check + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.include +.include + +.if ${ARCH} == i386 +# ld: error: undefined symbol: __atomic_load +# See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230888 +USE_GCC= yes +.endif + +.include Index: head/archivers/par2cmdline/distinfo =================================================================== --- head/archivers/par2cmdline/distinfo (revision 545298) +++ head/archivers/par2cmdline/distinfo (revision 545299) @@ -1,2 +1,3 @@ -SHA256 (par2cmdline-0.4.tar.gz) = 9e32b7dbcf7bca8249f98824757d4868714156fe2276516504cd26f736e9f677 -SIZE (par2cmdline-0.4.tar.gz) = 239312 +TIMESTAMP = 1597610346 +SHA256 (Parchive-par2cmdline-v0.8.1_GH0.tar.gz) = 529f85857ec44e501cd8d95b0c8caf47477d7daa5bfb989e422c800bb71b689a +SIZE (Parchive-par2cmdline-v0.8.1_GH0.tar.gz) = 3581759 Index: head/archivers/par2cmdline/files/patch-par2fileformat.h =================================================================== --- head/archivers/par2cmdline/files/patch-par2fileformat.h (revision 545298) +++ head/archivers/par2cmdline/files/patch-par2fileformat.h (nonexistent) @@ -1,11 +0,0 @@ ---- par2fileformat.h.orig 2003-08-01 23:43:40 UTC -+++ par2fileformat.h -@@ -84,7 +84,7 @@ struct FILEVERIFICATIONPACKET - PACKET_HEADER header; - // Body - MD5Hash fileid; // MD5hash of file_hash_16k, file_length, file_name -- FILEVERIFICATIONENTRY entries[]; -+ FILEVERIFICATIONENTRY entries[0]; - } PACKED; - - // The file description packet is used to record the name of the file, Property changes on: head/archivers/par2cmdline/files/patch-par2fileformat.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp =================================================================== --- head/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp (revision 545298) +++ head/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- par2creatorsourcefile.cpp.orig 2004-04-15 13:45:23 UTC -+++ par2creatorsourcefile.cpp -@@ -224,6 +224,10 @@ bool Par2CreatorSourceFile::Open(Command - cout << newfraction/10 << '.' << newfraction%10 << "%\r" << flush; - } - } -+ else -+ { -+ offset += want; -+ } - } - - // Did we finish the last block Property changes on: head/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/par2cmdline/files/patch-reedsolomon.cpp =================================================================== --- head/archivers/par2cmdline/files/patch-reedsolomon.cpp (revision 545298) +++ head/archivers/par2cmdline/files/patch-reedsolomon.cpp (nonexistent) @@ -1,56 +0,0 @@ ---- reedsolomon.cpp.orig 2003-05-26 18:01:31 UTC -+++ reedsolomon.cpp -@@ -51,7 +51,7 @@ u32 gcd(u32 a, u32 b) - } - } - --bool ReedSolomon::SetInput(const vector &present) -+template<> bool ReedSolomon::SetInput(const vector &present) - { - inputcount = (u32)present.size(); - -@@ -80,7 +80,7 @@ bool ReedSolomon::SetInput(cons - return true; - } - --bool ReedSolomon::SetInput(u32 count) -+template<> bool ReedSolomon::SetInput(u32 count) - { - inputcount = count; - -@@ -101,7 +101,7 @@ bool ReedSolomon::SetInput(u32 - return true; - } - --bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) -+template<> bool ReedSolomon::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::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::SetInput(const vector &present) -+template<> bool ReedSolomon::SetInput(const vector &present) - { - inputcount = (u32)present.size(); - -@@ -233,7 +233,7 @@ bool ReedSolomon::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::SetInput(u32 count) -+template<> bool ReedSolomon::SetInput(u32 count) - { - inputcount = count; - -@@ -267,7 +267,7 @@ bool ReedSolomon::SetInput(u32 - return true; - } - --bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) -+template<> bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) - { - // Look up the appropriate element in the RS matrix - Property changes on: head/archivers/par2cmdline/files/patch-reedsolomon.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/par2cmdline/files/patch-Makefile.am =================================================================== --- head/archivers/par2cmdline/files/patch-Makefile.am (nonexistent) +++ head/archivers/par2cmdline/files/patch-Makefile.am (revision 545299) @@ -0,0 +1,21 @@ +Install relative symlinks instead of absolute ones. + +This is useful when installing into a staging directory to avoid getting links +temporarily pointing out of that directory. + +--- Makefile.am.orig 2020-02-09 14:53:55 UTC ++++ Makefile.am +@@ -168,9 +168,10 @@ TESTS = tests/test1 \ + tests/unit_tests + + install-exec-hook : +- ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT) +- ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT) +- ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT) ++ cd $(DESTDIR)$(bindir)/ && \ ++ ln -sf par2$(EXEEXT) par2create$(EXEEXT) && \ ++ ln -sf par2$(EXEEXT) par2verify$(EXEEXT) && \ ++ ln -sf par2$(EXEEXT) par2repair$(EXEEXT) + + uninstall-hook : + rm -f $(DESTDIR)$(bindir)/par2create$(EXEEXT) Property changes on: head/archivers/par2cmdline/files/patch-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/par2cmdline/pkg-descr =================================================================== --- head/archivers/par2cmdline/pkg-descr (revision 545298) +++ head/archivers/par2cmdline/pkg-descr (revision 545299) @@ -1,7 +1,13 @@ Parity v2 Archive create/verify/recover -par2cmdline is a program for creating and using PAR2 files to detect -damage in data files and repair them if necessary. It can be used with -any kind of file. Par files are especially popular on Usenet. +par2cmdline is a program for creating and using PAR2 files to detect damage in +data files and repair them if necessary. It can be used with any kind of file. +Par files are especially popular on Usenet. -WWW: http://parchive.sourceforge.net/ +OpenMP multithreading was originally developed by Jussi Kansanen: +https://github.com/jkansanen/par2cmdline-mt +The original development was done on Sourceforge but stalled. For more +information from the original authors see: +http://parchive.sourceforge.net + +WWW: https://github.com/Parchive/par2cmdline