--- a/components/fetchmail/Makefile	Thu Apr 11 10:40:20 2013 -0700
+++ b/components/fetchmail/Makefile	Thu Apr 11 10:50:53 2013 -0700
@@ -45,14 +45,21 @@
 CONFIGURE_OPTIONS  +=		--with-ssl
 CONFIGURE_OPTIONS  +=		--enable-NTLM
 
+# We don't have any .so files, so we want to ship the .py and .pyc files in
+# the same place as we would for 32-bit.
+PYTHON_VENDOR_PACKAGES.64 =	$(PYTHON_VENDOR_PACKAGES.32)
+
 ASLR_MODE = $(ASLR_ENABLE)
 
+COMPONENT_POST_INSTALL_ACTION = \
+    $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
+
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 

--- 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/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=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=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