--- a/components/perl_modules/DBI/Makefile	Mon May 23 14:58:25 2011 -0700
+++ b/components/perl_modules/DBI/Makefile	Tue May 24 16:16:36 2011 -0700
@@ -20,19 +20,27 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		DBI
 COMPONENT_VERSION=	1.58
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:5f5861728c85b3998eb5a6db3703f46d0fc6faf1
+COMPONENT_ARCHIVE_URL=	http://backpan.perl.org/authors/id/T/TI/TIMB/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://search.cpan.org/~timb/DBI/
 
-COMPONENT_ARCHIVE_HASH=	sha1:5f5861728c85b3998eb5a6db3703f46d0fc6faf1
-COMPONENT_ARCHIVE_URL=	http://cr.opensolaris.org/~neuron/dbi/$(COMPONENT_ARCHIVE)
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/ips.mk
+include $(WS_TOP)/make-rules/makemaker.mk
 
-include ../../../make-rules/perl-variants.mk
-include ../../../make-rules/perl-generic.mk
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
 
-$(VARIANT_584)/.installed: \
-	PERL_FILES_TO_UPDATE_MAGIC_LINE=\
-	usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)-solaris-64int/goferperf.pl \
-	usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)-solaris-64int/dbixs_rev.pl
+COMPONENT_TEST_TARGETS = test
+test:		$(TEST_32)
+
+BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk