Attachment #93621 for bug #131570




#

PORTNAME=	par2cmdline-tbb
PORTVERSION=	20090203
CATEGORIES=	archivers
MASTER_SITES=	http://chuchusoft.com/par2_tbb/
DISTNAME=	par2cmdline-0.4-tbb-${PORTVERSION}

MAINTAINER=	ganael.laplanche@martymac.com
COMMENT=	Tools for using Parity v2 Archive files (tbb version)

BUILD_DEPENDS=	${LOCALBASE}/lib/libtbb.so:${PORTSDIR}/devel/tbb
		${NONEXISTENT}:${PORTSDIR}/devel/tbb:extract

ONLY_FOR_ARCHS=	i386 amd64 ia64
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262
USE_GCC=	4.2+

PORTDOCS=	README
CONFLICTS=	par2cmdline-[0-9]*
PLIST_FILES=	bin/par2 bin/par2create bin/par2repair bin/par2verify

post-extract:
	@${CHMOD} u+x ${WRKSRC}/install-sh
post-configure:
	@${CP} ${TBBWRKSRC}/src/tbb/tbb_misc.h ${WRKSRC}/tbb_misc.h
	@${REINPLACE_CMD} -e 's|#include "tbb/tbb_misc\.h"|#include "tbb_misc.h"|' ${WRKSRC}/par2cmdline.h

post-install:
.if !defined(NOPORTDOCS)

Lines 1-3 Link Here

(-)par2cmdline-tbb/distinfo (-3 / +3 lines)
1	MD5 (par2cmdline-0.4-tbb-20080420.tar.gz) = 806d0a4810da2d8fca2375ca12e07fcd	1	MD5 (par2cmdline-0.4-tbb-20090203.tar.gz) = f32c83c524f55171e8d639d6bfe9a7d8
2	SHA256 (par2cmdline-0.4-tbb-20080420.tar.gz) = 37220ff064b256e24f59b4c733baeffd124efa1551ff32d469ca574f40aae3c1	2	SHA256 (par2cmdline-0.4-tbb-20090203.tar.gz) = 6105dd1a4debd773a35d3274ef8d3ab97f1f25c55d130e2596201a5b850838a4
3	SIZE (par2cmdline-0.4-tbb-20080420.tar.gz) = 283148	3	SIZE (par2cmdline-0.4-tbb-20090203.tar.gz) = 320864




--- Makefile.am.orig	2009-02-09 13:44:21.426445712 +0100
+++ Makefile.am	2009-02-09 13:45:18.592707625 +0100
@@ -22,23 +22,23 @@
 bin_PROGRAMS = par2
 
 if AMD64
-ARCH = x86_64
+ARCH_SCALAR = x86_64
 ARCH_MMX = x86_64
 endif
 if X86MMX
-ARCH = i386
+ARCH_SCALAR = i386
 ARCH_MMX = i686
 else
 if X86CPU
-ARCH = i386
+ARCH_SCALAR = i386
 ARCH_MMX = i686
 endif
 endif
 if PPC64
-ARCH = ppc64
+ARCH_SCALAR = ppc64
 endif
 if PPC32
-ARCH = ppc
+ARCH_SCALAR = ppc
 endif
 
 if PLATFORM_DARWIN
@@ -55,10 +55,10 @@
 endif
 
 if AMD64
-ASMSOURCES = reedsolomon-$(ARCH)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s
+ASMSOURCES = reedsolomon-$(ARCH_SCALAR)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s
 endif
 if X86CPU
-ASMSOURCES = reedsolomon-$(ARCH)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s $(ASMSOURCES_PLATFORM)
+ASMSOURCES = reedsolomon-$(ARCH_SCALAR)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s $(ASMSOURCES_PLATFORM)
 endif
 
 if GPGPU_CUDA

Line 0 Link Here

(-)par2cmdline-tbb/files/patch-configure (+11 lines)
	1	--- configure.orig 2009-02-09 06:07:02.000000000 +0100
	2	+++ configure 2009-02-09 06:09:27.000000000 +0100
	3	@@ -4113,7 +4113,7 @@
	4
	5
	6	case "$host_cpu" in
	7	- x86_64\|amd64)
	8	+ x86_64\|amd64\|ia64)
	9	{ echo "$as_me:$LINENO: result: SSE2_on_x86_64 is enabled" >&5
	10	echo "${ECHO_T}SSE2_on_x86_64 is enabled" >&6; }
	11	if true; then




