Update from version 1.19nb1 to 1.22.

Based on diffs and testing done by Jens Rehsack, while following
up on PR#39232, patch also submitted there.

Pkgsrc changes:
 o Support different oracle library options
 o Add HOMEPAGE using search.cpan.org


Upstream changes:

Changes in DBD-Oracle 1.21(svn rev 11067) 11th April 2008 ^

  Added Notes to README.win32.txt on installing Instant Client
    11.1.0.6.0 from John Scoles
  Added the oci_typecode_name method to get the name rather than
    just the number of an OCI_TYPECODE from John Scoles
  Fixed a unreported bug with Embedded Objects from John Scoles
  Fixes for #34621 & 33791 from RT cpan
  Added patch to allow faster fetch from REF CURSORs from Biswadeep Chowdhury
  Updated the Todo file for next version from John Scoles
  Added support for the 10.2 Data Interface for Persistent LOBs by John Scoles
  Changed the way pre-fetching is done by John Scoles
  Added support for Scrollable cursors from John Scoles
  Changed the max size of cache_rows to a sb4 rather than a int
    and or a ub4 from John Scoles
  Added support for Lobs in select of OCI Embedded Objects from
    John Scoles with a big thankyou to  Paul Weiss
  Fixed for embedded object in object from Paul Weiss
  Added support for direct insert of large XML data into XMLType
    fields from Hendrik Fuss & John Scoles
  Fixed memory leak (not releasing Temp Lob with OCILobFreeTemporary)
    when created for a bind from John Scoles
  Added support for bind_param_inout_array for use with execute_array
    from John Scoles
  Added enhancement for Embedded Objects handling from Paul G. Weiss
  Fixed to Makefile.PL let it read makefiles from other makes from
    Alexander V Alekseev
  Updated POD to tell users to Avoid Using "SQL Call" from Charles Jardine
  Updated POD to account for rt.cpan.org #30910: "DBD-Oracle crashes
    when trying to read empty LOB" from John Scoles
  Added DBD::Oracle impdata/threads patch from Jeffrey Klein

Changes in DBD-Oracle 1.20(svn rev 10517) 11th January 2008 ^

  Fixed lob test so it skips the one test that relies on it if v$
    session. from Rafael Kitover
  Fixed // with /* */ in dbdimp.c from John Scoles
  Fixed for execute_for_fetch in Oracle.pm returning 0 instead of
    0E0.  from Martin J. Evans
  Added README.64bit.txt that contains help for compiling on 64
    bit boxes from John Scoles
  Fixed typo in Oracle.pm from Tom R.
  Added support for ora_charset, ora_ncharset from Stephen J. Smith
  Fixed Makefile.PL for better handling of empty array in
    File::Find::find from Slaven Rezic
  Fixed references to README.clients.txt in Makefile.PL from  John Scoles
  Added PERL_NO_GET_CONTEXT for better multi-threaded support from John Scoles
  Changed required version of DBI to be 1.51 from John Scoles
  Fixed bug in 31lob.t from John Scoles
  Added notes on installing Instantclient .rpm to README.Lunix.txt
  Added support for OCI array bind from Alexander V Alekseev
  Added support for select of OCI Embedded Objects from John Scoles
  Added a tip in README.64bit.txt from cartmanltd
  Added fix to Makefile.PL for finding SQLplus for Ubuntu Server
    (but should work for others) from Martin J. Evans
  Added fix to Makefile.PL for Gentoo AMD64 from Tom R.
  Added fix to dbdimp.c for speed up of Null-Operations from Andreas Behal
  Added fix to dbdimp.c for SQLCS_NCHAR index use on varchar2s from
    Peter J. Holzer

2 files changed, 27 insertions, 7 deletions

diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index 1b8a186b297..a2875488a16 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -1,17 +1,27 @@
-# $NetBSD: Makefile,v 1.11 2008/10/19 19:17:44 he Exp $
+# $NetBSD: Makefile,v 1.12 2008/12/18 01:13:03 he Exp $
 
-DISTNAME=	DBD-Oracle-1.19
+DISTNAME=	DBD-Oracle-1.22
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBD/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://search.cpan.org/dist/DBD-Oracle/
 COMMENT=	Perl DBI/DBD driver for Oracle databases
 
 PERL5_PACKLIST=	auto/DBD/Oracle/.packlist
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-DBD-Oracle
+
+PKG_SUPPORTED_OPTIONS=	# empty
+PKG_SUGGESTED_OPTIONS=	# empty
+
+PKG_OPTIONS_REQUIRED_GROUPS=	oralib
+PKG_OPTIONS_GROUP.oralib=	lib32 libsys libbase
+PKG_SUGGESTED_OPTIONS.oralib=	libsys
+
 .include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
 
 .if !defined(ORACLE_HOME)
 PKG_FAIL_REASON+=	"You must set ORACLE_HOME to the location of your Oracle installation"
@@ -21,8 +31,18 @@ PKG_FAIL_REASON+=	"The location of ORACLE_HOME does not exist"
 
 BUILDLINK_PASSTHRU_DIRS+=	${ORACLE_HOME}
 
+.if !empty(PKG_OPTIONS:Mlib32)
+LDFLAGS+=	-L${ORACLE_HOME}/lib32
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${ORACLE_HOME}/lib32
+.elif !empty(PKG_OPTIONS:Mlib64)
 LDFLAGS+=	-L${ORACLE_HOME}/lib
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${ORACLE_HOME}/lib
+.elif !empty(PKG_OPTIONS:Mlibbase)
+LDFLAGS+=	-L${ORACLE_HOME}
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${ORACLE_HOME}
+.endif
+
+CFLAGS+=	-I${ORACLE_HOME}/rdbms/public/
 LDFLAGS+=	-lclntsh
 
 .include "../../databases/p5-DBI/buildlink3.mk"
diff --git a/databases/p5-DBD-Oracle/distinfo b/databases/p5-DBD-Oracle/distinfo
index 107ab2032ca..36f41c25644 100644
--- a/databases/p5-DBD-Oracle/distinfo
+++ b/databases/p5-DBD-Oracle/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/03/04 01:04:11 grant Exp $
+$NetBSD: distinfo,v 1.4 2008/12/18 01:13:03 he Exp $
 
-SHA1 (DBD-Oracle-1.19.tar.gz) = 881f87571bff6c934248325b8b0db8de2a5149f3
-RMD160 (DBD-Oracle-1.19.tar.gz) = f22598b160de4f8b72c86c143e481594f290cd67
-Size (DBD-Oracle-1.19.tar.gz) = 369617 bytes
+SHA1 (DBD-Oracle-1.22.tar.gz) = 23df4d0bdf4bc4da21dadc31aaa7dba443a7e9ce
+RMD160 (DBD-Oracle-1.22.tar.gz) = a23804d9f803b245a9e22e050952cd0750da2e19
+Size (DBD-Oracle-1.22.tar.gz) = 424624 bytes