Index: ossp-pkg/cfg/devtool.conf
RCS File: /v/ossp/cvs/ossp-pkg/cfg/devtool.conf,v
rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/cfg/devtool.conf,v' 2>/dev/null
--- devtool.conf	2003/11/10 19:15:54	1.12
+++ devtool.conf	2003/11/17 10:37:03	1.13
@@ -29,7 +29,7 @@
 ##
 
 %autogen
-    @autogen shtool   1.6.2 "1.6.*" all
+    @autogen shtool   1.6.2 "1.6.*" echo fixperm install mkdir tarball version
     @autogen libtool  1.5   "1.[45]*"
     @autogen autoconf 2.58  "2.5[4-9]*"
 
@@ -53,13 +53,14 @@
     ./devtool upload
 
 %version
-    ./shtool version -l c -n "OSSP cfg" -p "__cfg_" -e cfg_vers.c
-	V=`./shtool version -lc -dlong cfg_vers.c`
-	sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
+    ./shtool version -lc -n "OSSP cfg" -p "cfg_" -e cfg_vers.c
+    V=`./shtool version -lc -dlong cfg_vers.c`
+    sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
 
 %tag
-	V=`./shtool version -lc -dshort cfg_vers.c | sed -e 's;\.;_;g'`
+    V=`./shtool version -lc -dshort cfg_vers.c | sed -e 's;\.;_;g'`
     echo "+++ tagging CVS sources as CFG_${V}"
+    cvs commit -m 'flush pending changes before tagging'
     cvs tag CFG_${V}
 
 %dist
@@ -69,7 +70,7 @@
     ./devtool autoclean
     ./devtool autogen
     echo "+++ configuring"
-    ./configure
+    ./devtool configure
     echo "+++ building"
     make clean all man
     echo "+++ cleaning"
@@ -77,7 +78,7 @@
     echo "+++ fixing"
     ./shtool fixperm -v .
     echo "+++ rolling"
-	V=`./shtool version -lc -dshort cfg_vers.c`
+    V=`./shtool version -lc -dshort cfg_vers.c`
     ./shtool tarball -o cfg-${V}.tar.gz -d cfg-${V} -u ossp -g ossp \
                      -e 'CVS,\.cvsignore,\.[ao]$,^\.,devtool*,*.tar.gz,^#.*,.*~$' -c 'gzip --best' .
     ls -l cfg-${V}.tar.gz
@@ -88,6 +89,6 @@
 
 %upload
     echo "+++ copying to ftp://ftp.ossp.org/pkg/lib/cfg/"
-	V=`./shtool version -lc -dshort cfg_vers.c`
+    V=`./shtool version -lc -dshort cfg_vers.c`
     scp cfg-${V}.tar.gz master.ossp.org:/e/ossp/ftp/pkg/lib/cfg/
 
Index: ossp-pkg/fsl/devtool.conf
RCS File: /v/ossp/cvs/ossp-pkg/fsl/devtool.conf,v
rcsdiff -q -kk '-r1.20' '-r1.21' -u '/v/ossp/cvs/ossp-pkg/fsl/devtool.conf,v' 2>/dev/null
--- devtool.conf	2003/10/28 15:27:01	1.20
+++ devtool.conf	2003/11/17 10:37:03	1.21
@@ -10,9 +10,9 @@
     done
 
 %autogen
-    @autogen shtool   1.6.2 "1.6.*" all
+    @autogen shtool   1.6.2 "1.6.*" echo fixperm install mkdir tarball version
     @autogen libtool  1.5 "1.[45]*"
-    @autogen autoconf 2.57  "2.5[4-9]*"
+    @autogen autoconf 2.58  "2.5[4-9]*"
 
     for name in l2 cfg pcre; do
         echo "===> lib_${name} (devtool autogen)"
@@ -37,7 +37,7 @@
         --disable-shared \
         --enable-maintainer \
         --enable-debug \
-       #--with-fsl-debuglogcode=yes \
+        --with-fsl-debuglogcode=yes \
         "$@"
 
 %release
@@ -47,9 +47,9 @@
     ./devtool upload
 
 %version
