Wed Sep 23 16:03:26 2009 UTC ()
Update to 1.8.7.  Too many changes to list here.

This update is quite delicate and I'm sure it'll break somewhere.  So far
I've only been able to test it in NetBSD/amd64 and Mac OS X Leopard.

I'm bumping the dependency version in buildlink3.mk because the only package
using this seems to be Monotone, and I'll updating it right away.


(jmmv)
diff -r1.13 -r1.14 pkgsrc/security/botan/Makefile
diff -r0 -r1.1 pkgsrc/security/botan/PLIST.NetBSD
diff -r1.2 -r1.3 pkgsrc/security/botan/PLIST.common
diff -r1.6 -r1.7 pkgsrc/security/botan/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/security/botan/distinfo
diff -r1.4 -r0 pkgsrc/security/botan/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/security/botan/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/security/botan/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/security/botan/patches/patch-ak
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-ad
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-ae
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-af
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-ag
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-ah
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-ai
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-aj
cvs diff -r1.13 -r1.14 pkgsrc/security/botan/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/Makefile 2009/08/25 12:32:56 1.13
+++ pkgsrc/security/botan/Attic/Makefile 2009/09/23 16:03:25 1.14
@@ -1,31 +1,39 @@ @@ -1,31 +1,39 @@
1# $NetBSD: Makefile,v 1.13 2009/08/25 12:32:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2009/09/23 16:03:25 jmmv Exp $
2 2
3DISTNAME= Botan-1.4.11 3DISTNAME= Botan-1.8.7
4PKGNAME= botan-1.4.11 4PKGNAME= botan-1.8.7
5PKGREVISION= 1 
6CATEGORIES= security 5CATEGORIES= security
7MASTER_SITES= http://files.randombit.net/botan/archive/v1.4/ 6MASTER_SITES= http://files.randombit.net/botan/archive/v1.8/
8EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://botan.randombit.net/ 10HOMEPAGE= http://botan.randombit.net/
12COMMENT= Portable, easy to use, and efficient C++ crypto library 11COMMENT= Portable, easy to use, and efficient C++ crypto library
13 12
14USE_TOOLS+= perl 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16USE_LANGUAGES= c++ 15HAS_CONFIGURE= yes
17REPLACE_PERL+= ./configure.pl 16REPLACE_PYTHON+= configure.pl
18HAS_CONFIGURE= yes 17USE_LANGUAGES= c++
19CONFIG_SHELL= perl 18
20CONFIGURE_SCRIPT= ./configure.pl 19PYTHON_FOR_BUILD_ONLY= yes
 20
 21CONFIG_SHELL= ${PYTHONBIN}
 22CONFIGURE_SCRIPT= ./configure.py
21CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 23CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
22 24
23MAKE_FLAGS+= INSTALL_CMD_EXEC=${INSTALL_PROGRAM:Q} 
24MAKE_FLAGS+= INSTALL_CMD_DATA=${INSTALL_DATA:Q} 
25MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q} 25MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q}
26 26
27CXXFLAGS.DragonFly+= -D_DRAGONFLY_SOURCE 27.if ${MACHINE_ARCH} == "amd64"
28CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE 28PLIST_SUBST+= AMD64=
29BUILDLINK_TRANSFORM+= rm:-mcpu=i686 29PLIST_SUBST+= AMD64_OR_IA32=
 30.elif ${MACHINE_ARCH} == "i386"
 31PLIST_SUBST+= AMD64="@comment "
 32PLIST_SUBST+= AMD64_OR_IA32=
 33.else
 34PLIST_SUBST+= AMD64="@comment "
 35PLIST_SUBST+= AMD64_OR_IA32="@comment "
 36.endif
30 37
 38.include "../../lang/python/application.mk"
