@@ -1,17 +1,42 @@
-<pkmkdoc spec="1.12"><properties><title>CACKey for Mac OS X Snow Leopard</title><organization>mil.army.usace</organization><userSees ui="both"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="libcackey" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.libcackey.pkg"/></choice><choice title="libcackey_g" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.libcackeyg.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+<pkmkdoc spec="1.12">
+	<properties>
+		<title>CACKey for Mac OS X Snow Leopard</title>
+		<organization>mil.army.usace</organization>
+		<userSees ui="both"/>
+		<min-target os="3"/>
+		<domain system="true"/>
+	</properties>
+	<distribution>
+		<versions min-spec="1.000000"/>
+		<scripts></scripts>
+	</distribution>
+	<contents>
+		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.libcackey.pkg"/>
+			<pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.cackey.pkg"/>
+		</choice>
+		<choice title="CACKey PKCS#11 Library (Debug)" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.libcackeyg.pkg"/>
+		</choice>
+	</contents>
+	<resources bg-scale="none" bg-align="topleft">
+		<locale lang="en">
+			<resource mime-type="text/rtf" kind="embedded" type="license">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Release information:\
     pkg: CACKey\
  author: US Army Corps of Engineers\
+Mac build contact: Kenneth Van Alstyne <kenneth.l.vanalstyne@usace.army.mil>\
+                   US Army Corps of Engineers\
+                   Information Technology Laboratory\
+                   Vicksburg, MS 39180\
 contact: Roy Keene <roy.s.keene@usace.army.mil>\
-         US Army Corps of Engineers\
-         Information Technology Laboratory\
-         Vicksburg, MS 39180\
 ------------------------------------------------\
 \
 The following files in the source directory are the intellectual property of the\
 Free Software Foundation and are licensed under the terms of the GNU General\
 Public License (GPL):\
@@ -26,15 +51,40 @@
 following licenses:\
 	mypkcs11.h : GNU General Public License 2.1.\
 	pkcs11.h   : GNU General Public License 2.1.\
 	pkcs11f.h  : GNU General Public License 2.1.\
 	pkcs11n.h  : Mozilla Public License or GNU General Public License\
-	pkcs11t.h  : GNU General Public License 2.1.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="readme"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+	pkcs11t.h  : GNU General Public License 2.1.}]]>
+			</resource>
+			<resource mime-type="text/rtf" kind="embedded" type="readme">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Thank you for choosing to install CACKey.\
 \
-To use CACKey, install /Library/CACKey/libcackey.dylib as a security module into any application that can use a PKCS#11 provider.\
+To use CACKey, install /Library/CACKey/libcackey.dylib or\
+/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
 \
-A debug version, libcackey_g.dylib is provided if debug output is necessary.}]]></resource></locale></resources><requirements><requirement id="tosv" operator="lt" value="'10.7'"><message>This CACKey release requires Mac OS X 10.6.</message></requirement><requirement id="tosv" operator="ge" value="'10.6'"><message>This CACKey release requires Mac OS X 10.6.</message></requirement></requirements><flags/><item type="file">01libcackey.xml</item><item type="file">02libcackey.xml</item><mod>properties.customizeOption</mod><mod>properties.userDomain</mod><mod>properties.title</mod><mod>properties.systemDomain</mod><mod>properties.anywhereDomain</mod></pkmkdoc>
+A debug version, /Library/CACKey/libcackey_g.dylib is provided if debug output is necessary.}]]>
+			</resource>
+		</locale>
+	</resources>
+	<requirements>
+		<requirement id="tosv" operator="lt" value="'10.7'">
+			<message>This CACKey release requires Mac OS X 10.6.</message>
+		</requirement>
+		<requirement id="tosv" operator="ge" value="'10.6'">
+			<message>This CACKey release requires Mac OS X 10.6.</message>
+		</requirement>
+	</requirements>
+	<flags/>
+	<item type="file">01libcackey.xml</item>
+	<item type="file">02libcackey.xml</item>
+	<item type="file">03libcackey.xml</item>
+	<mod>properties.customizeOption</mod>
+	<mod>properties.userDomain</mod>
+	<mod>properties.title</mod>
+	<mod>properties.systemDomain</mod>
+	<mod>properties.anywhereDomain</mod>
+</pkmkdoc>