From 41f5645189c87954e29c8f0e45bb41e46bf64aea Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sun, 9 Mar 2008 15:51:32 +0000
Subject: [PATCH] Redefine NAME to be a shortname + description. This means the
 dedicated DESC field is removed and pkgdesc/shortdesc is added to NAME
 instead.

---
 buildpkg.packaging.solaris | 3 +--
 pkginfo.in                 | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index ccd5506..15bd865 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -117,9 +117,8 @@ pack_info()
 	-e "s#%%pkgcat%%#$pkgcat#g" \
 	-e "s#%%pkgvendor%%#$pkgvendor - packaged by $pkgedby#g" \
 	-e "s#%%pkgver%%#$pkgver#g" \
-	-e "s#%%name%%#$name#g" \
+	-e "s#%%name%%#$name - $pkgdesc#g" \
 	-e "s#%%topinstalldir%%#$topinstalldir#g" \
-	-e "s#%%pkgdesc%%#$pkgdesc#g" \
 	-e "s#%%pstamp%%#$pstamp#g" \
 	-e "s#%%email%%#$email#g" \
 	-e "s#%%maxinst%%#$maxinst#g" \
diff --git a/pkginfo.in b/pkginfo.in
index 92aa254..cf0302f 100644
--- a/pkginfo.in
+++ b/pkginfo.in
@@ -8,5 +8,4 @@ EMAIL="%%email%%"
 PSTAMP="%%pstamp%%"
 BASEDIR="%%topinstalldir%%"
 CLASSES="none"
-DESC="%%pkgdesc%%"
 MAXINST="%%maxinst%%"