Add two patches for big-endian platforms from Fedora via gentoo and

Nick Coleman in PR 40658.

Bump PKGREVISION.
Set LICENSE.

4 files changed, 233 insertions, 2 deletions

diff --git a/archivers/par2/Makefile b/archivers/par2/Makefile
index ba7c59354e2..95bdb58bdaf 100644
--- a/archivers/par2/Makefile
+++ b/archivers/par2/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.13 2008/06/12 02:14:13 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/21 15:07:40 wiz Exp $
 #
 
 DISTNAME=		par2cmdline-0.4
 PKGNAME=		${DISTNAME:S/cmdline//}
+PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=parchive/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://parchive.sourceforge.net/
 COMMENT=		Create or use PAR2 parity volumes
+LICENSE=		gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/archivers/par2/distinfo b/archivers/par2/distinfo
index ae76826f4f6..8bfe2c91570 100644
--- a/archivers/par2/distinfo
+++ b/archivers/par2/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/06/21 18:47:02 minskim Exp $
+$NetBSD: distinfo,v 1.5 2010/02/21 15:07:40 wiz Exp $
 
 SHA1 (par2cmdline-0.4.tar.gz) = 2fcdc932b5d7b4b1c68c4a4ca855ca913d464d2f
 RMD160 (par2cmdline-0.4.tar.gz) = e98dc84fa7a4304b8d71c1d373fdce0bca1e6290
 Size (par2cmdline-0.4.tar.gz) = 239312 bytes
 SHA1 (patch-aa) = cb2cc7bb718cd003fea2afc1f278d5d8a46381e0
+SHA1 (patch-ab) = a00687c25aae48a9b684125cab9217bf2f1114fa
+SHA1 (patch-ac) = c8fe5a9cfa3183ad8e78d420fefb550c2dbbae2a
diff --git a/archivers/par2/patches/patch-ab b/archivers/par2/patches/patch-ab
new file mode 100644
index 00000000000..8c4d6cdf57d
--- /dev/null
+++ b/archivers/par2/patches/patch-ab
@@ -0,0 +1,153 @@
+$NetBSD: patch-ab,v 1.1 2010/02/21 15:07:40 wiz Exp $
+
+http://bugs.gentoo.org/show_bug.cgi?id=137092
+http://bugs.gentoo.org/attachment.cgi?id=91276&action=view
+
+--- letype.h.orig	2003-05-26 18:01:17.000000000 +0000
++++ letype.h
+@@ -28,44 +28,15 @@ typedef u64 leu64;
+ 
+ #else
+ 
+-class leu16
++struct leu16
+ {
+-public:
+-  leu16(void);
+-
+-  leu16(const leu16 &other);
+-  leu16& operator=(const leu16 &other);
+-
+-  leu16(const u16 &other);
+   leu16& operator=(const u16 &other);
+ 
+   operator u16(void) const;
+ 
+-protected:
+   u16 value;
+ };
+ 
+-inline leu16::leu16(void)
+-{
+-}
+-
+-inline leu16::leu16(const leu16 &other)
+-: value(other.value)
+-{
+-}
+-
+-inline leu16& leu16::operator =(const leu16 &other)
+-{
+-  value = other.value;
+-  return *this;
+-}
+-
+-inline leu16::leu16(const u16 &other)
+-{
+-  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+-  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
+-}
+-
+ inline leu16& leu16::operator=(const u16 &other)
+ {
+   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+@@ -81,46 +52,15 @@ inline leu16::operator u16(void) const
+ }
+ 
+ 
+-class leu32
++struct leu32
+ {
+-public:
+-  leu32(void);
+-
+-  leu32(const leu32 &other);
+-  leu32& operator=(const leu32 &other);
+-
+-  leu32(const u32 &other);
+   leu32& operator=(const u32 &other);
+ 
+   operator u32(void) const;
+ 
+-protected:
+   u32 value;
+ };
+ 
+-inline leu32::leu32(void)
+-{
+-}
+-
+-inline leu32::leu32(const leu32 &other)
+-: value(other.value)
+-{
+-}
+-
+-inline leu32& leu32::operator =(const leu32 &other)
+-{
+-  value = other.value;
+-  return *this;
+-}
+-
+-inline leu32::leu32(const u32 &other)
+-{
+-  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+-  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
+-  ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
+-  ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
+-}
+-
+ inline leu32& leu32::operator=(const u32 &other)
+ {
+   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+@@ -140,50 +80,15 @@ inline leu32::operator u32(void) const
+ }
+ 
+ 
+-class leu64
++struct leu64
+ {
+-public:
+-  leu64(void);
+-
+-  leu64(const leu64 &other);
+-  leu64& operator=(const leu64 &other);
+-
+-  leu64(const u64 &other);
+   leu64& operator=(const u64 &other);
+ 
+   operator u64(void) const;
+ 
+-protected:
+   u64 value;
+ };
+ 
+-inline leu64::leu64(void)
+-{
+-}
+-
+-inline leu64::leu64(const leu64 &other)
+-: value(other.value)
+-{
+-}
+-
+-inline leu64& leu64::operator =(const leu64 &other)
+-{
+-  value = other.value;
+-  return *this;
+-}
+-
+-inline leu64::leu64(const u64 &other)
+-{
+-  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+-  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
+-  ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
+-  ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
+-  ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff);
+-  ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff);
+-  ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff);
+-  ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff);
+-}
+-
+ inline leu64& leu64::operator=(const u64 &other)
+ {
+   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
diff --git a/archivers/par2/patches/patch-ac b/archivers/par2/patches/patch-ac
new file mode 100644
index 00000000000..a89c78d163f
--- /dev/null
+++ b/archivers/par2/patches/patch-ac
@@ -0,0 +1,74 @@
+$NetBSD: patch-ac,v 1.1 2010/02/21 15:07:40 wiz Exp $
+
+http://bugs.gentoo.org/show_bug.cgi?id=137092
+http://bugs.gentoo.org/attachment.cgi?id=91276&action=view
+
+--- md5.h.orig	2003-08-01 23:41:04.000000000 +0000
++++ md5.h
+@@ -20,6 +20,13 @@
+ #ifndef __MD5_H__
+ #define __MD5_H__
+ 
++#ifdef WIN32
++#pragma pack(push, 1)
++#define PACKED
++#else
++#define PACKED __attribute__ ((packed))
++#endif
++
+ // This file defines the MD5Hash and MD5Context objects which are used
+ // to compute and manipulate the MD5 Hash values for a block of data.
+ 
+@@ -35,12 +42,11 @@
+ 
+ // MD5 Hash value
+ 
+-class MD5Hash
+-{
+-public:
+-  // Constructor does not initialise the value
+-  MD5Hash(void) {};
++struct MD5Hash;
++ostream& operator<<(ostream &s, const MD5Hash &hash);
+ 
++struct MD5Hash
++{
+   // Comparison operators
+   bool operator==(const MD5Hash &other) const;
+   bool operator!=(const MD5Hash &other) const;
+@@ -54,13 +60,8 @@ public:
+   friend ostream& operator<<(ostream &s, const MD5Hash &hash);
+   string print(void) const;
+ 
+-  // Copy and assignment
+-  MD5Hash(const MD5Hash &other);
+-  MD5Hash& operator=(const MD5Hash &other);
+-
+-public:
+   u8 hash[16]; // 16 byte MD5 Hash value
+-};
++} PACKED;
+ 
+ // Intermediate computation state
+ 
+@@ -144,16 +145,9 @@ inline bool MD5Hash::operator<=(const MD
+   return !other.operator<(*this);
+ }
+ 
+-inline MD5Hash::MD5Hash(const MD5Hash &other)
+-{
+-  memcpy(&hash, &other.hash, sizeof(hash));
+-}
+-
+-inline MD5Hash& MD5Hash::operator=(const MD5Hash &other)
+-{
+-  memcpy(&hash, &other.hash, sizeof(hash));
+-
+-  return *this;
+-}
++#ifdef WIN32
++#pragma pack(pop)
++#endif
++#undef PACKED
+ 
+ #endif // __MD5_H__