From f38be83b81fd0a796c102ee638824a7756e00db6 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sun, 9 Mar 2008 10:57:29 +0000
Subject: [PATCH] Don't hardcode name of packager in pkginfo.in Add default
 configure args

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

diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index 5a381fe..ccd5506 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -24,11 +24,13 @@ META_CLEAN="prototype prototype.in pkginfo files.tmp"
 
 # Define defaults
 # pkginfo information.
-# The following 4 vars will be used when constructing the pkginfo file
 # Override as necessary.
 pkgcat="application"	# A reasonable default
 pkgvendor="http://change/me/please"
 pkgdesc="mumble mubmle... hmm someone forgot to fill this out!"
+
+# vendor & contact information
+pkgedby="Tom G. Christensen"
 email=swpkg@jupiterrise.com
 
 cpu=`uname -p`
@@ -57,6 +59,9 @@ ignore_unpackaged_files=0 # default to check for unpackaged files in the stage a
 # Solaris doesn't know how to handle any kind of compressed manpages
 gzman=0
 
+# Default configure args
+configure_args='--prefix=$prefix --mandir=${prefix}/${_mandir} --infodir=${prefix}/${_infodir}'
+
 # Host specific configuration
 [ -r $buildpkgbase/scripts/config.`hostname`.solaris ] && . $buildpkgbase/scripts/config.`hostname`.solaris
 
@@ -105,12 +110,12 @@ pack_info()
     fi
     local secname=$1
 
-    pstamp="$os-$($UNAME -n)`date '+%Y%m%d%H%M'`"
+    local pstamp="$os-$($UNAME -n)`date '+%Y%m%d%H%M'`"
 
     $SED -e "s#%%pkgname%%#$pkgname#g" \
 	-e "s#%%version%%#$version#g" \
 	-e "s#%%pkgcat%%#$pkgcat#g" \
-	-e "s#%%pkgvendor%%#$pkgvendor#g" \
+	-e "s#%%pkgvendor%%#$pkgvendor - packaged by $pkgedby#g" \
 	-e "s#%%pkgver%%#$pkgver#g" \
 	-e "s#%%name%%#$name#g" \
 	-e "s#%%topinstalldir%%#$topinstalldir#g" \
diff --git a/pkginfo.in b/pkginfo.in
index f828ade..92aa254 100644
--- a/pkginfo.in
+++ b/pkginfo.in
@@ -3,7 +3,7 @@ NAME="%%name%%"
 ARCH="sparc"
 VERSION="%%version%%,REV=%%pkgver%%"
 CATEGORY="%%pkgcat%%"
-VENDOR="%%pkgvendor%% - packaged by Tom G. Christensen"
+VENDOR="%%pkgvendor%%"
 EMAIL="%%email%%"
 PSTAMP="%%pstamp%%"
 BASEDIR="%%topinstalldir%%"