-    ./shtool version -l c -n "OSSP fsl" -p "fsl_" -e fsl_version.c
+    ./shtool version -lc -n "OSSP fsl" -p "fsl_" -e fsl_version.c
     V=`./shtool version -lc -dlong fsl_version.c`
-    sed -e "s/Version .*/Version $V/g" <README >README.n && mv README.n README
+    sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
 
 %tag
     V=`./shtool version -lc -dshort fsl_version.c | sed -e 's;\.;_;g'`
Index: ossp-pkg/l2/devtool.conf
RCS File: /v/ossp/cvs/ossp-pkg/l2/devtool.conf,v
rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/l2/devtool.conf,v' 2>/dev/null
--- devtool.conf	2003/10/28 15:27:02	1.12
+++ devtool.conf	2003/11/17 10:37:04	1.13
@@ -29,9 +29,9 @@
 ##
 
 %autogen
-    @autogen shtool   1.6.2 "1.6.*" all
-    @autogen libtool  1.5 "1.[45]*"
-    @autogen autoconf 2.57  "2.5[6-9]*"
+    @autogen shtool   1.6.2 "1.6.*" echo fixperm install mkdir tarball version
+    @autogen libtool  1.5   "1.[45]*"
+    @autogen autoconf 2.58  "2.5[4-9]*"
 
 %autoclean
     @autoclean shtool
@@ -53,13 +53,12 @@
     ./devtool upload
 
 %version
-    ./shtool version -l c -n "OSSP l2" -p l2_ -e l2_version.c
-    V=`./shtool version -l c -d long l2_version.c`
-    sed -e "s/Version .*(.*)/Version $V/g" <README >README.n
-    mv README.n README
+    ./shtool version -lc -n "OSSP l2" -p "l2_" -e l2_version.c
+    V=`./shtool version -lc -dlong l2_version.c`
+    sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
 
 %tag
-    V=`./shtool version -l c -d short l2_version.c | sed -e 's;\.;_;g'`
+    V=`./shtool version -lc -dshort l2_version.c | sed -e 's;\.;_;g'`
     echo "+++ tagging CVS sources as L2_${V}"
     cvs commit -m 'flush pending changes before tagging'
     cvs tag L2_${V}
@@ -71,7 +70,7 @@
     ./devtool autoclean
     ./devtool autogen
     echo "+++ configuring"
-    ./configure
+    ./devtool configure
     echo "+++ building"
     make clean all man
     echo "+++ cleaning"
@@ -79,7 +78,7 @@
     echo "+++ fixing"
     ./shtool fixperm -v .
     echo "+++ rolling"
-    V=`./shtool version -l c -d short l2_version.c`
+    V=`./shtool version -lc -dshort l2_version.c`
     ./shtool tarball -o l2-${V}.tar.gz -d l2-${V} -u ossp -g ossp \
                      -e 'CVS,\.cvsignore,\.[ao]$,^\.,devtool*,*.tar.gz,^#.*,.*~$' -c 'gzip --best' .
     ls -l l2-${V}.tar.gz
@@ -90,6 +89,6 @@
 
 %upload
     echo "+++ copying to ftp://ftp.ossp.org/pkg/lib/l2/"
-    V=`./shtool version -l c -d short l2_version.c`
+    V=`./shtool version -lc -dshort l2_version.c`
     scp l2-${V}.tar.gz master.ossp.org:/e/ossp/ftp/pkg/lib/l2/
 
Index: ossp-pkg/pcre/devtool.conf
RCS File: /v/ossp/cvs/ossp-pkg/pcre/devtool.conf,v
rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/pcre/devtool.conf,v' 2>/dev/null
--- devtool.conf	2003/10/28 15:27:02	1.6
+++ devtool.conf	2003/11/17 10:37:04	1.7
@@ -3,9 +3,9 @@
 ##
 
 %autogen
-    @autogen shtool   1.6.2 "1.6.*" echo install mkdir fixperm tarball
-    @autogen libtool  1.5 "1.[45]*"
-    @autogen autoconf 2.57  "2.5[3-9]*"
+    @autogen shtool   1.6.2 "1.6.*" echo fixperm install mkdir tarball version
+    @autogen libtool  1.5   "1.[45]*"
+    @autogen autoconf 2.58  "2.5[4-9]*"
 
 %autoclean
     @autoclean shtool