From 1919360026d2a45a7e4fb2ce102088c0ff5221ce Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sun, 11 Jun 2006 09:47:37 +0000
Subject: [PATCH] Allow both specattrs like hide and ops from metadir/ops on a
 file. Perform variable expansion on files entries in pkgde.

---
 buildpkg.packaging.irix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/buildpkg.packaging.irix b/buildpkg.packaging.irix
index 660e29c..362284c 100644
--- a/buildpkg.packaging.irix
+++ b/buildpkg.packaging.irix
@@ -309,14 +309,17 @@ add_files()
 	    fi
 	    doop=$(check_ops "$i")
 	    fname=$(fix_fname "$i")
+	    if [ ! -z "$doop" ]; then
+		if [ ! -z "$specattr" ]; then
+		    specattr="$specattr $doop"
+		else
+		    specattr=$doop
+		fi
+	    fi
 	    if [ ! -z "$specattr" ]; then
 		echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat} $specattr" >>$idbfile
 	    else
-		if [ ! -z "$doop" ]; then
-		    echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat} $doop" >>$idbfile
-		else
-		    echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat}" >>$idbfile
-		fi
+		echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat}" >>$idbfile
 	    fi
 
 	done
@@ -784,9 +787,9 @@ parse_def()
                 else # Perhaps we hit 'files'?
                     if [ "${line:0:5}" == "files" ]; then
                         triplet="${line:6:((${#line}-5-2))}"
-                        defaultperms=$(echo $triplet | $AWK -F, '{ print $1 }')
-                        defaultuid=$(echo $triplet | $AWK -F, '{ print $2 }')
-                        defaultgid=$(echo $triplet | $AWK -F, '{ print $3 }')
+                        defaultperms=$(_upls $(echo $triplet | $AWK -F, '{ print $1 }'))
+                        defaultuid=$(_upls $(echo $triplet | $AWK -F, '{ print $2 }'))
+                        defaultgid=$(_upls $(echo $triplet | $AWK -F, '{ print $3 }'))
                         foundfiles=1
                     else
                         if [ $foundfiles -eq 1 ]; then # We already found the 'files' line so this must be the filelist