diff options
Diffstat (limited to 'databases/p5-DBD-ODBC')
| -rw-r--r-- | databases/p5-DBD-ODBC/Makefile | 6 | ||||
| -rw-r--r-- | databases/p5-DBD-ODBC/distinfo | 9 | ||||
| -rw-r--r-- | databases/p5-DBD-ODBC/patches/patch-aa | 72 |
3 files changed, 8 insertions, 79 deletions
diff --git a/databases/p5-DBD-ODBC/Makefile b/databases/p5-DBD-ODBC/Makefile index ec8eb099da3..f9e5f16373a 100644 --- a/databases/p5-DBD-ODBC/Makefile +++ b/databases/p5-DBD-ODBC/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2009/07/07 15:23:15 sno Exp $ +# $NetBSD: Makefile,v 1.4 2009/09/12 18:54:50 sno Exp $ # -DISTNAME= DBD-ODBC-1.22 +DISTNAME= DBD-ODBC-1.23 PKGNAME= p5-${DISTNAME} CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DBD/} @@ -18,6 +18,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews PERL5_PACKLIST= auto/DBD/ODBC/.packlist +MAKE_ENV+= PERL_MM_USE_DEFAULT=1 + .include "../../databases/p5-DBI/buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-DBD-ODBC/distinfo b/databases/p5-DBD-ODBC/distinfo index 93f39228938..1eab9dd57db 100644 --- a/databases/p5-DBD-ODBC/distinfo +++ b/databases/p5-DBD-ODBC/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2009/06/14 21:23:57 sno Exp $ +$NetBSD: distinfo,v 1.3 2009/09/12 18:54:50 sno Exp $ -SHA1 (DBD-ODBC-1.22.tar.gz) = 31094dae98d2dbe04be6d4b21bebea6ce9b34e14 -RMD160 (DBD-ODBC-1.22.tar.gz) = b7c96f9cfd189c0fb17ed57d19c35bfcf54b03d7 -Size (DBD-ODBC-1.22.tar.gz) = 179081 bytes -SHA1 (patch-aa) = e731a710838e86f05c4f3b223f768968ba1d9489 +SHA1 (DBD-ODBC-1.23.tar.gz) = d8fbebb17733984e6fc06e093a572d89718777ce +RMD160 (DBD-ODBC-1.23.tar.gz) = f804c47c0382174f036b57dbb5aca30a8ac43613 +Size (DBD-ODBC-1.23.tar.gz) = 184925 bytes 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.*"; - |