Sat Aug 24 08:16:12 2013 UTC ()
Bump PKGREVISION.

Fix PR pkg/48134 with patch from Onno van der Linden.
Fix build of net/amule.


(ryoon)
diff -r1.16 -r1.17 pkgsrc/security/crypto++/Makefile
diff -r1.9 -r1.10 pkgsrc/security/crypto++/distinfo
diff -r0 -r1.1 pkgsrc/security/crypto++/patches/patch-config.h
cvs diff -r1.16 -r1.17 pkgsrc/security/crypto++/Makefile (expand / switch to unified diff)

--- pkgsrc/security/crypto++/Makefile 2013/08/22 13:15:04 1.16
+++ pkgsrc/security/crypto++/Makefile 2013/08/24 08:16:12 1.17
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.16 2013/08/22 13:15:04 ryoon Exp $ 1# $NetBSD: Makefile,v 1.17 2013/08/24 08:16:12 ryoon Exp $
2# 2#
3 3
4DISTNAME= cryptopp562 4DISTNAME= cryptopp562
5PKGNAME= cryptopp-5.6.2 5PKGNAME= cryptopp-5.6.2
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= security 7CATEGORIES= security
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cryptopp/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cryptopp/}
9EXTRACT_SUFX= .zip 9EXTRACT_SUFX= .zip
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.cryptopp.com/ 12HOMEPAGE= http://www.cryptopp.com/
13COMMENT= Free C++ class library of Cryptographic Primitives 13COMMENT= Free C++ class library of Cryptographic Primitives
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16 16
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18MAKE_FILE= GNUmakefile 18MAKE_FILE= GNUmakefile
19WRKSRC= ${WRKDIR} 19WRKSRC= ${WRKDIR}
cvs diff -r1.9 -r1.10 pkgsrc/security/crypto++/distinfo (expand / switch to unified diff)

--- pkgsrc/security/crypto++/distinfo 2013/08/22 13:15:04 1.9
+++ pkgsrc/security/crypto++/distinfo 2013/08/24 08:16:12 1.10
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.9 2013/08/22 13:15:04 ryoon Exp $ 1$NetBSD: distinfo,v 1.10 2013/08/24 08:16:12 ryoon Exp $
2 2
3SHA1 (cryptopp562.zip) = ddc18ae41c2c940317cd6efe81871686846fa293 3SHA1 (cryptopp562.zip) = ddc18ae41c2c940317cd6efe81871686846fa293
4RMD160 (cryptopp562.zip) = b41af768b3a5ba927dac44ec554dc2095e21b1bb 4RMD160 (cryptopp562.zip) = b41af768b3a5ba927dac44ec554dc2095e21b1bb
5Size (cryptopp562.zip) = 1137964 bytes 5Size (cryptopp562.zip) = 1137964 bytes
6SHA1 (patch-aa) = 9828c7da35f62bc696ee3c529b20ed3faee9b55b 6SHA1 (patch-aa) = 9828c7da35f62bc696ee3c529b20ed3faee9b55b
 7SHA1 (patch-config.h) = d89c38eeaa51494c14fd6b6e7e6f436177bcfe0f
File Added: pkgsrc/security/crypto++/patches/Attic/patch-config.h
$NetBSD: patch-config.h,v 1.1 2013/08/24 08:16:12 ryoon Exp $

--- config.h.orig	2013-02-20 06:30:54.000000000 +0000
+++ config.h
@@ -290,12 +290,6 @@ NAMESPACE_END
 	#define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 0
 #endif
 
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
-	#define CRYPTOPP_BOOL_ALIGN16_ENABLED 1
-#else
-	#define CRYPTOPP_BOOL_ALIGN16_ENABLED 0
-#endif
-
 // how to allocate 16-byte aligned memory (for SSE2)
 #if defined(CRYPTOPP_MSVC6PP_OR_LATER)
 	#define CRYPTOPP_MM_MALLOC_AVAILABLE
@@ -307,6 +301,13 @@ NAMESPACE_END
 	#define CRYPTOPP_NO_ALIGNED_ALLOC
 #endif
 
+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || !defined(CPRYPTO_NO_ALIGNED_ALLOC)
+	#define CRYPTOPP_BOOL_ALIGN16_ENABLED 1
+#else
+	#define CRYPTOPP_BOOL_ALIGN16_ENABLED 0
+#endif
+
+
 // how to disable inlining
 #if defined(_MSC_VER) && _MSC_VER >= 1300
 #	define CRYPTOPP_NOINLINE_DOTDOTDOT