DELETED build/cackey_osx_build/Leopard_pmbuild.pmdoc/01libcackey-contents.xml.in
Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/01libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/01libcackey-contents.xml.in
+++ /dev/null
@@ -1,6 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/Leopard/libcackey.dylib" m="false" t="file">
-		<mod>owner</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Leopard_pmbuild.pmdoc/01libcackey.xml
Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/01libcackey.xml
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/01libcackey.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<pkgref spec="1.12" uuid="E0C4023B-5D9C-4A6A-8855-14DBA17A436E">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXLeopard.libcackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/Leopard/libcackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>relocatable</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>01libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Leopard_pmbuild.pmdoc/02libcackey-contents.xml.in
Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/02libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/02libcackey-contents.xml.in
+++ /dev/null
@@ -1,6 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey_g.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/Leopard/libcackey_g.dylib" m="false" t="file">
-		<mod>owner</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Leopard_pmbuild.pmdoc/02libcackey.xml
Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/02libcackey.xml
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/02libcackey.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<pkgref spec="1.12" uuid="EA4726BC-BC16-4BD1-A387-2E2165C5E7C9">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXLeopard.libcackeyg.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/Leopard/libcackey_g.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>relocatable</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>02libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Leopard_pmbuild.pmdoc/03libcackey-contents.xml.in
Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/03libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/03libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="cackey.dylib" o="root" g="wheel" p="33261" pt="@@BUILDROOTDIR@@/build/cackey_osx_build/cackey.dylib" m="true" t="file">
-		<mod>owner</mod>
-		<mod>mode</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Leopard_pmbuild.pmdoc/03libcackey.xml
Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/03libcackey.xml
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/03libcackey.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<pkgref spec="1.12" uuid="2D6351CA-8D40-437C-B125-27393CE52BE2">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXLeopard.cackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">cackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/usr/lib/pkcs11</installTo>
-		<flags></flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>installTo.isAbsoluteType</mod>
-		<mod>installTo.isRelativeType</mod>
-		<mod>scripts.postflight.path</mod>
-		<mod>relocatable</mod>
-		<mod>version</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>03libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Leopard_pmbuild.pmdoc/index.xml
Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/index.xml
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/index.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<pkmkdoc spec="1.12">
-	<properties>
-		<title>CACKey for Mac OS X Leopard</title>
-		<build>/Users/kvanals/Desktop/cackey/release/cackey-0.5.15/macbuild/pkg/cackey_leopard.pkg</build>
-		<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>
-	<description>CACKey</description>
-	<contents>
-		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
-			<pkgref id="mil.army.usace.cackeyForMacOsXLeopard.libcackey.pkg"/>
-			<pkgref id="mil.army.usace.cackeyForMacOsXLeopard.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.cackeyForMacOsXLeopard.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>\
-------------------------------------------------\
-\
-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):\
-	config.guess, config.sub, install-sh\
-\
-The files in the source directory and the "leakcheck" directory are the intellectual\
-property of the United States Government.  It is not clear which, if any,\
-license is made on them.  In addition, as of 07-JUN-2010 they have not be\
-cleared for public release.\
-\
-The files in the "pkcs11/" directory are licensed under the terms of the\
-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
-{\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 or\
-/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
-\
-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.6'">
-			<message>This CACKey release requires Mac OS X 10.5.</message>
-		</requirement>
-		<requirement id="tosv" operator="ge" value="'10.5'">
-			<message>This CACKey release requires Mac OS X 10.5.</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.title</mod>
-	<mod>description</mod>
-	<mod>properties.systemDomain</mod>
-	<mod>properties.anywhereDomain</mod>
-</pkmkdoc>

DELETED build/cackey_osx_build/Panther_pmbuild.pmdoc/01libcackey-contents.xml.in
Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/01libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/01libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/Panther/libcackey.dylib" m="true" t="file">
-		<mod>owner</mod>
-		<mod>mode</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Panther_pmbuild.pmdoc/01libcackey.xml
Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/01libcackey.xml
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/01libcackey.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<pkgref spec="1.12" uuid="C600D784-E505-4FE6-A6C0-F0F65D56B0D8">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXPanther.libcackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/Panther/libcackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>installTo.isAbsoluteType</mod>
-		<mod>installTo.isRelativeType</mod>
-		<mod>scripts.postflight.path</mod>
-		<mod>relocatable</mod>
-		<mod>version</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>01libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Panther_pmbuild.pmdoc/02libcackey-contents.xml.in
Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/02libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/02libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey_g.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/Panther/libcackey_g.dylib" m="true" t="file">
-		<mod>group</mod>
-		<mod>mode</mod>
-		<mod>owner</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Panther_pmbuild.pmdoc/02libcackey.xml
Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/02libcackey.xml
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/02libcackey.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<pkgref spec="1.12" uuid="488A2642-E2C6-4E59-9DB0-B4C125EB1522">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXPanther.libcackeyg.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/Panther/libcackey_g.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>relocatable</mod>
-		<mod>version</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>02libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Panther_pmbuild.pmdoc/03libcackey-contents.xml.in
Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/03libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/03libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="cackey.dylib" o="root" g="wheel" p="33261" pt="@@BUILDROOTDIR@@/build/cackey_osx_build/cackey.dylib" m="true" t="file">
-		<mod>owner</mod>
-		<mod>mode</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Panther_pmbuild.pmdoc/03libcackey.xml
Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/03libcackey.xml
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/03libcackey.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<pkgref spec="1.12" uuid="D0519619-3C33-4348-85AD-35943D10A0EC">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXPanther.cackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">cackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/usr/lib/pkcs11</installTo>
-		<flags></flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>installTo.isAbsoluteType</mod>
-		<mod>installTo.isRelativeType</mod>
-		<mod>scripts.postflight.path</mod>
-		<mod>relocatable</mod>
-		<mod>version</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>03libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Panther_pmbuild.pmdoc/index.xml
Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/index.xml
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/index.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<pkmkdoc spec="1.12">
-	<properties>
-		<title>CACKey for Mac OS X Panther</title>
-		<build>/Users/kvanals/Desktop/cackey/release/cackey-0.5.15/macbuild/pkg/CACKey_Panther.mpkg</build>
-		<organization>mil.army.usace</organization>
-		<userSees ui="both"/>
-		<min-target os="1"/>
-		<domain system="true"/>
-	</properties>
-	<distribution>
-		<versions min-spec="1.000000"/>
-		<scripts></scripts>
-	</distribution>
-	<description>CACKey</description>
-	<contents>
-		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
-			<pkgref id="mil.army.usace.cackeyForMacOsXPanther.libcackey.pkg"/>
-			<pkgref id="mil.army.usace.cackeyForMacOsXPanther.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.cackeyForMacOsXPanther.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>\
-------------------------------------------------\
-\
-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):\
-	config.guess, config.sub, install-sh\
-\
-The files in the source directory and the "leakcheck" directory are the intellectual\
-property of the United States Government.  It is not clear which, if any,\
-license is made on them.  In addition, as of 07-JUN-2010 they have not be\
-cleared for public release.\
-\
-The files in the "pkcs11/" directory are licensed under the terms of the\
-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
-{\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 or\
-/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
-\
-A debug version, /Library/CACKey/libcackey_g.dylib is provided if debug output is necessary.}]]>
-			</resource>
-		</locale>
-	</resources>
-	<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.title</mod>
-	<mod>description</mod>
-	<mod>properties.systemDomain</mod>
-	<mod>properties.anywhereDomain</mod>
-</pkmkdoc>

