summaryrefslogtreecommitdiff
path: root/databases/p5-DBD-ODBC/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'databases/p5-DBD-ODBC/patches/patch-aa')
-rw-r--r--databases/p5-DBD-ODBC/patches/patch-aa72
1 files changed, 0 insertions, 72 deletions
diff --git a/databases/p5-DBD-ODBC/patches/patch-aa b/databases/p5-DBD-ODBC/patches/patch-aa
deleted file mode 100644
index d2b3e084a6e..00000000000
--- a/databases/p5-DBD-ODBC/patches/patch-aa
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/05/17 13:29:15 sno Exp $
-
-# Fix issues detecting iODBC
-
---- Makefile.PL.orig 2009-05-16 08:36:54.000000000 +0000
-+++ Makefile.PL 2009-05-16 08:49:56.000000000 +0000
-@@ -154,7 +154,6 @@
-
- EOT
- }
-- prompt("Press return to continue...");
- }
- print "Overriding ODBC Directory with command line option: $opt_o\n"
- if $opt_o ;
-@@ -242,6 +241,7 @@
- # exist until 2.2.11 and it was broken wrt --cflags in 2.2.11/2.2.12
- # i.e. --cflags did not include -I/xxx/yyy
- my $odbc_config_v = `odbc_config --version 2>&1`;
-+ my $iodbc_config_v = `iodbc-config --version 2>&1`;
- print "Looking for odbc_config\n";
- if ($odbc_config_v && ($odbc_config_v =~ /^(\d\.)+/)) {
- print " Found odbc_config versions $odbc_config_v\n";
-@@ -257,6 +257,20 @@
- print " but cannot find header files in that path so ignoring\n";
- $odbchome = '';
- }
-+ } elsif ($iodbc_config_v && ($iodbc_config_v =~ /^(\d\.)+/)) {
-+ print " Found iodbc-config versions $iodbc_config_v\n";
-+ $odbchome = `iodbc-config --prefix 2>&1`;
-+ print " iodbc-config reports --prefix=$odbchome\n";
-+ chomp $odbchome;
-+ if ((-e $odbchome) && (-e "$odbchome/include") &&
-+ (-f "$odbchome/include/sql.h") &&
-+ (-f "$odbchome/include/sqlext.h") &&
-+ (-f "$odbchome/include/sqltypes.h")) {
-+ print " Set ODBCHOME to $odbchome from iodbc-config\n";
-+ } else {
-+ print " but cannot find header files in that path so ignoring\n";
-+ $odbchome = '';
-+ }
- } else {
- print " odbc_config not found - ok, there are other things I can do\n";
- }
-@@ -272,6 +286,11 @@
- -f '/usr/local/include/sqltypes.h') {
- print " Found sql header files in /use/local/include\n";
- $odbchome = '/usr/local';
-+ } elsif (-f '/usr/pkg/include/sql.h' &&
-+ -f '/usr/pkg/include/sqlext.h' &&
-+ -f '/usr/pkg/include/sqltypes.h') {
-+ print " Found sql header files in /use/pkg/include\n";
-+ $odbchome = '/usr/pkg';
- } elsif (-d '/usr/local/easysoft/unixODBC') {
- print " Found sql header files in /use/local/easysoft/include\n";
- $odbchome = '/usr/local/easysoft/unixODBC';
-@@ -346,13 +365,13 @@
- # fix to avoid foo..ext on many systems.
- $arext =~ s/^\.//;
-
-- $myodbc = 'unixodbc'
-- if !$myodbc && glob "$odbchome/lib/libodbc.*";
--
- $myodbc = 'iodbc'
- if !$myodbc && ((glob "$odbchome/*iodbc*") ||
- (glob "$odbchome/lib/*iodbc*"));
-
-+ $myodbc = 'unixodbc'
-+ if !$myodbc && glob "$odbchome/lib/libodbc.*";
-+
- $myodbc = 'empress'
- if !$myodbc && glob "$odbchome/lib/libempodbc.*";
-