--- md5.h.orig	2008-05-06 13:24:40.000000000 +0200
+++ md5.h	2008-05-06 13:24:58.000000000 +0200
@@ -38,11 +38,8 @@
 class MD5Hash
 {
 public:
-  // removed this to stop GCC warnings about using the 'pack' attribute on
-  // non-POD members in classes such as PACKET_HEADER:
-
   // Constructor does not initialise the value
-  //MD5Hash(void) {};
+  MD5Hash(void) {};
 
   // Comparison operators
   bool operator==(const MD5Hash &other) const;
@@ -57,12 +54,9 @@
   friend ostream& operator<<(ostream &s, const MD5Hash &hash);
   string print(void) const;
 
-  // removed these to stop GCC warnings about using the 'pack' attribute on
-  // non-POD members in classes such as PACKET_HEADER:
-
   // Copy and assignment
-  //MD5Hash(const MD5Hash &other);
-  //MD5Hash& operator=(const MD5Hash &other);
+  MD5Hash(const MD5Hash &other);
+  MD5Hash& operator=(const MD5Hash &other);
 
 public:
   u8 hash[16]; // 16 byte MD5 Hash value
@@ -150,7 +144,7 @@
   return !other.operator<(*this);
 }
 
-/*inline MD5Hash::MD5Hash(const MD5Hash &other)
+inline MD5Hash::MD5Hash(const MD5Hash &other)
 {
   memcpy(&hash, &other.hash, sizeof(hash));
 }
@@ -160,6 +154,6 @@
   memcpy(&hash, &other.hash, sizeof(hash));
 
   return *this;
-}*/
+}
 
 #endif // __MD5_H__

Lines 1-11 Link Here