DELETED build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/01libcackey-contents.xml.in
Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/01libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/01libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/SnowLeopard/libcackey.dylib" m="true" t="file">
-		<mod>group</mod>
-		<mod>mode</mod>
-		<mod>owner</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/01libcackey.xml
Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/01libcackey.xml
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/01libcackey.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<pkgref spec="1.12" uuid="010A80A7-8A23-4C6C-86FB-07FAB90BE89A">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXSnowLeopard.libcackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/SnowLeopard/libcackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>i
-		<mod>relocatable</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>01libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/02libcackey-contents.xml.in
Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/02libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/02libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey_g.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/SnowLeopard/libcackey_g.dylib" m="true" t="file">
-		<mod>group</mod>
-		<mod>mode</mod>
-		<mod>owner</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/02libcackey.xml
Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/02libcackey.xml
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/02libcackey.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<pkgref spec="1.12" uuid="40DE63F7-E529-4A52-AD8F-1193B60A17CD">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXSnowLeopard.libcackeyg.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/SnowLeopard/libcackey_g.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>relocatable</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>02libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/03libcackey-contents.xml.in
Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/03libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/03libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="cackey.dylib" o="root" g="wheel" p="33261" pt="@@BUILDROOTDIR@@/build/cackey_osx_build/cackey.dylib" m="true" t="file">
-		<mod>owner</mod>
-		<mod>mode</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/03libcackey.xml
Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/03libcackey.xml
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/03libcackey.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<pkgref spec="1.12" uuid="BBEAD0C0-0DD8-4FA5-9150-D500B50893BA">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXSnowLeopard.cackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">cackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/usr/lib/pkcs11</installTo>
-		<flags></flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>installTo.isAbsoluteType</mod>
-		<mod>installTo.isRelativeType</mod>
-		<mod>scripts.postflight.path</mod>
-		<mod>relocatable</mod>
-		<mod>version</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>03libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/index.xml
Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/index.xml
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/index.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<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>\
-------------------------------------------------\
-\
-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):\
-	config.guess, config.sub, install-sh\
-\
-The files in the source directory and the "leakcheck" directory are the intellectual\
-property of the United States Government.  It is not clear which, if any,\
-license is made on them.  In addition, as of 07-JUN-2010 they have not be\
-cleared for public release.\
-\
-The files in the "pkcs11/" directory are licensed under the terms of the\
-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
-{\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 or\
-/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
-\
-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>

DELETED build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey-contents.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey-contents.xml.in
+++ /dev/null
@@ -1,6 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/Leopard/libcackey.dylib" m="false" t="file">
-		<mod>owner</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey.xml.in
==================================================================
--- build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey.xml.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<pkgref spec="1.12" uuid="@@UUID@@">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.libcackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/@@OSXVERSION@@/libcackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>relocatable</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>01libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey-contents.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey-contents.xml.in
+++ /dev/null
@@ -1,6 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey_g.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/Leopard/libcackey_g.dylib" m="false" t="file">
-		<mod>owner</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey.xml.in
==================================================================
--- build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey.xml.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<pkgref spec="1.12" uuid="@@UUID@@">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.libcackeyg.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/@@OSXVERSION@@/libcackey_g.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>relocatable</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>02libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey-contents.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="cackey.dylib" o="root" g="wheel" p="33261" pt="@@BUILDROOTDIR@@/build/cackey_osx_build/cackey.dylib" m="true" t="file">
-		<mod>owner</mod>
-		<mod>mode</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey.xml.in
==================================================================
--- build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey.xml.in
+++ /dev/null
@@ -1,31 +0,0 @@
-<pkgref spec="1.12" uuid="@@OSXVERSION@@">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.cackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">cackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/usr/lib/pkcs11</installTo>
-		<flags></flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>installTo.isAbsoluteType</mod>
-		<mod>installTo.isRelativeType</mod>
-		<mod>scripts.postflight.path</mod>
-		<mod>relocatable</mod>
-		<mod>version</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>03libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Template_pmbuild.pmdoc/index.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/index.xml.in
==================================================================
--- build/cackey_osx_build/Template_pmbuild.pmdoc/index.xml.in
+++ /dev/null
@@ -1,91 +0,0 @@
-<pkmkdoc spec="1.12">
-	<properties>
-		<title>CACKey for Mac OS X @@OSXVERSION@@</title>
-		<organization>mil.army.usace</organization>
-		<userSees ui="both"/>
-		<min-target os="@@TARGETOS@@"/>
-		<domain system="true"/>
-	</properties>
-	<distribution>
-		<versions min-spec="1.000000"/>
-		<scripts></scripts>
-	</distribution>
-	<description>CACKey</description>
-	<contents>
-		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
-			<pkgref id="mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.libcackey.pkg"/>
-			<pkgref id="mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.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.cackeyForMacOsX@@OSXVERSION@@.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>\
-------------------------------------------------\
-\
-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):\
-	config.guess, config.sub, install-sh\
-\
-The files in the source directory and the "leakcheck" directory are the intellectual\
-property of the United States Government.  It is not clear which, if any,\
-license is made on them.  In addition, as of 07-JUN-2010 they have not be\
-cleared for public release.\
-\
-The files in the "pkcs11/" directory are licensed under the terms of the\
-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
-{\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 or\
-/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
-\
-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="'@@NEXTOSXVER@@'">
-			<message>This CACKey release requires Mac OS X @@CUROSXVER@@.</message>
-		</requirement>
-		<requirement id="tosv" operator="ge" value="'@@CUROSXVER@@'">
-			<message>This CACKey release requires Mac OS X @@CUROSXVER@@.</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.title</mod>
-	<mod>description</mod>
-	<mod>properties.systemDomain</mod>
-	<mod>properties.anywhereDomain</mod>
-</pkmkdoc>

DELETED build/cackey_osx_build/Tiger_pmbuild.pmdoc/01libcackey-contents.xml.in
Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/01libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/01libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/Tiger/libcackey.dylib" m="true" t="file">
-		<mod>group</mod>
-		<mod>mode</mod>
-		<mod>owner</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Tiger_pmbuild.pmdoc/01libcackey.xml
Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/01libcackey.xml
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/01libcackey.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<pkgref spec="1.12" uuid="0053AD09-FC44-4658-8239-DAE1C0CE3874">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXTiger.libcackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/Tiger/libcackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>relocatable</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>01libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Tiger_pmbuild.pmdoc/02libcackey-contents.xml.in
Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/02libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/02libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="libcackey_g.dylib" o="root" g="admin" p="33261" pt="@@BUILDROOTDIR@@/macbuild/Tiger/libcackey_g.dylib" m="true" t="file">
-		<mod>group</mod>
-		<mod>mode</mod>
-		<mod>owner</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Tiger_pmbuild.pmdoc/02libcackey.xml
Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/02libcackey.xml
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/02libcackey.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<pkgref spec="1.12" uuid="FDF62936-7E3E-4AC3-8D34-3D1A41FE940D">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXTiger.libcackeyg.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">../../macbuild/Tiger/libcackey_g.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
-		<flags>
-			<followSymbolicLinks/>
-		</flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>relocatable</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>02libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Tiger_pmbuild.pmdoc/03libcackey-contents.xml.in
Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/03libcackey-contents.xml.in
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/03libcackey-contents.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<pkg-contents spec="1.12">
-	<f n="cackey.dylib" o="root" g="wheel" p="33261" pt="@@BUILDROOTDIR@@/build/cackey_osx_build/cackey.dylib" m="true" t="file">
-		<mod>owner</mod>
-		<mod>mode</mod>
-		<mod>group</mod>
-	</f>
-</pkg-contents>

DELETED build/cackey_osx_build/Tiger_pmbuild.pmdoc/03libcackey.xml
Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/03libcackey.xml
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/03libcackey.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<pkgref spec="1.12" uuid="8C7D5EB7-5C34-440C-BB17-055437B7ECF2">
-	<config>
-		<identifier>mil.army.usace.cackeyForMacOsXTiger.cackey.pkg</identifier>
-		<version>1</version>
-		<description></description>
-		<post-install type="none"/>
-		<requireAuthorization/>
-		<installFrom relative="true" mod="true">cackey.dylib</installFrom>
-		<installTo mod="true" relocatable="true">/usr/lib/pkcs11</installTo>
-		<flags></flags>
-		<packageStore type="internal"></packageStore>
-		<mod>parent</mod>
-		<mod>scripts.postinstall.path</mod>
-		<mod>installTo.isAbsoluteType</mod>
-		<mod>installTo.isRelativeType</mod>
-		<mod>scripts.postflight.path</mod>
-		<mod>relocatable</mod>
-		<mod>version</mod>
-		<mod>installTo.path</mod>
-		<mod>installFrom.path</mod>
-		<mod>installTo</mod>
-	</config>
-	<contents>
-		<file-list>03libcackey-contents.xml</file-list>
-		<filter>/CVS$</filter>
-		<filter>/\.svn$</filter>
-		<filter>/\.cvsignore$</filter>
-		<filter>/\.cvspass$</filter>
-		<filter>/\.DS_Store$</filter>
-	</contents>
-</pkgref>

DELETED build/cackey_osx_build/Tiger_pmbuild.pmdoc/index.xml
Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/index.xml
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/index.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<pkmkdoc spec="1.12">
-	<properties>
-		<title>CACKey for Mac OS X Tiger</title>
-		<build>/Users/kvanals/Desktop/cackey/release/cackey-0.5.15/macbuild/pkg/cackey_tiger.mpkg</build>
-		<organization>mil.army.usace</organization>
-		<userSees ui="both"/>
-		<min-target os="2"/>
-		<domain system="true"/>
-	</properties>
-	<distribution>
-		<versions min-spec="1.000000"/>
-		<scripts></scripts>
-	</distribution>
-	<description>CACKey</description>
-	<contents>
-		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
-			<pkgref id="mil.army.usace.cackeyForMacOsXTiger.libcackey.pkg"/>
-			<pkgref id="mil.army.usace.cackeyForMacOsXTiger.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.cackeyForMacOsXTiger.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>\
-------------------------------------------------\
-\
-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):\
-	config.guess, config.sub, install-sh\
-\
-The files in the source directory and the "leakcheck" directory are the intellectual\
-property of the United States Government.  It is not clear which, if any,\
-license is made on them.  In addition, as of 07-JUN-2010 they have not be\
-cleared for public release.\
-\
-The files in the "pkcs11/" directory are licensed under the terms of the\
-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
-{\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 or\
-/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
-\
-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.5'">
-			<message>This CACKey release requires Mac OS X 10.4.</message>
-		</requirement>
-		<requirement id="tosv" operator="ge" value="'10.4'">
-			<message>This CACKey release requires Mac OS X 10.4.</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.title</mod>
-	<mod>description</mod>
-	<mod>properties.systemDomain</mod>
-	<mod>properties.anywhereDomain</mod>
-</pkmkdoc>

Index: build/cackey_osx_build/build_osx.sh
==================================================================
--- build/cackey_osx_build/build_osx.sh
+++ build/cackey_osx_build/build_osx.sh
@@ -18,16 +18,13 @@
 	exit $?
 }
 
 # Clean up function
 clean() {
-	for PMDOC in build/cackey_osx_build/*_pmbuild.pmdoc/*.in; do
-		PMDOC="`echo "${PMDOC}" | sed 's_.in__g'`"
-		rm -f "${PMDOC}"
-	done
 	rm -f build/cackey_osx_build/cackey.dylib
 	rm -rf macbuild
+	rm -rf build/cackey_osx_build/*.pmdoc
 	make distclean
 }
 
 # Directory creation function
 makedir() {
@@ -34,11 +31,11 @@
 	if [ ! -d macbuild ]; then
 		mkdir macbuild
 		mkdir macbuild/Panther
 		mkdir macbuild/Tiger
 		mkdir macbuild/Leopard
-		mkdir macbuild/SnowLeopard
+		mkdir macbuild/Snowleopard
 		mkdir macbuild/pkg
 	fi
 	if [ ! -f config.guess ]; then
 		cp /Developer/usr/share/libtool/config.guess .
 	fi
@@ -116,11 +113,11 @@
 	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
 	LIB=""
 	ARCHLIST=""
 	DLIB=""
 	DARCHLIST=""
-	OSX=SnowLeopard
+	OSX=Snowleopard
 	PKTARGETOS=3
 	NEXTOSXVER=10.7
 	CUROSXVER=10.6
 	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
 		genbuild
@@ -161,26 +158,33 @@
 
 # Function to build Mac OS X Packages
 pkgbuild() {
 	rm -f build/cackey_osx_build/cackey.dylib
 	ln macbuild/${OSX}/libcackey.dylib build/cackey_osx_build/cackey.dylib
-	# When Template build is ready to go, change ${OSX} to Template in line below
-	for PMDOC in build/cackey_osx_build/${OSX}_pmbuild.pmdoc/*.in; do
-		PMDOC="`echo "${PMDOC}" | sed 's_.in__g'`"
+	for PMDOC in build/cackey_osx_build/Template_pmbuild/*.in; do
+		PMDOC="`echo "${PMDOC}" | sed 's|l.in|l|g' | sed 's|build/cackey_osx_build/Template_pmbuild/||g'`"
 		UUID="`python -c 'import uuid; print uuid.uuid1()' | dd conv=ucase 2>/dev/null`"
-		sed "s|@@BUILDROOTDIR@@|$(pwd)|g" ${PMDOC}.in > ${PMDOC}
-		sed "s|@@OSXVERSION@@|${OSX}|g" ${PMDOC}.in > ${PMDOC}
-		sed "s|@@UUID@@|${UUID}|g" ${PMDOC}.in > ${PMDOC}
-		sed "s|@@TARGETOS@@|${PKTARGETOS}|g" ${PMDOC}.in > ${PMDOC}
-		sed "s|@@NEXTOSXVER@@|${NEXTOSXVER}|g" ${PMDOC}.in > ${PMDOC}
-		sed "s|@@CUROSXVER@@|${CUROSXVER}|g" ${PMDOC}.in > ${PMDOC}
+		mkdir -p build/cackey_osx_build/${OSX}_pmbuild.pmdoc
+		sed "s|@@BUILDROOTDIR@@|$(pwd)|g" build/cackey_osx_build/Template_pmbuild/${PMDOC}.in > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
+		sed "s|@@OSXVERSION@@|${OSX}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
+		sed "s|@@UUID@@|${UUID}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
+		sed "s|@@TARGETOS@@|${PKTARGETOS}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
+		sed "s|@@NEXTOSXVER@@|${NEXTOSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
+		sed "s|@@CUROSXVER@@|${CUROSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
+		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
 	done
 	if [ ${OSX} == "Panther" ]; then
 		EXT=mpkg
+		cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | grep -v -i require > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new
+		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml
 	else
 		EXT=pkg
 	fi
+	if [ ${OSX} == "Snowleopard" ]; then
+		cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | sed 's|for Mac OS X Snowleopard|for Mac OS X SnowLeopard|g' > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new
+	mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml
+	fi
 	/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -d build/cackey_osx_build/${OSX}_pmbuild.pmdoc -o macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}
 	tar --create --directory macbuild/pkg/ --file macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}.tar CACKey_${CACKEY_VERSION}_${OSX}.${EXT}
 	gzip -9 macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}.tar
 	rm -rf macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}
 	rm -f build/cackey_osx_build/cackey.dylib