From 4cc084570f3de1d1868c69637a8f24ed6094ba10 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sat, 15 Mar 2008 18:49:33 +0000
Subject: [PATCH] Also substitute arch in the pkginfo template.

---
 buildpkg.packaging.solaris | 9 +++++----
 pkginfo.in                 | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index 15bd865..c0c9723 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -33,7 +33,7 @@ pkgdesc="mumble mubmle... hmm someone forgot to fill this out!"
 pkgedby="Tom G. Christensen"
 email=swpkg@jupiterrise.com
 
-cpu=`uname -p`
+arch=`uname -p`
 os=sunos`$UNAME -r`
 # Courtesy of nba (see dm2conv/solaris/mkpkg.sh)
 #case $os in
@@ -66,11 +66,11 @@ configure_args='--prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefi
 [ -r $buildpkgbase/scripts/config.`hostname`.solaris ] && . $buildpkgbase/scripts/config.`hostname`.solaris
 
 # Distfiles should be named like this
-# <name>-<version>-<pkgver>.sb-<os>-<cpu>-<pkgdirdesig>
-# ie: libmad-0.14.2b-1.sb-sol5.8-sparcv9-local
+# <name>-<version>-<pkgver>.sb-<os>-<arch>-<pkgdirdesig>
+# ie: libmad-0.14.2b-1.sb-sol5.8-sparc-local
 # We hardquote it so that we can control when we want it
 # evaluated (using _upls)
-distfile='$secname-$version-$secver.tgc-$os-$cpu-$pkgdirdesig'
+distfile='$secname-$version-$secver.tgc-$os-$arch-$pkgdirdesig'
 
 ##################################################### 
 # "external" functions
@@ -122,6 +122,7 @@ pack_info()
 	-e "s#%%pstamp%%#$pstamp#g" \
 	-e "s#%%email%%#$email#g" \
 	-e "s#%%maxinst%%#$maxinst#g" \
+	-e "s#%%arch%%#$arch#g" \
 	$pkginfo > $metadir/pkginfo.$secname
 }
 
diff --git a/pkginfo.in b/pkginfo.in
index cf0302f..19b8f40 100644
--- a/pkginfo.in
+++ b/pkginfo.in
@@ -1,6 +1,6 @@
 PKG="%%pkgname%%"
 NAME="%%name%%"
-ARCH="sparc"
+ARCH="%%arch%%"
 VERSION="%%version%%,REV=%%pkgver%%"
 CATEGORY="%%pkgcat%%"
 VENDOR="%%pkgvendor%%"