ADDED   build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey-contents.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey-contents.xml.in
==================================================================
--- /dev/null
+++ build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey-contents.xml.in
@@ -0,0 +1,6 @@
+<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>

ADDED   build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey.xml.in
==================================================================
--- /dev/null
+++ build/cackey_osx_build/Template_pmbuild.pmdoc/01libcackey.xml.in
@@ -0,0 +1,29 @@
+<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>

ADDED   build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey-contents.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey-contents.xml.in
==================================================================
--- /dev/null
+++ build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey-contents.xml.in
@@ -0,0 +1,6 @@
+<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>

ADDED   build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey.xml.in
==================================================================
--- /dev/null
+++ build/cackey_osx_build/Template_pmbuild.pmdoc/02libcackey.xml.in
@@ -0,0 +1,29 @@
+<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>

ADDED   build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey-contents.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey-contents.xml.in
==================================================================
--- /dev/null
+++ build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey-contents.xml.in
@@ -0,0 +1,7 @@
+<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>

ADDED   build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey.xml.in
==================================================================
--- /dev/null
+++ build/cackey_osx_build/Template_pmbuild.pmdoc/03libcackey.xml.in
@@ -0,0 +1,31 @@
+<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>

ADDED   build/cackey_osx_build/Template_pmbuild.pmdoc/index.xml.in
Index: build/cackey_osx_build/Template_pmbuild.pmdoc/index.xml.in
==================================================================
--- /dev/null
+++ build/cackey_osx_build/Template_pmbuild.pmdoc/index.xml.in
@@ -0,0 +1,91 @@
+<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>

Index: build/cackey_osx_build/build_osx.sh
==================================================================
--- build/cackey_osx_build/build_osx.sh
+++ build/cackey_osx_build/build_osx.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 # Shell Script to make Mac OS X Releases of CACKey
 # Kenneth Van Alstyne
 # kenneth.l.vanalstyne@usace.army.mil
-# 20100712
 CACKEY_VERSION=`cat configure.ac | grep AC_INIT | cut -d " " -f 2 | sed 's_)__'`
 
 # Usage function
 usage() {
 	echo "Usage: build_osx.sh <target>"
@@ -55,10 +54,13 @@
 panther() {
 	makedir
 	HEADERS=/Developer/SDKs/MacOSX10.3.9.sdk/System/Library/Frameworks/PCSC.framework/Versions/A/Headers/
 	LIBRARY=/Developer/SDKs/MacOSX10.3.9.sdk/System/Library/Frameworks/PCSC.framework/PCSC
 	OSX=Panther
+	PKTARGETOS=1
+	NEXTOSXVER=10.4
+	CUROSXVER=10.3
 	HOST=powerpc-apple-darwin7
 	make distclean
 	ARCH="ppc -mcpu=G3"
 	CFLAGS="-arch ${ARCH}" ./configure --with-pcsc-headers=${HEADERS} --with-pcsc-libs=${LIBRARY} --host=${HOST}
 	make
@@ -75,10 +77,13 @@
 	LIB=""
 	ARCHLIST=""
 	DLIB=""
 	DARCHLIST=""
 	OSX=Tiger
+	PKTARGETOS=2
+	NEXTOSXVER=10.5
+	CUROSXVER=10.4
 	for HOST in powerpc-apple-darwin8 i386-apple-darwin8; do
 		genbuild
 	done
 	libbuild
 	pkgbuild
@@ -92,10 +97,13 @@
 	LIB=""
 	ARCHLIST=""
 	DLIB=""
 	DARCHLIST=""
 	OSX=Leopard
+	PKTARGETOS=3
+	NEXTOSXVER=10.6
+	CUROSXVER=10.5
 	for HOST in powerpc-apple-darwin9 i386-apple-darwin9; do
 		genbuild
 	done
 	libbuild
 	pkgbuild
@@ -109,10 +117,13 @@
 	LIB=""
 	ARCHLIST=""
 	DLIB=""
 	DARCHLIST=""
 	OSX=SnowLeopard
+	PKTARGETOS=3
+	NEXTOSXVER=10.7
+	CUROSXVER=10.6
 	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
 		genbuild
 	done
 	libbuild
 	pkgbuild
@@ -153,10 +164,15 @@
 	rm -f build/cackey_osx_build/cackey.dylib
 	ln macbuild/${OSX}/libcackey.dylib build/cackey_osx_build/cackey.dylib
 	for PMDOC in build/cackey_osx_build/${OSX}_pmbuild.pmdoc/*.in; do
 		PMDOC="`echo "${PMDOC}" | sed 's_.in__g'`"
 		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}
 	done
 	if [ ${OSX} == "Panther" ]; then
 		EXT=mpkg
 	else
 		EXT=pkg