Mon Mar 23 13:16:13 2009 UTC ()
Make the installation path of doc files consistent with all other instalations
in Darwin and also register the installed header file.


(jmmv)
diff -r0 -r1.1 pkgsrc/security/botan/PLIST.Darwin
diff -r1.5 -r1.6 pkgsrc/security/botan/distinfo
diff -r1.3 -r1.4 pkgsrc/security/botan/patches/patch-aa
File Added: pkgsrc/security/botan/Attic/PLIST.Darwin
@comment $NetBSD: PLIST.Darwin,v 1.1 2009/03/23 13:16:13 jmmv Exp $
include/botan/es_ftw.h
cvs diff -r1.5 -r1.6 pkgsrc/security/botan/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/distinfo 2008/01/05 05:06:52 1.5
+++ pkgsrc/security/botan/Attic/distinfo 2009/03/23 13:16:13 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.5 2008/01/05 05:06:52 obache Exp $ 1$NetBSD: distinfo,v 1.6 2009/03/23 13:16:13 jmmv Exp $
2 2
3SHA1 (Botan-1.4.11.tgz) = 49b896fd90e7e80004f7596872238fb40e9748d9 3SHA1 (Botan-1.4.11.tgz) = 49b896fd90e7e80004f7596872238fb40e9748d9
4RMD160 (Botan-1.4.11.tgz) = c8aa827cf10151266b88e17c172999a6ccaab816 4RMD160 (Botan-1.4.11.tgz) = c8aa827cf10151266b88e17c172999a6ccaab816
5Size (Botan-1.4.11.tgz) = 1802089 bytes 5Size (Botan-1.4.11.tgz) = 1802089 bytes
6SHA1 (patch-aa) = 5b39d48f201c40fea5f3c1b7b2c801506189bed0 6SHA1 (patch-aa) = 3f5d8bf18c16d1d4dc7a81e821459ee2ee3379f1
7SHA1 (patch-ab) = 478d91bce78f484fb8ba2d23ceecb462728b29db 7SHA1 (patch-ab) = 478d91bce78f484fb8ba2d23ceecb462728b29db
8SHA1 (patch-ac) = 0981448664141b3effaf3e88f5f2317d70ebc786 8SHA1 (patch-ac) = 0981448664141b3effaf3e88f5f2317d70ebc786
9SHA1 (patch-ad) = feff04fc7383bb86df12e187a5788a0b867c47d7 9SHA1 (patch-ad) = feff04fc7383bb86df12e187a5788a0b867c47d7
10SHA1 (patch-ae) = 658808ae00b2a35d649a62578e400e840ab9e0a8 10SHA1 (patch-ae) = 658808ae00b2a35d649a62578e400e840ab9e0a8
11SHA1 (patch-af) = 5ed516dd5a746ed94447e880c2f07fc50d8230a8 11SHA1 (patch-af) = 5ed516dd5a746ed94447e880c2f07fc50d8230a8
12SHA1 (patch-ag) = 8e847a4159ef99d28ec57cf4643d7ecacb8ba353 12SHA1 (patch-ag) = 8e847a4159ef99d28ec57cf4643d7ecacb8ba353
13SHA1 (patch-ah) = ff07d2f7b921feb64430351192cc9315452d0687 13SHA1 (patch-ah) = ff07d2f7b921feb64430351192cc9315452d0687
14SHA1 (patch-ai) = f7f79ccf61ddbd868a317a63e1d8a377a13ce160 14SHA1 (patch-ai) = f7f79ccf61ddbd868a317a63e1d8a377a13ce160
15SHA1 (patch-aj) = f842e4a39eddd517312a9f7ae57391e330c48a3f 15SHA1 (patch-aj) = f842e4a39eddd517312a9f7ae57391e330c48a3f
16SHA1 (patch-ak) = 0944272902558985c4e7ca6f001090596a373b35 16SHA1 (patch-ak) = 0944272902558985c4e7ca6f001090596a373b35
cvs diff -r1.3 -r1.4 pkgsrc/security/botan/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/botan/patches/Attic/patch-aa 2006/03/01 00:33:30 1.3
+++ pkgsrc/security/botan/patches/Attic/patch-aa 2009/03/23 13:16:13 1.4
@@ -1,17 +1,23 @@ @@ -1,17 +1,23 @@
1$NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2009/03/23 13:16:13 jmmv Exp $
2 2
3--- configure.pl.orig 2006-01-01 01:02:28.000000000 +0000 3--- configure.pl.orig 2006-01-01 02:02:28.000000000 +0100
4+++ configure.pl 4+++ configure.pl
 5@@ -1,4 +1,4 @@
 6-#!/usr/bin/perl -w
 7+#!/Users/jmmv/Applications/pkg/bin/perl -w
 8
 9 # Warning: This file is machine-generated; any changes will be lost. Instead,
 10 # change mkconfig.pl and the system description files. If you find a bug in
