--- a/components/fetchmail/fetchmail.p5m	Thu Apr 11 10:40:20 2013 -0700
+++ b/components/fetchmail/fetchmail.p5m	Thu Apr 11 10:50:53 2013 -0700
@@ -22,27 +22,24 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
-<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:/mail/[email protected]$(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=pkg.fmri \
+    value=pkg:/mail/[email protected]$(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=com.oracle.info.description value="the fetchmail utility"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+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/2008/135
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/135
-
-license fetchmail.license license=GPLv2
-
-file path=usr/bin/fetchmail
-file path=usr/bin/fetchmailconf
-file path=usr/lib/python2.6/vendor-packages/fetchmailconf.py
+file usr/bin/$(MACH64)/fetchmail path=usr/bin/fetchmail
+file usr/bin/$(MACH64)/fetchmailconf path=usr/bin/fetchmailconf
+file path=usr/lib/python2.6/vendor-packages/fetchmailconf.py \
+    pkg.tmp.autopyc=false
 file path=usr/lib/python2.6/vendor-packages/fetchmailconf.pyc
-file path=usr/lib/python2.6/vendor-packages/fetchmailconf.pyo
 file path=usr/share/locale/ca/LC_MESSAGES/fetchmail.mo
 file path=usr/share/locale/cs/LC_MESSAGES/fetchmail.mo
 file path=usr/share/locale/da/LC_MESSAGES/fetchmail.mo
@@ -68,3 +65,4 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
 file path=usr/share/man/man1/fetchmail.1
 file path=usr/share/man/man1/fetchmailconf.1
+license fetchmail.license license=GPLv2