31.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/security/botan/Attic/PLIST.NetBSD
@comment $NetBSD: PLIST.NetBSD,v 1.1 2009/09/23 16:03:25 jmmv Exp $
${AMD64_OR_IA32}include/botan/asm_macr.h
${AMD64_OR_IA32}include/botan/eng_sse2.h
${AMD64_OR_IA32}include/botan/sha1_sse2.h
cvs diff -r1.2 -r1.3 pkgsrc/security/botan/Attic/PLIST.common (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/PLIST.common 2006/07/21 16:22:36 1.2
+++ pkgsrc/security/botan/Attic/PLIST.common 2009/09/23 16:03:25 1.3
@@ -1,191 +1,263 @@ @@ -1,191 +1,263 @@
1@comment $NetBSD: PLIST.common,v 1.2 2006/07/21 16:22:36 wiz Exp $ 1@comment $NetBSD: PLIST.common,v 1.3 2009/09/23 16:03:25 jmmv Exp $
2bin/botan-config 2bin/botan-config
3include/botan/adler32.h 3include/botan/adler32.h
4include/botan/aes.h 4include/botan/aes.h
5include/botan/algolist.h 5include/botan/alg_id.h
 6include/botan/algo_cache.h
 7include/botan/algo_factory.h
6include/botan/allocate.h 8include/botan/allocate.h
7include/botan/arc4.h 9include/botan/arc4.h
8include/botan/asn1.h 10include/botan/asn1_int.h
9include/botan/asn1_obj.h 11include/botan/asn1_obj.h
10include/botan/asn1_oid.h 12include/botan/asn1_oid.h
11include/botan/barrett.h 13include/botan/auto_rng.h
12include/botan/base.h 
13include/botan/base64.h 14include/botan/base64.h
14include/botan/basefilt.h 15include/botan/basefilt.h
 16include/botan/benchmark.h
15include/botan/ber_dec.h 17include/botan/ber_dec.h
16include/botan/bigint.h 18include/botan/bigint.h
17include/botan/bit_ops.h 19include/botan/bit_ops.h
18include/botan/blinding.h 20include/botan/blinding.h
 21include/botan/block_cipher.h
19include/botan/blowfish.h 22include/botan/blowfish.h
20include/botan/botan.h 23include/botan/botan.h
21include/botan/botan.py 24include/botan/bswap.h
22include/botan/buf_es.h 25include/botan/buf_comp.h
23include/botan/buf_filt.h 26include/botan/buf_filt.h
 27include/botan/build.h
24include/botan/cast128.h 28include/botan/cast128.h
25include/botan/cast256.h 29include/botan/cast256.h
26include/botan/cbc.h 30include/botan/cbc.h
 31include/botan/cbc_mac.h
27include/botan/certstor.h 32include/botan/certstor.h
28include/botan/cfb.h 33include/botan/cfb.h
29include/botan/charset.h 34include/botan/charset.h
30include/botan/cmac.h 35include/botan/cmac.h
31include/botan/conf.h 36include/botan/cms_dec.h
32include/botan/config.h 37include/botan/cms_enc.h
33include/botan/crc24.h 38include/botan/crc24.h
34include/botan/crc32.h 39include/botan/crc32.h
35include/botan/crl_ent.h 40include/botan/crl_ent.h
 41include/botan/cryptobox.h
36include/botan/ctr.h 42include/botan/ctr.h
37include/botan/cts.h 43include/botan/cts.h
 44include/botan/curve_gfp.h
 45include/botan/cvc_ado.h
 46include/botan/cvc_ca.h
 47include/botan/cvc_cert.h
 48include/botan/cvc_gen_cert.h
 49include/botan/cvc_key.h
 50include/botan/cvc_req.h
 51include/botan/cvc_self.h
38include/botan/data_snk.h 52include/botan/data_snk.h
39include/botan/data_src.h 53include/botan/data_src.h
 54include/botan/datastor.h
40include/botan/def_eng.h 55include/botan/def_eng.h
 56include/botan/def_powm.h
41include/botan/defalloc.h 57include/botan/defalloc.h
42include/botan/der_enc.h 58include/botan/der_enc.h
43include/botan/des.h 59include/botan/des.h
 60include/botan/desx.h
44include/botan/dh.h 61include/botan/dh.h
 62include/botan/dh_core.h
 63include/botan/dh_op.h
 64include/botan/divide.h
45include/botan/dl_algo.h 65include/botan/dl_algo.h
46include/botan/dl_param.h 66include/botan/dl_group.h
47include/botan/dlies.h 67include/botan/dlies.h
48include/botan/dsa.h 68include/botan/dsa.h
 69include/botan/dsa_core.h
 70include/botan/dsa_op.h
 71include/botan/eac_asn_obj.h
 72include/botan/eac_obj.h
49include/botan/eax.h 73include/botan/eax.h
 74include/botan/ec_dompar.h
50include/botan/ecb.h 75include/botan/ecb.h
 76include/botan/ecc_key.h
 77include/botan/ecdsa.h
 78include/botan/ecdsa_core.h
 79include/botan/ecdsa_op.h
 80include/botan/ecdsa_sig.h
 81include/botan/eckaeg.h
 82include/botan/eckaeg_core.h
 83include/botan/eckaeg_op.h
 84include/botan/elg_core.h
 85include/botan/elg_op.h
51include/botan/elgamal.h 86include/botan/elgamal.h
52include/botan/eme.h 87include/botan/eme.h
 88include/botan/eme1.h
 89include/botan/eme_pkcs.h
53include/botan/emsa.h 90include/botan/emsa.h
 91include/botan/emsa1.h
 92include/botan/emsa1_bsi.h
 93include/botan/emsa2.h
 94include/botan/emsa3.h
 95include/botan/emsa4.h
 96include/botan/emsa_raw.h
 97${AMD64}include/botan/eng_amd64.h
54include/botan/engine.h 98include/botan/engine.h
55include/botan/enums.h 99include/botan/entropy_src.h
 100include/botan/es_dev.h
56include/botan/es_egd.h 101include/botan/es_egd.h
57include/botan/es_file.h 
58include/botan/es_unix.h 102include/botan/es_unix.h
59include/botan/exceptn.h 103include/botan/exceptn.h
60include/botan/fd_unix.h 104include/botan/fd_unix.h
61include/botan/filter.h 105include/botan/filter.h
62include/botan/filters.h 106include/botan/filters.h
63include/botan/fips140.h 
64include/botan/fork256.h 107include/botan/fork256.h
65include/botan/gost.h 108include/botan/freestore.h
 109include/botan/get_pbe.h
 110include/botan/gfp_element.h
 111include/botan/gfp_modulus.h
 112include/botan/gost_28147.h
 113include/botan/gost_3411.h
66include/botan/has160.h 114include/botan/has160.h
 115include/botan/hash.h
67include/botan/hash_id.h 116include/botan/hash_id.h
68include/botan/haval.h 
69include/botan/hex.h 117include/botan/hex.h
70include/botan/hmac.h 118include/botan/hmac.h
 119include/botan/hmac_rng.h
71include/botan/idea.h 120include/botan/idea.h
72include/botan/if_algo.h 121include/botan/if_algo.h
 122include/botan/if_core.h
 123include/botan/if_op.h
73include/botan/init.h 124include/botan/init.h
74include/botan/isaac.h 
75include/botan/kasumi.h 125include/botan/kasumi.h
76include/botan/kdf.h 126include/botan/kdf.h
 127include/botan/kdf1.h
 128include/botan/kdf2.h
77include/botan/keypair.h 129include/botan/keypair.h
 130include/botan/libstate.h
78include/botan/lion.h 131include/botan/lion.h
79include/botan/look_add.h 132include/botan/loadstor.h
80include/botan/look_pk.h 133include/botan/look_pk.h
81include/botan/lookup.h 134include/botan/lookup.h
82include/botan/lubyrack.h 135include/botan/lubyrack.h
 136include/botan/mac.h
83include/botan/mars.h 137include/botan/mars.h
84include/botan/md2.h 138include/botan/md2.h
85include/botan/md4.h 139include/botan/md4.h
86include/botan/md5.h 140include/botan/md5.h
87include/botan/mdx_hash.h 141include/botan/mdx_hash.h
88include/botan/mem_ops.h 142include/botan/mem_ops.h
89include/botan/mem_pool.h 143include/botan/mem_pool.h
90include/botan/mgf1.h 144include/botan/mgf1.h
91include/botan/misty1.h 145include/botan/misty1.h
92include/botan/mmap_mem.h 146include/botan/mmap_mem.h
93include/botan/mod_exp.h 
94include/botan/mode_pad.h 147include/botan/mode_pad.h
95include/botan/modebase.h 148include/botan/modebase.h
 149include/botan/mp_asm.h
 150include/botan/mp_asmi.h
96include/botan/mp_core.h 151include/botan/mp_core.h
97include/botan/mp_madd.h 
98include/botan/mp_types.h 152include/botan/mp_types.h
99include/botan/mutex.h 153include/botan/mutex.h
 154include/botan/mux_noop.h
100include/botan/mux_pthr.h 155include/botan/mux_pthr.h
 156include/botan/noekeon.h
101include/botan/nr.h 157include/botan/nr.h
 158include/botan/nr_core.h
 159include/botan/nr_op.h
102include/botan/numthry.h 160include/botan/numthry.h
103include/botan/ofb.h 161include/botan/ofb.h
104include/botan/oids.h 162include/botan/oids.h
105include/botan/openpgp.h 163include/botan/openpgp.h
106include/botan/out_buf.h 164include/botan/out_buf.h
107include/botan/par_hash.h 165include/botan/par_hash.h
108include/botan/parsing.h 166include/botan/parsing.h
109include/botan/pbe.h 167include/botan/pbe.h
110include/botan/pbe_pkcs.h 168include/botan/pbes1.h
 169include/botan/pbes2.h
 170include/botan/pbkdf1.h
 171include/botan/pbkdf2.h
111include/botan/pem.h 172include/botan/pem.h
112include/botan/pgp_s2k.h 173include/botan/pgp_s2k.h
113include/botan/pipe.h 174include/botan/pipe.h
114include/botan/pk_algs.h 175include/botan/pk_algs.h
115include/botan/pk_core.h 176include/botan/pk_engine.h
116include/botan/pk_filts.h 177include/botan/pk_filts.h
117include/botan/pk_keys.h 178include/botan/pk_keys.h
118include/botan/pk_ops.h 
119include/botan/pk_util.h 
120include/botan/pkcs10.h 179include/botan/pkcs10.h
121include/botan/pkcs5.h 
122include/botan/pkcs8.h 180include/botan/pkcs8.h
 181include/botan/point_gfp.h
 182include/botan/pow_mod.h
 183include/botan/prf_ssl3.h
 184include/botan/prf_tls.h
 185include/botan/prf_x942.h
123include/botan/pubkey.h 186include/botan/pubkey.h
 187include/botan/pubkey_enums.h
124include/botan/randpool.h 188include/botan/randpool.h
125include/botan/rc2.h 189include/botan/rc2.h
126include/botan/rc5.h 190include/botan/rc5.h
127include/botan/rc6.h 191include/botan/rc6.h
128include/botan/reducer.h 192include/botan/reducer.h
129include/botan/rmd128.h 193include/botan/rmd128.h
130include/botan/rmd160.h 194include/botan/rmd160.h
131include/botan/rng.h 195include/botan/rng.h
 196include/botan/rotate.h
132include/botan/rsa.h 197include/botan/rsa.h
133include/botan/rw.h 198include/botan/rw.h
134include/botan/s2k.h 199include/botan/s2k.h
135include/botan/safer_sk.h 200include/botan/safer_sk.h
136include/botan/seal.h 201include/botan/salsa20.h
 202include/botan/scan_name.h
137include/botan/secmem.h 203include/botan/secmem.h
138include/botan/secqueue.h 204include/botan/secqueue.h
139include/botan/seed.h 205include/botan/seed.h
 206include/botan/selftest.h
140include/botan/serpent.h 207include/botan/serpent.h
141include/botan/sha160.h 208include/botan/sha160.h
142include/botan/sha256.h 209${AMD64}include/botan/sha1_amd64.h
143include/botan/sha_64.h 210include/botan/sha2_32.h
 211include/botan/sha2_64.h
 212include/botan/signed_obj.h
 213include/botan/skein_512.h
144include/botan/skipjack.h 214include/botan/skipjack.h
145include/botan/square.h 215include/botan/square.h
 216include/botan/ssl3_mac.h
 217include/botan/stl_util.h
 218include/botan/stream_cipher.h
 219include/botan/sym_algo.h
146include/botan/symkey.h 220include/botan/symkey.h
147include/botan/tea.h 221include/botan/tea.h
148include/botan/tiger.h 222include/botan/tiger.h
149include/botan/timers.h 223include/botan/timer.h
150include/botan/tm_hard.h 224include/botan/tm_hard.h
151include/botan/tm_unix.h 225include/botan/tm_unix.h
152include/botan/turing.h 226include/botan/turing.h
153include/botan/twofish.h 227include/botan/twofish.h
154include/botan/types.h 228include/botan/types.h
155include/botan/ui.h 229include/botan/ui.h
156include/botan/unix_cmd.h 230include/botan/unix_cmd.h
157include/botan/util.h 231include/botan/util.h
158include/botan/version.h 232include/botan/version.h
159include/botan/whrlpool.h 233include/botan/whrlpool.h
160include/botan/wid_wake.h 234include/botan/wid_wake.h
161include/botan/x509_ca.h 235include/botan/x509_ca.h
162include/botan/x509_crl.h 236include/botan/x509_crl.h
 237include/botan/x509_ext.h
163include/botan/x509_key.h 238include/botan/x509_key.h
164include/botan/x509_obj.h 239include/botan/x509_obj.h
165include/botan/x509cert.h 240include/botan/x509cert.h
 241include/botan/x509find.h
166include/botan/x509self.h 242include/botan/x509self.h
167include/botan/x509stor.h 243include/botan/x509stor.h
168include/botan/x919_mac.h 244include/botan/x919_mac.h
169include/botan/x931_rng.h 245include/botan/x931_rng.h
 246include/botan/xor_buf.h
170include/botan/xtea.h 247include/botan/xtea.h
171lib/libbotan-1.4.11.so 248include/botan/xts.h
172lib/libbotan-1.4.so 249lib/libbotan-1.8.2.so
173lib/libbotan-1.so 
174lib/libbotan.a 250lib/libbotan.a
175lib/libbotan.so 251lib/libbotan.so
176share/doc/Botan-1.4.11/api.pdf 252lib/pkgconfig/botan-1.8.pc
177share/doc/Botan-1.4.11/api.tex 253share/doc/Botan-${PKGVERSION}/api.pdf
178share/doc/Botan-1.4.11/authors.txt 254share/doc/Botan-${PKGVERSION}/api.tex
179share/doc/Botan-1.4.11/botan.rc 255share/doc/Botan-${PKGVERSION}/credits.txt
180share/doc/Botan-1.4.11/bugs.txt 256share/doc/Botan-${PKGVERSION}/fips140.tex
181share/doc/Botan-1.4.11/deprecated.txt 257share/doc/Botan-${PKGVERSION}/license.txt
182share/doc/Botan-1.4.11/fips140.pdf 258share/doc/Botan-${PKGVERSION}/log.txt
183share/doc/Botan-1.4.11/fips140.tex 259share/doc/Botan-${PKGVERSION}/pgpkeys.asc
184share/doc/Botan-1.4.11/license.txt 260share/doc/Botan-${PKGVERSION}/readme.txt
185share/doc/Botan-1.4.11/log.txt 261share/doc/Botan-${PKGVERSION}/thanks.txt
186share/doc/Botan-1.4.11/pgpkeys.asc 262share/doc/Botan-${PKGVERSION}/tutorial.pdf
187share/doc/Botan-1.4.11/readme.txt 263share/doc/Botan-${PKGVERSION}/tutorial.tex
188share/doc/Botan-1.4.11/thanks.txt 
189share/doc/Botan-1.4.11/todo.txt 
190share/doc/Botan-1.4.11/tutorial.pdf 
191share/doc/Botan-1.4.11/tutorial.tex 
cvs diff -r1.6 -r1.7 pkgsrc/security/botan/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/buildlink3.mk 2009/03/20 19:25:16 1.6
+++ pkgsrc/security/botan/Attic/buildlink3.mk 2009/09/23 16:03:25 1.7
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:16 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2009/09/23 16:03:25 jmmv Exp $
2 2
3BUILDLINK_TREE+= botan 3BUILDLINK_TREE+= botan
4 4
5.if !defined(BOTAN_BUILDLINK3_MK) 5.if !defined(BOTAN_BUILDLINK3_MK)
6BOTAN_BUILDLINK3_MK:= 6BOTAN_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.botan+= botan>=1.4.11 8BUILDLINK_API_DEPENDS.botan+= botan>=1.8.7
9BUILDLINK_PKGSRCDIR.botan?= ../../security/botan 9BUILDLINK_PKGSRCDIR.botan?= ../../security/botan
10.endif # BOTAN_BUILDLINK3_MK 10.endif # BOTAN_BUILDLINK3_MK
11 11
12BUILDLINK_TREE+= -botan 12BUILDLINK_TREE+= -botan
cvs diff -r1.6 -r1.7 pkgsrc/security/botan/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/distinfo 2009/03/23 13:16:13 1.6
+++ pkgsrc/security/botan/Attic/distinfo 2009/09/23 16:03:25 1.7
@@ -1,16 +1,8 @@ @@ -1,16 +1,8 @@
1$NetBSD: distinfo,v 1.6 2009/03/23 13:16:13 jmmv Exp $ 1$NetBSD: distinfo,v 1.7 2009/09/23 16:03:25 jmmv Exp $
2 2
3SHA1 (Botan-1.4.11.tgz) = 49b896fd90e7e80004f7596872238fb40e9748d9 3SHA1 (Botan-1.8.7.tgz) = 69d985f66aa024f0d53c2d5597a4f1a0b9735959
4RMD160 (Botan-1.4.11.tgz) = c8aa827cf10151266b88e17c172999a6ccaab816 4RMD160 (Botan-1.8.7.tgz) = 73a6417f1445282e4b2fbf45557f2644b2996563
5Size (Botan-1.4.11.tgz) = 1802089 bytes 5Size (Botan-1.8.7.tgz) = 3464535 bytes
6SHA1 (patch-aa) = 3f5d8bf18c16d1d4dc7a81e821459ee2ee3379f1 6SHA1 (patch-ab) = a53a3e23722d8f478c5a6c5ecf1df08d74fd21c0
7SHA1 (patch-ab) = 478d91bce78f484fb8ba2d23ceecb462728b29db 7SHA1 (patch-ac) = 4f98ff086983b27ed17d048486a8afced47e7970
8SHA1 (patch-ac) = 0981448664141b3effaf3e88f5f2317d70ebc786 8SHA1 (patch-ak) = 7bf66c1faa84971b490be96efefac0ef44f97b70
9SHA1 (patch-ad) = feff04fc7383bb86df12e187a5788a0b867c47d7 
10SHA1 (patch-ae) = 658808ae00b2a35d649a62578e400e840ab9e0a8 
11SHA1 (patch-af) = 5ed516dd5a746ed94447e880c2f07fc50d8230a8 
12SHA1 (patch-ag) = 8e847a4159ef99d28ec57cf4643d7ecacb8ba353 
13SHA1 (patch-ah) = ff07d2f7b921feb64430351192cc9315452d0687 
14SHA1 (patch-ai) = f7f79ccf61ddbd868a317a63e1d8a377a13ce160 
15SHA1 (patch-aj) = f842e4a39eddd517312a9f7ae57391e330c48a3f 
16SHA1 (patch-ak) = 0944272902558985c4e7ca6f001090596a373b35 
File Deleted: pkgsrc/security/botan/patches/Attic/patch-aa
cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/botan/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/security/botan/patches/Attic/patch-ab 2006/02/05 01:25:12 1.1.1.1
+++ pkgsrc/security/botan/patches/Attic/patch-ab 2009/09/23 16:03:25 1.2
@@ -1,13 +1,31 @@ @@ -1,13 +1,31 @@
1$NetBSD: patch-ab,v 1.1.1.1 2006/02/05 01:25:12 rillig Exp $ 1$NetBSD: patch-ab,v 1.2 2009/09/23 16:03:25 jmmv Exp $
2 2
3--- modules/tm_posix/tm_posix.cpp.orig 2006-01-01 01:02:28.000000000 +0000 3--- src/build-data/makefile/unix_shr.in.orig 2009-09-10 00:29:34.000000000 +0000
4+++ modules/tm_posix/tm_posix.cpp 2006-02-01 17:27:07.000000000 +0000 4+++ src/build-data/makefile/unix_shr.in
5@@ -9,7 +9,7 @@ 5@@ -20,12 +20,12 @@ SO_VERSION = %{so_version}
 6 ##################################################
 7 # Installation Settings #
 8 ##################################################
 9-DESTDIR = %{prefix}
 10+PREFIX = $(DESTDIR)%{prefix}
6  11
7 #include <botan/tm_posix.h> 12-BINDIR = $(DESTDIR)/bin
8 #include <botan/util.h> 13-LIBDIR = $(DESTDIR)/%{libdir}
9-#include <time.h> 14-HEADERDIR = $(DESTDIR)/%{includedir}/botan
10+#include <sys/time.h> 15-DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION)
 16+BINDIR = $(PREFIX)/bin
 17+LIBDIR = $(PREFIX)/lib
 18+HEADERDIR = $(PREFIX)/include/botan
 19+DOCDIR = $(PREFIX)/share/doc/Botan-$(VERSION)
 20 PKGCONF_DIR = $(LIBDIR)/pkgconfig
11  21
12 #ifndef CLOCK_REALTIME 22 CONFIG_SCRIPT = %{botan_config}
13 #define CLOCK_REALTIME 0 23@@ -118,7 +118,7 @@ distclean: clean
 24 $(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG)
 25
 26 install: $(LIBRARIES)
 27- $(ECHO) "Installing Botan into $(DESTDIR)... "
 28+ $(ECHO) "Installing Botan into $(PREFIX)... "
 29 $(MKDIR_INSTALL) $(DOCDIR)
 30 $(MKDIR_INSTALL) $(HEADERDIR)
 31 $(MKDIR_INSTALL) $(LIBDIR)
cvs diff -r1.1 -r1.2 pkgsrc/security/botan/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/security/botan/patches/Attic/patch-ac 2006/03/01 00:33:30 1.1
+++ pkgsrc/security/botan/patches/Attic/patch-ac 2009/09/23 16:03:25 1.2
@@ -1,12 +1,31 @@ @@ -1,12 +1,31 @@
1$NetBSD: patch-ac,v 1.1 2006/03/01 00:33:30 joerg Exp $ 1$NetBSD: patch-ac,v 1.2 2009/09/23 16:03:25 jmmv Exp $
2 2
3--- modules/es_egd/es_egd.orig 2006-02-27 01:30:24.000000000 +0000 3--- src/build-data/makefile/unix.in.orig 2009-09-10 00:29:34.000000000 +0000
4+++ modules/es_egd/es_egd 4+++ src/build-data/makefile/unix.in
5@@ -14,6 +14,7 @@ qnx -> socket 5@@ -17,12 +17,12 @@ VERSION = %{version}
6 aix 6 ##################################################
7 cygwin 7 # Installation Settings #
8 darwin 8 ##################################################
9+dragonfly 9-DESTDIR = %{prefix}
10 freebsd 10+PREFIX = $(DESTDIR)%{prefix}
11 hpux 11
12 irix 12-BINDIR = $(DESTDIR)/bin
 13-LIBDIR = $(DESTDIR)/%{libdir}
 14-HEADERDIR = $(DESTDIR)/%{includedir}/botan
 15-DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION)
 16+BINDIR = $(PREFIX)/bin
 17+LIBDIR = $(PREFIX)/lib
 18+HEADERDIR = $(PREFIX)/include/botan
 19+DOCDIR = $(PREFIX)/share/doc/Botan-$(VERSION)
 20 PKGCONF_DIR = $(LIBDIR)/pkgconfig
 21
 22 CONFIG_SCRIPT = %{botan_config}
 23@@ -104,7 +104,7 @@ distclean: clean
 24 $(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG)
 25
 26 install: $(LIBRARIES)
 27- $(ECHO) "Installing Botan into $(DESTDIR)... "
 28+ $(ECHO) "Installing Botan into $(PREFIX)... "
 29 $(MKDIR_INSTALL) $(DOCDIR)
 30 $(MKDIR_INSTALL) $(HEADERDIR)
 31 $(MKDIR_INSTALL) $(LIBDIR)