5@@ -74,7 +74,6 @@ my %DOCS = ( 11@@ -74,7 +74,6 @@ my %DOCS = (
6 'deprecated.txt' => $DOC_DIR, 12 'deprecated.txt' => $DOC_DIR,
7 'license.txt' => $DOC_DIR, 13 'license.txt' => $DOC_DIR,
8 'log.txt' => $DOC_DIR, 14 'log.txt' => $DOC_DIR,
9- 'rngs.txt' => $DOC_DIR, 15- 'rngs.txt' => $DOC_DIR,
10 'thanks.txt' => $DOC_DIR, 16 'thanks.txt' => $DOC_DIR,
11 'todo.txt' => $DOC_DIR 17 'todo.txt' => $DOC_DIR
12 ); 18 );
13@@ -278,6 +277,7 @@ my %OS_SUPPORTS_ARCH = ( 19@@ -278,6 +277,7 @@ my %OS_SUPPORTS_ARCH = (
14 'darwin' => [ 'ia32', 'ppc', 'ppc64', ], 20 'darwin' => [ 'ia32', 'ppc', 'ppc64', ],
15 'freebsd' => [ 'alpha', 'amd64', 'ia32', 'ia64', 'powerpc', 'sparc64',  21 'freebsd' => [ 'alpha', 'amd64', 'ia32', 'ia64', 'powerpc', 'sparc64',
16 ], 22 ],
17+ 'dragonfly' => [ 'amd64', 'ia32', 'ia64' ], 23+ 'dragonfly' => [ 'amd64', 'ia32', 'ia64' ],
@@ -24,88 +30,96 @@ $NetBSD: patch-aa,v 1.3 2006/03/01 00:33 @@ -24,88 +30,96 @@ $NetBSD: patch-aa,v 1.3 2006/03/01 00:33
24 'freebsd' => [ 'all', ], 30 'freebsd' => [ 'all', ],
25+ 'dragonfly' => [ 'all', ], 31+ 'dragonfly' => [ 'all', ],
26 'hpux' => [ 'all', ], 32 'hpux' => [ 'all', ],
27 'irix' => [ 'all', ], 33 'irix' => [ 'all', ],
28 'linux' => [ 'all', ], 34 'linux' => [ 'all', ],
29@@ -314,6 +315,7 @@ my %OS_TYPE = ( 35@@ -314,6 +315,7 @@ my %OS_TYPE = (
30 'cygwin' => 'unix', 36 'cygwin' => 'unix',
31 'darwin' => 'unix', 37 'darwin' => 'unix',
32 'freebsd' => 'unix', 38 'freebsd' => 'unix',
33+ 'dragonfly' => 'unix', 39+ 'dragonfly' => 'unix',
34 'hpux' => 'unix', 40 'hpux' => 'unix',
35 'irix' => 'unix', 41 'irix' => 'unix',
36 'linux' => 'unix', 42 'linux' => 'unix',
37@@ -387,6 +389,9 @@ my %INSTALL_INFO = ( 43@@ -372,7 +374,6 @@ my %INSTALL_INFO = (
 44 'root' => 'c:\Botan',
 45 },
 46 'darwin' => {
 47- 'docs' => 'doc',
 48 'group' => 'wheel',
 49 },
 50 'defaults' => {
 51@@ -387,6 +388,9 @@ my %INSTALL_INFO = (
38 'freebsd' => { 52 'freebsd' => {
39 'group' => 'wheel', 53 'group' => 'wheel',
40 }, 54 },
41+ 'dragonfly' => { 55+ 'dragonfly' => {
42+ 'group' => 'wheel', 56+ 'group' => 'wheel',
43+ }, 57+ },
44 'netbsd' => { 58 'netbsd' => {
45 'group' => 'wheel', 59 'group' => 'wheel',
46 }, 60 },
47@@ -406,7 +411,7 @@ my %CC_SUPPORTS_OS = ( 61@@ -406,7 +410,7 @@ my %CC_SUPPORTS_OS = (
48 'bcc' => [ 'windows', ], 62 'bcc' => [ 'windows', ],
49 'compaq' => [ 'linux', 'tru64', ], 63 'compaq' => [ 'linux', 'tru64', ],
50 'ekopath' => [ 'linux', ], 64 'ekopath' => [ 'linux', ],
51- 'gcc' => [ 'aix', 'beos', 'cygwin', 'darwin', 'freebsd', 'hpux', 'irix',  65- 'gcc' => [ 'aix', 'beos', 'cygwin', 'darwin', 'freebsd', 'hpux', 'irix',
52+ 'gcc' => [ 'aix', 'beos', 'cygwin', 'dragonfly', 'darwin', 'freebsd', 'hpux', 'irix',  66+ 'gcc' => [ 'aix', 'beos', 'cygwin', 'dragonfly', 'darwin', 'freebsd', 'hpux', 'irix',
53 'linux', 'netbsd', 'openbsd', 'qnx', 'solaris', 'tru64',  67 'linux', 'netbsd', 'openbsd', 'qnx', 'solaris', 'tru64',
54 'windows', ], 68 'windows', ],
55 'hpcc' => [ 'hpux', ], 69 'hpcc' => [ 'hpux', ],
56@@ -663,6 +668,7 @@ my %CC_ABI_FLAGS = ( 70@@ -663,6 +667,7 @@ my %CC_ABI_FLAGS = (
57 'gcc' => { 71 'gcc' => {
58 'amd64' => '-m64', 72 'amd64' => '-m64',
59 'freebsd' => '-pthread', 73 'freebsd' => '-pthread',
60+ 'dragonfly' => '-pthread', 74+ 'dragonfly' => '-pthread',
61 'mips32' => '-mabi=n32', 75 'mips32' => '-mabi=n32',
62 'mips64' => '-mabi=64', 76 'mips64' => '-mabi=64',
63 'netbsd' => '-pthread', 77 'netbsd' => '-pthread',
64@@ -772,6 +778,7 @@ my %REALNAME = ( 78@@ -772,6 +777,7 @@ my %REALNAME = (
65 'darwin' => 'Darwin / MacOS X', 79 'darwin' => 'Darwin / MacOS X',
66 'ekopath' => 'PathScale EKOPath C++', 80 'ekopath' => 'PathScale EKOPath C++',
67 'freebsd' => 'FreeBSD', 81 'freebsd' => 'FreeBSD',
68+ 'dragonfly' => 'DragonFly', 82+ 'dragonfly' => 'DragonFly',
69 'gcc' => 'GNU C++', 83 'gcc' => 'GNU C++',
70 'hpcc' => 'HP-UX C++', 84 'hpcc' => 'HP-UX C++',
71 'hppa' => 'HP-PA', 85 'hppa' => 'HP-PA',
72@@ -1696,12 +1703,6 @@ sub guess_triple 86@@ -1696,12 +1702,6 @@ sub guess_triple
73 my @CCS = ('gcc', 'icc', 'compaq', 'kai'); # Skips several, oh well... 87 my @CCS = ('gcc', 'icc', 'compaq', 'kai'); # Skips several, oh well...
74  88
75 # First try the CC enviornmental variable, if it's set 89 # First try the CC enviornmental variable, if it's set
76- if(defined($ENV{CC})) 90- if(defined($ENV{CC}))
77- { 91- {
78- my @new_CCS = ($ENV{CC}); 92- my @new_CCS = ($ENV{CC});
79- foreach my $cc (@CCS) { push @new_CCS, $cc; } 93- foreach my $cc (@CCS) { push @new_CCS, $cc; }
80- @CCS = @new_CCS; 94- @CCS = @new_CCS;
81- } 95- }
82  96
83 my $cc = ''; 97 my $cc = '';
84 foreach (@CCS) 98 foreach (@CCS)
85@@ -2040,8 +2041,12 @@ sub print_unix_makefile { 99@@ -2040,8 +2040,12 @@ sub print_unix_makefile {
86 my $link_to = "-lm"; 100 my $link_to = "-lm";
87 foreach my $lib (@{ $lib_list }) 101 foreach my $lib (@{ $lib_list })
88 { 102 {
89+ if ($lib =~ m/pthread/) { 103+ if ($lib =~ m/pthread/) {
90+ $link_to .= " -" . $lib; 104+ $link_to .= " -" . $lib;
91+ } else { 105+ } else {
92 $link_to .= " -l" . $lib; 106 $link_to .= " -l" . $lib;
93 } 107 }
94+ } 108+ }
95  109
96 ################################################## 110 ##################################################
97 # Generate a few variables # 111 # Generate a few variables #
98@@ -2279,12 +2284,12 @@ $__TAB__\@for i in \$(HEADERS); do \\ 112@@ -2279,12 +2283,12 @@ $__TAB__\@for i in \$(HEADERS); do \\
99 $__TAB__ \$(INSTALL_CMD_DATA) \$\$i \$(HEADERDIR); \\ 113 $__TAB__ \$(INSTALL_CMD_DATA) \$\$i \$(HEADERDIR); \\
100 $__TAB__ done 114 $__TAB__ done
101 $__TAB__\@\$(INSTALL_CMD_DATA) \$(STATIC_LIB) \$(LIBDIR) 115 $__TAB__\@\$(INSTALL_CMD_DATA) \$(STATIC_LIB) \$(LIBDIR)
102-$__TAB__\@\$(INSTALL_CMD_EXEC) \$(CONFIG_SCRIPT) \$(BINDIR) 116-$__TAB__\@\$(INSTALL_CMD_EXEC) \$(CONFIG_SCRIPT) \$(BINDIR)
103+$__TAB__\@\${BSD_INSTALL_SCRIPT} \$(CONFIG_SCRIPT) \$(BINDIR) 117+$__TAB__\@\${BSD_INSTALL_SCRIPT} \$(CONFIG_SCRIPT) \$(BINDIR)
104 END_OF_INSTALL_SCRIPTS 118 END_OF_INSTALL_SCRIPTS
105  119
106 if($make_shared) { 120 if($make_shared) {
107 print $makefile <<END_OF_SYMLINKS; 121 print $makefile <<END_OF_SYMLINKS;
108-$__TAB__\@\$(INSTALL_CMD_EXEC) \$(SHARED_LIB) \$(LIBDIR) 122-$__TAB__\@\$(INSTALL_CMD_EXEC) \$(SHARED_LIB) \$(LIBDIR)
109+$__TAB__\@\${BSD_INSTALL_LIB} \$(SHARED_LIB) \$(LIBDIR) 123+$__TAB__\@\${BSD_INSTALL_LIB} \$(SHARED_LIB) \$(LIBDIR)
110 $__TAB__\$(CD) \$(LIBDIR); \$(LN) \$(SYMLINK0) \$(SYMLINK1) 124 $__TAB__\$(CD) \$(LIBDIR); \$(LN) \$(SYMLINK0) \$(SYMLINK1)
111 $__TAB__\$(CD) \$(LIBDIR); \$(LN) \$(SYMLINK1) \$(SYMLINK2) 125 $__TAB__\$(CD) \$(LIBDIR); \$(LN) \$(SYMLINK1) \$(SYMLINK2)