(-)par2cmdline-tbb/files/patch-par2cmdline.h (-11 lines)
1	--- par2cmdline.h.orig 2008-05-01 08:53:49.729467641 +0200
2	+++ par2cmdline.h 2008-05-01 08:54:02.616707220 +0200
3	@@ -443,7 +443,7 @@
4	incrementing_parallel_while_with_max> >& w,
5	ITEM* item)
6	{
7	- const size_t n = item->is_first() ? tbb::DetectNumberOfWorkers() : 1;
8	+ const size_t n = item->is_first() ? tbb::internal::DetectNumberOfWorkers() : 1;
9
10	bool res = false;
11	std::pair<bool, size_t> pr(w.increment_next_i());

Return to bug 131570

Lines 6-12 Link Here

(-)par2cmdline-tbb/Makefile (-9 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= par2cmdline-tbb	8	PORTNAME= par2cmdline-tbb
9	PORTVERSION= 20080420	9	PORTVERSION= 20090203
10	CATEGORIES= archivers	10	CATEGORIES= archivers
11	MASTER_SITES= http://chuchusoft.com/par2_tbb/	11	MASTER_SITES= http://chuchusoft.com/par2_tbb/
12	DISTNAME= par2cmdline-0.4-tbb-${PORTVERSION}	12	DISTNAME= par2cmdline-0.4-tbb-${PORTVERSION}
Lines 14-35 Link Here
14	MAINTAINER= ganael.laplanche@martymac.com	14	MAINTAINER= ganael.laplanche@martymac.com
15	COMMENT= Tools for using Parity v2 Archive files (tbb version)	15	COMMENT= Tools for using Parity v2 Archive files (tbb version)
16		16
17	BUILD_DEPENDS= ${LOCALBASE}/lib/libtbb.so:${PORTSDIR}/devel/tbb \	17	BUILD_DEPENDS= ${LOCALBASE}/lib/libtbb.so:${PORTSDIR}/devel/tbb
18	${NONEXISTENT}:${PORTSDIR}/devel/tbb:extract
19		18
		19	ONLY_FOR_ARCHS= i386 amd64 ia64
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	21	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
22	LDFLAGS="-L${LOCALBASE}/lib"	22	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
		23	USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262
		24	USE_GCC= 4.2+
23		25
24	PORTDOCS= README	26	PORTDOCS= README
25	CONFLICTS= par2cmdline-[0-9]*	27	CONFLICTS= par2cmdline-[0-9]*
26	PLIST_FILES= bin/par2 bin/par2create bin/par2repair bin/par2verify	28	PLIST_FILES= bin/par2 bin/par2create bin/par2repair bin/par2verify
27		29
28	TBBWRKSRC= `(cd ${PORTSDIR}/devel/tbb && ${MAKE} -V WRKSRC)`	30	post-extract:
29		31	@${CHMOD} u+x ${WRKSRC}/install-sh
30	post-configure:
31	@${CP} ${TBBWRKSRC}/src/tbb/tbb_misc.h ${WRKSRC}/tbb_misc.h
32	@${REINPLACE_CMD} -e 's\|#include "tbb/tbb_misc\.h"\|#include "tbb_misc.h"\|' ${WRKSRC}/par2cmdline.h
33		32
34	post-install:	33	post-install:
35	.if !defined(NOPORTDOCS)	34	.if !defined(NOPORTDOCS)

Line 0 Link Here

(-)par2cmdline-tbb/files/patch-Makefile.am (+44 lines)
	1	--- Makefile.am.orig 2009-02-09 13:44:21.426445712 +0100
	2	+++ Makefile.am 2009-02-09 13:45:18.592707625 +0100
	3	@@ -22,23 +22,23 @@
	4	bin_PROGRAMS = par2
	5
	6	if AMD64
	7	-ARCH = x86_64
	8	+ARCH_SCALAR = x86_64
	9	ARCH_MMX = x86_64
	10	endif
	11	if X86MMX
	12	-ARCH = i386
	13	+ARCH_SCALAR = i386
	14	ARCH_MMX = i686
	15	else
	16	if X86CPU
	17	-ARCH = i386
	18	+ARCH_SCALAR = i386
	19	ARCH_MMX = i686
	20	endif
	21	endif
	22	if PPC64
	23	-ARCH = ppc64
	24	+ARCH_SCALAR = ppc64
	25	endif
	26	if PPC32
	27	-ARCH = ppc
	28	+ARCH_SCALAR = ppc
	29	endif
	30
	31	if PLATFORM_DARWIN
	32	@@ -55,10 +55,10 @@
	33	endif
	34
	35	if AMD64
	36	-ASMSOURCES = reedsolomon-$(ARCH)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s
	37	+ASMSOURCES = reedsolomon-$(ARCH_SCALAR)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s
	38	endif
	39	if X86CPU
	40	-ASMSOURCES = reedsolomon-$(ARCH)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s $(ASMSOURCES_PLATFORM)
	41	+ASMSOURCES = reedsolomon-$(ARCH_SCALAR)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s $(ASMSOURCES_PLATFORM)
	42	endif
	43
	44	if GPGPU_CUDA

Lines 1-47 Link Here

(-)par2cmdline-tbb/files/patch-md5.h (-47 lines)
1	--- md5.h.orig 2008-05-06 13:24:40.000000000 +0200
2	+++ md5.h 2008-05-06 13:24:58.000000000 +0200
3	@@ -38,11 +38,8 @@
4	class MD5Hash
5	{
6	public:
7	- // removed this to stop GCC warnings about using the 'pack' attribute on
8	- // non-POD members in classes such as PACKET_HEADER:
9	-
10	// Constructor does not initialise the value
11	- //MD5Hash(void) {};
12	+ MD5Hash(void) {};
13
14	// Comparison operators
15	bool operator==(const MD5Hash &other) const;
16	@@ -57,12 +54,9 @@
17	friend ostream& operator<<(ostream &s, const MD5Hash &hash);
18	string print(void) const;
19
20	- // removed these to stop GCC warnings about using the 'pack' attribute on
21	- // non-POD members in classes such as PACKET_HEADER:
22	-
23	// Copy and assignment
24	- //MD5Hash(const MD5Hash &other);
25	- //MD5Hash& operator=(const MD5Hash &other);
26	+ MD5Hash(const MD5Hash &other);
27	+ MD5Hash& operator=(const MD5Hash &other);
28
29	public:
30	u8 hash[16]; // 16 byte MD5 Hash value
31	@@ -150,7 +144,7 @@
32	return !other.operator<(*this);
33	}
34
35	-/*inline MD5Hash::MD5Hash(const MD5Hash &other)
36	+inline MD5Hash::MD5Hash(const MD5Hash &other)
37	{
38	memcpy(&hash, &other.hash, sizeof(hash));
39	}
40	@@ -160,6 +154,6 @@
41	memcpy(&hash, &other.hash, sizeof(hash));
42
43	return *this;
44	-}*/
45	+}
46
47	#endif // __MD5_H__