Finally merging latest builds of JocStrap and UICaboodle, bringing the latter build environment in-house.

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

4 files changed, 5 insertions, 3 deletions

diff --git a/data/jocstrap/_metadata/version b/data/jocstrap/_metadata/version
index af32f10f3..05af0f1c9 100644
--- a/data/jocstrap/_metadata/version
+++ b/data/jocstrap/_metadata/version
@@ -1 +1 @@
-1.0.2382
+1.0.2466
diff --git a/data/jocstrap/jocstrap-1.0.2382.tgz b/data/jocstrap/jocstrap-1.0.2382.tgz
deleted file mode 100644
index 4c7034d33..000000000
--- a/data/jocstrap/jocstrap-1.0.2382.tgz
+++ /dev/null
diff --git a/data/jocstrap/jocstrap-1.0.2466.tgz b/data/jocstrap/jocstrap-1.0.2466.tgz
new file mode 100644
index 000000000..effa6d34b
--- /dev/null
+++ b/data/jocstrap/jocstrap-1.0.2466.tgz
diff --git a/data/jocstrap/make.sh b/data/jocstrap/make.sh
index 6272e3f96..a9be213ed 100644
--- a/data/jocstrap/make.sh
+++ b/data/jocstrap/make.sh
@@ -1,7 +1,9 @@
 pkg:extract
 cd jocstrap-*
-make
-pkg: mkdir -p /usr/lib /usr/share/java
+# XXX: omg this is stupid
+PKG_ROOT2=/apl/sys/ad8 make
+pkg: mkdir -p /usr/include/joc /usr/lib /usr/share/java
+cp -a source/joc/*.h "${PKG_DEST}"/usr/include/joc
 pkg: cp -a libobjc-sig.dylib /usr/lib
 pkg: cp -a libjocstrap.jnilib /usr/lib
 pkg: cp -a jocstrap.jar /usr/share/java