--- a/components/openscap/openscap-perl-512.p5m	Thu Jul 25 22:11:17 2013 -0700
+++ b/components/openscap/openscap-perl-512.p5m	Mon Jul 29 09:35:09 2013 -0700
@@ -21,25 +21,20 @@
 # Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/perl-5/openscap-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Perl 5.12 bindings for the Open implementation of SCAP"
-set name=com.oracle.info.description value="Perl 5.12 bindings for the Open implementation of SCAP"
-set name=com.oracle.info.tpno value=8008
-set name=info.classification value="org.opensolaris.category.2008:System/Security"
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/openscap-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Perl 5.12 bindings for the Open implementation of SCAP"
+set name=com.oracle.info.description \
+    value="Perl 5.12 bindings for the Open implementation of SCAP"
+set name=com.oracle.info.tpno value=13530
+set name=info.classification value=org.opensolaris.category.2008:System/Security
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2012/152
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2012/152
-set pkg.linted=true
 
-license openscap.license license=LGPLv2.1
-
-dir path=usr
-dir path=usr/perl5
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
 
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/_openscap_pm.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/openscap.pm
+license openscap.license license=LGPLv2.1