--- a/components/fetchmail/fetchmail.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/fetchmail/fetchmail.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -25,7 +25,7 @@
 <transform file path=.*/vendor-packages/fetchmailconf.py$ -> default pkg.tmp.autopyc false>
 <transform file path=.*/vendor-packages/fetchmailconf.pyo$ -> drop>
 
-set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/mail/fetchmail@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="fetch mail from a POP, IMAP, ETRN, or ODMR-capable server"
 set name=pkg.description value="Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC."
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
@@ -35,10 +35,10 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/135/
 
-license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+license fetchmail.license license=GPLv2
 
 legacy pkg=SUNWfetchmail \
-    desc="Fetchmail Mail Retrieval and Forwarding Utility ($(IPS_COMPONENT_VERSION))" \
+    desc="Fetchmail Mail Retrieval and Forwarding Utility" \
     name="Fetchmail Mail Retrieval and Forwarding Utility"
 
 dir path=usr