Convert to bl3. Make build with gcc3.

3 files changed, 49 insertions, 5 deletions

diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 8a795596bcf..a8cdd9f0fd5 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/29 09:58:28 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/14 18:49:52 wiz Exp $
 #
 
 DISTNAME=		DBD-Sybase-0.94
@@ -12,7 +12,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.mbay.net/~mpeppler/
 COMMENT=		Perl DBI/DBD driver for Sybase/MS-SQL databases
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/DBD/Sybase/.packlist
 
 BUILD_DEFS+=		USE_SYBASE_OPENCLIENT
@@ -33,9 +33,9 @@ PERL5_LDFLAGS+=		-Wl,${RPATH_FLAG}${_SYBASE}/lib
 MAKE_ENV+=		SYBASE=${_SYBASE}
 
 .if !defined(USE_SYBASE_OPENCLIENT)
-.  include "../../databases/freetds/buildlink2.mk"
+.  include "../../databases/freetds/buildlink3.mk"
 .endif
 
-.include "../../databases/p5-DBI/buildlink2.mk"
+.include "../../databases/p5-DBI/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-DBD-Sybase/distinfo b/databases/p5-DBD-Sybase/distinfo
index 8660862db7b..7a67d6bc1b3 100644
--- a/databases/p5-DBD-Sybase/distinfo
+++ b/databases/p5-DBD-Sybase/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/10/27 19:41:53 seb Exp $
+$NetBSD: distinfo,v 1.6 2004/05/14 18:49:52 wiz Exp $
 
 SHA1 (DBD-Sybase-0.94.tar.gz) = e11d85b31751253a0da3ccee5336504b1edc59de
 Size (DBD-Sybase-0.94.tar.gz) = 98551 bytes
 SHA1 (patch-aa) = 741edae7aaa75cf65ec00bae22692bc12f5e4c9f
+SHA1 (patch-ab) = 942ed3c795d33a2d9dcd4dfb4b784f0a7b8a3a42
diff --git a/databases/p5-DBD-Sybase/patches/patch-ab b/databases/p5-DBD-Sybase/patches/patch-ab
new file mode 100644
index 00000000000..61a87863b63
--- /dev/null
+++ b/databases/p5-DBD-Sybase/patches/patch-ab
@@ -0,0 +1,43 @@
+$NetBSD: patch-ab,v 1.1 2004/05/14 18:49:52 wiz Exp $
+
+--- dbdimp.c.orig	2001-12-13 02:05:26.000000000 +0100
++++ dbdimp.c
+@@ -1970,23 +1970,23 @@ static int syb_st_describe_proc(imp_sth,
+     PerlIO_printf(DBILOGFP, " describe_proc: %s %s %s\n", db, owner, proc);
+ 
+     if(db && *db) {
+-	sprintf(sql, "
+-select c.colid, c.name, c.usertype, c.prec, c.scale 
+- from %s..sysobjects o, %s..syscolumns c, %s..sysusers u
+- where c.id = o.id 
+-   and o.name = '%s'
+-   and o.type = 'P'
+-   and o.uid = u.uid
+-   and u.name = '%s'
++	sprintf(sql, "\
++select c.colid, c.name, c.usertype, c.prec, c.scale \
++ from %s..sysobjects o, %s..syscolumns c, %s..sysusers u\
++ where c.id = o.id \
++   and o.name = '%s'\
++   and o.type = 'P'\
++   and o.uid = u.uid\
++   and u.name = '%s'\
+ ", db, db, db, proc, owner);
+     } else {
+-	sprintf(sql, "
+-select c.colid, c.name, c.usertype, c.prec, c.scale 
+- from sysobjects o, syscolumns c
+- where c.id = o.id 
+-   and o.name = '%s'
+-   and o.type = 'P'
+-   and o.uid = user_id(u.uid
++	sprintf(sql, "\
++select c.colid, c.name, c.usertype, c.prec, c.scale \
++ from sysobjects o, syscolumns c\
++ where c.id = o.id \
++   and o.name = '%s'\
++   and o.type = 'P'\
++   and o.uid = user_id(u.uid\
+    and u.name = '%s'", proc, owner);
+     }
+ #endif