Thu Aug 22 13:15:05 2013 UTC ()
Bump PKGREVISION.

Remove -march=native for portable binary.
For PR pkg/48134.
Thank you, joerg@.


(ryoon)
diff -r1.15 -r1.16 pkgsrc/security/crypto++/Makefile
diff -r1.8 -r1.9 pkgsrc/security/crypto++/distinfo
diff -r1.5 -r1.6 pkgsrc/security/crypto++/patches/patch-aa
cvs diff -r1.15 -r1.16 pkgsrc/security/crypto++/Makefile (expand / switch to unified diff)

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

--- pkgsrc/security/crypto++/distinfo 2013/08/22 12:53:14 1.8
+++ pkgsrc/security/crypto++/distinfo 2013/08/22 13:15:04 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2013/08/22 12:53:14 ryoon Exp $ 1$NetBSD: distinfo,v 1.9 2013/08/22 13:15:04 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) = 5897457ab2a8ca894ef88a6d7a4968c6503a4d1e 6SHA1 (patch-aa) = 9828c7da35f62bc696ee3c529b20ed3faee9b55b
cvs diff -r1.5 -r1.6 pkgsrc/security/crypto++/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/crypto++/patches/Attic/patch-aa 2013/08/22 12:53:14 1.5
+++ pkgsrc/security/crypto++/patches/Attic/patch-aa 2013/08/22 13:15:04 1.6
@@ -1,27 +1,31 @@ @@ -1,27 +1,31 @@
1$NetBSD: patch-aa,v 1.5 2013/08/22 12:53:14 ryoon Exp $ 1$NetBSD: patch-aa,v 1.6 2013/08/22 13:15:04 ryoon Exp $
2 2
3--- GNUmakefile.orig 2013-02-20 06:30:52.000000000 +0000 3--- GNUmakefile.orig 2013-02-20 06:30:52.000000000 +0000
4+++ GNUmakefile 4+++ GNUmakefile
5@@ -1,4 +1,4 @@ 5@@ -1,4 +1,4 @@
6-CXXFLAGS = -DNDEBUG -g -O2 6-CXXFLAGS = -DNDEBUG -g -O2
7+CXXFLAGS = $(CPPFLAGS) -DNDEBUG -g -O2 7+CXXFLAGS = $(CPPFLAGS) -DNDEBUG -g -O2
8 # -O3 fails to link on Cygwin GCC version 4.5.3 8 # -O3 fails to link on Cygwin GCC version 4.5.3
9 # -fPIC is supported. Please report any breakage of -fPIC as a bug. 9 # -fPIC is supported. Please report any breakage of -fPIC as a bug.
10 # CXXFLAGS += -fPIC 10 # CXXFLAGS += -fPIC
11@@ -28,14 +28,14 @@ endif 11@@ -28,18 +28,16 @@ endif
12  12
13 ifeq ($(ISX86),1) 13 ifeq ($(ISX86),1)
14  14
15-GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])") 15-GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])")
16+GCC46_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[6-9]|[5-9])") 16+GCC46_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[6-9]|[5-9])")
17 INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)") 17 INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)")
18 ICC111_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0-9]|1[2-9]|11\.[1-9])") 18 ICC111_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0-9]|1[2-9]|11\.[1-9])")
19 GAS210_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])") 19 GAS210_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])")
20 GAS217_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])") 20 GAS217_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])")
21 GAS219_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])") 21 GAS219_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])")
22  22
23-ifneq ($(GCC42_OR_LATER),0) 23-ifneq ($(GCC42_OR_LATER),0)
24+ifneq ($(GCC46_OR_LATER),0) 24+ifneq ($(GCC46_OR_LATER),0)
25 ifeq ($(UNAME),Darwin) 25 ifeq ($(UNAME),Darwin)
26 CXXFLAGS += -arch x86_64 -arch i386 26 CXXFLAGS += -arch x86_64 -arch i386
27 else 27-else
 28-CXXFLAGS += -march=native
 29 endif
 30 endif
 31