|
11811
|
1 |
diff -urN -x'*.orig' rarian-0.6.0/config.h.in ../SUNWgnome-libs-2.20.1.hacked/rarian-0.6.0/config.h.in
|
|
|
2 |
--- rarian-0.6.0/config.h.in 2007-09-12 18:03:28.000000000 +0000
|
|
|
3 |
+++ ../SUNWgnome-libs-2.20.1.hacked/rarian-0.6.0/config.h.in 2008-02-19 15:48:22.440903000 +0000
|
|
|
4 |
@@ -45,6 +45,10 @@
|
|
|
5 |
/* Define to 1 if you have the <unistd.h> header file. */
|
|
|
6 |
#undef HAVE_UNISTD_H
|
|
11674
|
7 |
|
|
11811
|
8 |
+/*
|
|
|
9 |
+/* Define to 1 if you have the nawk. */
|
|
11674
|
10 |
+#undef HAVE_NAWK
|
|
|
11 |
+
|
|
11811
|
12 |
/* Name of package */
|
|
|
13 |
#undef PACKAGE
|
|
11674
|
14 |
|
|
11811
|
15 |
diff -urN -x'*.orig' rarian-0.6.0/configure.ac ../SUNWgnome-libs-2.20.1.hacked/rarian-0.6.0/configure.ac
|
|
|
16 |
--- rarian-0.6.0/configure.ac 2007-09-12 18:00:33.000000000 +0000
|
|
|
17 |
+++ ../SUNWgnome-libs-2.20.1.hacked/rarian-0.6.0/configure.ac 2008-02-19 15:50:16.504781000 +0000
|
|
|
18 |
@@ -156,6 +156,8 @@
|
|
11674
|
19 |
|
|
11811
|
20 |
AC_PATH_PROG(have_bash, bash)
|
|
|
21 |
|
|
|
22 |
+AC_PATH_PROG(have_nawk, nawk)
|
|
11674
|
23 |
+
|
|
11811
|
24 |
AC_SUBST(BASH, $have_bash)
|
|
11674
|
25 |
|
|
11811
|
26 |
# Checks for header files.
|
|
|
27 |
diff -urN -x'*.orig' rarian-0.6.0/util/rarian-sk-update.in ../SUNWgnome-libs-2.20.1.hacked/rarian-0.6.0/util/rarian-sk-update.in
|
|
|
28 |
--- rarian-0.6.0/util/rarian-sk-update.in 2007-09-01 17:22:35.000000000 +0000
|
|
|
29 |
+++ ../SUNWgnome-libs-2.20.1.hacked/rarian-0.6.0/util/rarian-sk-update.in 2008-02-19 16:13:18.177300000 +0000
|
|
11674
|
30 |
@@ -149,13 +149,13 @@
|
|
|
31 |
skip_directory ()
|
|
|
32 |
{
|
|
|
33 |
read line
|
|
|
34 |
- time=`echo $line | awk -F ":@:" '{print $1}'`
|
|
11811
|
35 |
+ time=`echo $line | @AWK@ -F ":@:" '{print $1}'`
|
|
11674
|
36 |
while [[ $time -ne 0 ]]
|
|
|
37 |
do
|
|
|
38 |
echo $line
|
|
|
39 |
echo $line >> $tmpdir/rarian-updates
|
|
|
40 |
read line
|
|
|
41 |
- time=`echo $line | awk -F ":@:" '{print $1}'`
|
|
11811
|
42 |
+ time=`echo $line | @AWK@ -F ":@:" '{print $1}'`
|
|
11674
|
43 |
done
|
|
|
44 |
}
|
|
|
45 |
|
|
|
46 |
@@ -205,11 +205,11 @@
|
|
|
47 |
|
|
|
48 |
read line
|
|
|
49 |
|
|
|
50 |
- old_time=`echo $line | awk -F ":@:" '{print $1}'`
|
|
11811
|
51 |
+ old_time=`echo $line | @AWK@ -F ":@:" '{print $1}'`
|
|
11674
|
52 |
|
|
|
53 |
while [[ $old_time && $old_time != "0" ]]
|
|
|
54 |
do
|
|
|
55 |
- name=`echo $line | awk -F ":@:" '{print $2}'`
|
|
11811
|
56 |
+ name=`echo $line | @AWK@ -F ":@:" '{print $2}'`
|
|
11674
|
57 |
|
|
|
58 |
dirs_contains $name
|
|
|
59 |
|
|
|
60 |
@@ -224,7 +224,7 @@
|
|
|
61 |
echo $line >> $tmpdir/rarian-updates
|
|
|
62 |
fi
|
|
|
63 |
else
|
|
|
64 |
- filenames=`echo $line | awk -F ":@:" '{print $3}'`
|
|
11811
|
65 |
+ filenames=`echo $line | @AWK@ -F ":@:" '{print $3}'`
|
|
11674
|
66 |
while [[ $filenames ]]
|
|
|
67 |
do
|
|
|
68 |
entry=`echo $filenames | cut -d ';' -f 1`
|
|
|
69 |
@@ -237,7 +237,7 @@
|
|
|
70 |
fi
|
|
|
71 |
|
|
|
72 |
read line
|
|
|
73 |
- old_time=`echo $line | awk -F ":@:" '{print $1}'`
|
|
11811
|
74 |
+ old_time=`echo $line | @AWK@ -F ":@:" '{print $1}'`
|
|
11674
|
75 |
done
|
|
|
76 |
|
|
|
77 |
for i in ${entries[@]}
|
|
13526
|
78 |
@@ -264,9 +264,7 @@
|
|
11674
|
79 |
# They are inherited from scrollkeeper :(
|
|
|
80 |
|
|
|
81 |
# We use TEMP as set -- seems to nuke the return value of getopt
|
|
|
82 |
-TEMP=`getopt -u -n$(basename $0) -o "o:r:p:vqnhV" \
|
|
13526
|
83 |
- -- "$@"` \
|
|
11674
|
84 |
- || print_usage
|
|
11811
|
85 |
+TEMP=`getopt "o:r:p:vqnhV"` || print_usage
|
|
11674
|
86 |
|
|
|
87 |
if [ $? != 0 ] ; then
|
|
|
88 |
print_usage
|
|
11811
|
89 |
@@ -369,7 +369,7 @@
|
|
11674
|
90 |
exec < $statedir/rarian-update-mtimes
|
|
|
91 |
|
|
|
92 |
read line
|
|
|
93 |
-fname=`echo $line | awk -F ":@:" '{print $2}'`
|
|
11811
|
94 |
+fname=`echo $line | @AWK@ -F ":@:" '{print $2}'`
|
|
11674
|
95 |
|
|
|
96 |
|
|
|
97 |
while [[ $fname != "" ]]
|
|
11811
|
98 |
@@ -387,7 +387,7 @@
|
|
11674
|
99 |
else
|
|
|
100 |
skip_directory
|
|
|
101 |
fi
|
|
|
102 |
- fname=`echo $line | awk -F ":@:" '{print $2}'`
|
|
11811
|
103 |
+ fname=`echo $line | @AWK@ -F ":@:" '{print $2}'`
|
|
11674
|
104 |
fi
|
|
|
105 |
done
|
|
|
106 |
|
|
11811
|
107 |
@@ -416,4 +416,4 @@
|
|
11674
|
108 |
fi
|
|
|
109 |
rm -rf $tmpdir
|
|
|
110 |
|
|
|
111 |
-fi # ENABLE_OMF_READ
|
|
|
112 |
\ No newline at end of file
|
|
|
113 |
+fi # ENABLE_OMF_READ
|