cvs diff -r1.1 -r1.2 pkgsrc/security/botan/patches/Attic/patch-ak (expand / switch to unified diff)

--- pkgsrc/security/botan/patches/Attic/patch-ak 2007/06/30 18:08:35 1.1
+++ pkgsrc/security/botan/patches/Attic/patch-ak 2009/09/23 16:03:26 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-ak,v 1.1 2007/06/30 18:08:35 joerg Exp $ 1$NetBSD: patch-ak,v 1.2 2009/09/23 16:03:26 jmmv Exp $
2 2
3--- modules/tm_hard/tm_hard.orig 2007-06-30 17:42:27.000000000 +0000 3--- src/timer/cpu_counter/info.txt.orig 2009-09-10 00:29:35.000000000 +0000
4+++ modules/tm_hard/tm_hard 4+++ src/timer/cpu_counter/info.txt
5@@ -13,6 +13,7 @@ gcc 5@@ -15,6 +15,7 @@ gcc
6  6
7 <arch> 7 <arch>
8 # RDTSC: Pentium and up 8 # RDTSC: Pentium and up
9+i386 9+i386
10 i586 10 i586
11 i686 11 i686
12 athlon 12 athlon
File Deleted: pkgsrc/security/botan/patches/Attic/patch-ad
File Deleted: pkgsrc/security/botan/patches/Attic/patch-ae
File Deleted: pkgsrc/security/botan/patches/Attic/patch-af
File Deleted: pkgsrc/security/botan/patches/Attic/patch-ag
File Deleted: pkgsrc/security/botan/patches/Attic/patch-ah
File Deleted: pkgsrc/security/botan/patches/Attic/patch-ai
File Deleted: pkgsrc/security/botan/patches/Attic/patch-aj