Make the installation path of doc files consistent with all other instalations

in Darwin and also register the installed header file.

3 files changed, 27 insertions, 11 deletions

diff --git a/security/botan/PLIST.Darwin b/security/botan/PLIST.Darwin
new file mode 100644
index 00000000000..af4001a9cb3
--- /dev/null
+++ b/security/botan/PLIST.Darwin
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2009/03/23 13:16:13 jmmv Exp $
+include/botan/es_ftw.h
diff --git a/security/botan/distinfo b/security/botan/distinfo
index 0adc4d364eb..fbba693a090 100644
--- a/security/botan/distinfo
+++ b/security/botan/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2008/01/05 05:06:52 obache Exp $
+$NetBSD: distinfo,v 1.6 2009/03/23 13:16:13 jmmv Exp $
 
 SHA1 (Botan-1.4.11.tgz) = 49b896fd90e7e80004f7596872238fb40e9748d9
 RMD160 (Botan-1.4.11.tgz) = c8aa827cf10151266b88e17c172999a6ccaab816
 Size (Botan-1.4.11.tgz) = 1802089 bytes
-SHA1 (patch-aa) = 5b39d48f201c40fea5f3c1b7b2c801506189bed0
+SHA1 (patch-aa) = 3f5d8bf18c16d1d4dc7a81e821459ee2ee3379f1
 SHA1 (patch-ab) = 478d91bce78f484fb8ba2d23ceecb462728b29db
 SHA1 (patch-ac) = 0981448664141b3effaf3e88f5f2317d70ebc786
 SHA1 (patch-ad) = feff04fc7383bb86df12e187a5788a0b867c47d7
diff --git a/security/botan/patches/patch-aa b/security/botan/patches/patch-aa
index eaefb6b6d89..be140c600b3 100644
--- a/security/botan/patches/patch-aa
+++ b/security/botan/patches/patch-aa
@@ -1,7 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2009/03/23 13:16:13 jmmv Exp $
 
---- configure.pl.orig	2006-01-01 01:02:28.000000000 +0000
+--- configure.pl.orig	2006-01-01 02:02:28.000000000 +0100
 +++ configure.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/Users/jmmv/Applications/pkg/bin/perl -w
+ 
+ # Warning: This file is machine-generated; any changes will be lost. Instead,
+ # change mkconfig.pl and the system description files. If you find a bug in
 @@ -74,7 +74,6 @@ my %DOCS = (
     'deprecated.txt' => $DOC_DIR,
     'license.txt' => $DOC_DIR,
@@ -34,7 +40,15 @@ $NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $
     'hpux'           => 'unix',
     'irix'           => 'unix',
     'linux'          => 'unix',
-@@ -387,6 +389,9 @@ my %INSTALL_INFO = (
+@@ -372,7 +374,6 @@ my %INSTALL_INFO = (
+       'root'       => 'c:\Botan',
+       },
+    'darwin'     => {
+-      'docs'       => 'doc',
+       'group'      => 'wheel',
+       },
+    'defaults'   => {
+@@ -387,6 +388,9 @@ my %INSTALL_INFO = (
     'freebsd'    => {
        'group'      => 'wheel',
        },
@@ -44,7 +58,7 @@ $NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $
     'netbsd'     => {
        'group'      => 'wheel',
        },
-@@ -406,7 +411,7 @@ my %CC_SUPPORTS_OS = (
+@@ -406,7 +410,7 @@ my %CC_SUPPORTS_OS = (
     'bcc'        => [ 'windows', ],
     'compaq'     => [ 'linux', 'tru64', ],
     'ekopath'    => [ 'linux', ],
@@ -53,7 +67,7 @@ $NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $
                       'linux', 'netbsd', 'openbsd', 'qnx', 'solaris', 'tru64', 
                       'windows', ],
     'hpcc'       => [ 'hpux', ],
-@@ -663,6 +668,7 @@ my %CC_ABI_FLAGS = (
+@@ -663,6 +667,7 @@ my %CC_ABI_FLAGS = (
     'gcc'        => {
        'amd64'      => '-m64',
        'freebsd'    => '-pthread',
@@ -61,7 +75,7 @@ $NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $
        'mips32'     => '-mabi=n32',
        'mips64'     => '-mabi=64',
        'netbsd'     => '-pthread',
-@@ -772,6 +778,7 @@ my %REALNAME = (
+@@ -772,6 +777,7 @@ my %REALNAME = (
     'darwin'         => 'Darwin / MacOS X',
     'ekopath'        => 'PathScale EKOPath C++',
     'freebsd'        => 'FreeBSD',
@@ -69,7 +83,7 @@ $NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $
     'gcc'            => 'GNU C++',
     'hpcc'           => 'HP-UX C++',
     'hppa'           => 'HP-PA',
-@@ -1696,12 +1703,6 @@ sub guess_triple
+@@ -1696,12 +1702,6 @@ sub guess_triple
          my @CCS = ('gcc', 'icc', 'compaq', 'kai'); # Skips several, oh well...
  
          # First try the CC enviornmental variable, if it's set
@@ -82,7 +96,7 @@ $NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $
  
          my $cc = '';
          foreach (@CCS)
-@@ -2040,8 +2041,12 @@ sub print_unix_makefile {
+@@ -2040,8 +2040,12 @@ sub print_unix_makefile {
     my $link_to = "-lm";
     foreach my $lib (@{ $lib_list })
     {
@@ -95,7 +109,7 @@ $NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $
  
     ##################################################
     # Generate a few variables                       #
-@@ -2279,12 +2284,12 @@ $__TAB__\@for i in \$(HEADERS); do \\
+@@ -2279,12 +2283,12 @@ $__TAB__\@for i in \$(HEADERS); do \\
  $__TAB__   \$(INSTALL_CMD_DATA) \$\$i \$(HEADERDIR); \\
  $__TAB__ done
  $__TAB__\@\$(INSTALL_CMD_DATA) \$(STATIC_LIB) \$(LIBDIR)