Revision numbers on packages now being bumped, moved files around in Apple packages to the correct folders (adjusting for conflicts), added numerous Java packages, and fixed dependencies on findutils, coreutils, inetutils, and gnupg.

git-svn-id: http://svn.telesphoreo.org/trunk@11 514c082c-b64e-11dc-b46d-3d985efe055d

1 files changed, 18 insertions, 5 deletions

diff --git a/data/diskdev-cmds/make.sh b/data/diskdev-cmds/make.sh
index 469b34568..96affc5d6 100644
--- a/data/diskdev-cmds/make.sh
+++ b/data/diskdev-cmds/make.sh
@@ -1,20 +1,33 @@
 shopt -s extglob
-tar -zxvf "${PKG_DATA}/diskdev_cmds-419.tar.gz"
-cd diskdev_cmds-419
+pkg:extract
+cd *
+
 cd disklib
 rm -f mntopts.h getmntopts.c
 arm-apple-darwin-gcc -c *.c
 arm-apple-darwin-ar -r libdisk.a *.o
 cd ..
+
 for tproj in !(fstyp|dev_mkdb|dump|fsck_hfs|fuser|mount_hfs|restore|quotacheck|ufs).tproj; do
     tproj=$(basename "${tproj}" .tproj)
     echo ${tproj}
     arm-apple-darwin-gcc -Idisklib -o "${tproj}" $(find "${tproj}.tproj" -name '*.c') disklib/libdisk.a -framework IOKit -framework CoreFoundation -lutil
-    pkg:usrbin "${tproj}"
+    arm-apple-darwin-strip "${tproj}"
 done
+
 cd fstyp.tproj
 for c in *.c; do
-    bin=$(basename "${c}" .c)
+    bin=../$(basename "${c}" .c)
     arm-apple-darwin-gcc -o "${bin}" "${c}"
-    pkg:usrbin "${bin}"
+    arm-apple-darwin-strip "${bin}"
 done
+cd ..
+
+chmod u+s umount quota
+
+pkg: mkdir -p /usr/bin /usr/libexec /usr/sbin /sbin
+
+pkg: cp -a quota /usr/bin
+pkg: cp -a vsdbutil repquota fdisk edquota quot quotaon /usr/sbin
+pkg: cp -a vndevice /usr/libexec
+pkg: cp -a clri dumpfs tunefs umount @(fsck|fstyp|mount|newfs)?(_*([a-z0-9])) /sbin