16 files changed, 153 insertions, 20 deletions
diff --git a/data/jocstrap/_metadata/version b/data/jocstrap/_metadata/version
index 1553d35df..af32f10f3 100644
--- a/data/jocstrap/_metadata/version
+++ b/data/jocstrap/_metadata/version
@@ -1 +1 @@
-1.0.2365
+1.0.2382
diff --git a/data/jocstrap/jocstrap-1.0.2382.tgz b/data/jocstrap/jocstrap-1.0.2382.tgz
new file mode 100644
index 000000000..4c7034d33
--- /dev/null
+++ b/data/jocstrap/jocstrap-1.0.2382.tgz
diff --git a/data/jocstrap/jocstrap.jar b/data/jocstrap/jocstrap.jar
deleted file mode 100644
index 75c32aafc..000000000
--- a/data/jocstrap/jocstrap.jar
+++ /dev/null
diff --git a/data/jocstrap/libjocstrap.jnilib b/data/jocstrap/libjocstrap.jnilib
deleted file mode 100755
index 9621f72d1..000000000
--- a/data/jocstrap/libjocstrap.jnilib
+++ /dev/null
diff --git a/data/jocstrap/make.sh b/data/jocstrap/make.sh
index 4b6668d9e..6272e3f96 100644
--- a/data/jocstrap/make.sh
+++ b/data/jocstrap/make.sh
@@ -1,3 +1,7 @@
+pkg:extract
+cd jocstrap-*
+make
 pkg: mkdir -p /usr/lib /usr/share/java
-pkg: cp %/libjocstrap.jnilib /usr/lib
-pkg: cp %/jocstrap.jar /usr/share/java
+pkg: cp -a libobjc-sig.dylib /usr/lib
+pkg: cp -a libjocstrap.jnilib /usr/lib
+pkg: cp -a jocstrap.jar /usr/share/java
diff --git a/data/jocstrap/minimal-2378.tgz b/data/jocstrap/minimal-2378.tgz
new file mode 100644
index 000000000..602860854
--- /dev/null
+++ b/data/jocstrap/minimal-2378.tgz
diff --git a/data/mobileterminal/_metadata/ncurses.dep b/data/mobileterminal/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/mobileterminal/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/mobileterminal/_metadata/version b/data/mobileterminal/_metadata/version
index 7fba2b437..305aa9857 100644
--- a/data/mobileterminal/_metadata/version
+++ b/data/mobileterminal/_metadata/version
@@ -1 +1 @@
-209
+273
diff --git a/data/mobileterminal/cstring.diff b/data/mobileterminal/cstring.diff
new file mode 100644
index 000000000..7a31a47c1
--- /dev/null
+++ b/data/mobileterminal/cstring.diff
@@ -0,0 +1,52 @@
+diff -ru mobileterminal-273/MobileTerminal.m mobileterminal-273+iPhone/MobileTerminal.m
+--- mobileterminal-273/MobileTerminal.m	2008-03-29 02:42:18.000000000 +0000
++++ mobileterminal-273+iPhone/MobileTerminal.m	2008-04-09 11:50:57.000000000 +0000
+@@ -174,7 +174,7 @@
+ 
+ - (void)handleInputFromMenu:(NSString*)input
+ {
+-  [process write:[input cString] length:[input length]];
++  [process write:[input UTF8String] length:[input length]];
+ }
+ 
+ - (void)toggleKeyboard
+diff -ru mobileterminal-273/PTYTextView.m mobileterminal-273+iPhone/PTYTextView.m
+--- mobileterminal-273/PTYTextView.m	2007-10-01 08:23:11.000000000 +0000
++++ mobileterminal-273+iPhone/PTYTextView.m	2008-04-09 11:59:25.000000000 +0000
+@@ -179,7 +179,7 @@
+ 
+ - (void)setupTextForContext:(CGContextRef)context
+ {
+-  const char* font = [[[Settings sharedInstance] font] cString];
++  const char* font = [[[Settings sharedInstance] font] UTF8String];
+ 
+   if(!fontRef) {
+     // First time through: cache the fontRef. This lookup is expensive.
+diff -ru mobileterminal-273/SubProcess.m mobileterminal-273+iPhone/SubProcess.m
+--- mobileterminal-273/SubProcess.m	2008-02-06 14:40:02.000000000 +0000
++++ mobileterminal-273+iPhone/SubProcess.m	2008-04-09 11:55:42.000000000 +0000
+@@ -134,7 +134,7 @@
+ - (void)failure:(NSString*)message;
+ {
+   // HACK: Just pretend the message came from the child
+-  [delegate handleStreamOutput:[message cString] length:[message length]];
++  [delegate handleStreamOutput:[message UTF8String] length:[message length]];
+ }
+ 
+ - (void)setWidth:(int)width height:(int)height
+diff -ru mobileterminal-273/VT100Terminal.m mobileterminal-273+iPhone/VT100Terminal.m
+--- mobileterminal-273/VT100Terminal.m	2007-10-01 08:23:11.000000000 +0000
++++ mobileterminal-273+iPhone/VT100Terminal.m	2008-04-09 11:55:55.000000000 +0000
+@@ -1226,10 +1226,10 @@
+ 
+   int i;
+   int r;
+-  setupterm((char *)[termtype cString], fileno(stdout), &r);
++  setupterm((char *)[termtype UTF8String], fileno(stdout), &r);
+ 
+   if (r!=1) {
+-    NSLog(@"Terminal type %s is not defined.\n",[termtype cString]);
++    NSLog(@"Terminal type %s is not defined.\n",[termtype UTF8String]);
+     for(i = 0; i < TERMINFO_KEYS; i ++) {
+       if (key_strings[i]) free(key_strings[i]);
+       key_strings[i]=NULL;
diff --git a/data/mobileterminal/drawrect.diff b/data/mobileterminal/drawrect.diff
new file mode 100644
index 000000000..e92f81b22
--- /dev/null
+++ b/data/mobileterminal/drawrect.diff
@@ -0,0 +1,12 @@
+diff -ru mobileterminal-273/GestureView.m mobileterminal-273+iPhone/GestureView.m
+--- mobileterminal-273/GestureView.m	2007-10-08 05:00:47.000000000 +0000
++++ mobileterminal-273+iPhone/GestureView.m	2008-04-09 12:02:22.000000000 +0000
+@@ -95,7 +95,7 @@
+   return NO;
+ }
+ 
+-- (void)drawRect: (CGRect *)rect
++- (void)drawRect: (CGRect)rect
+ {
+ }
+ 
diff --git a/data/mobileterminal/gcc42.diff b/data/mobileterminal/gcc42.diff
new file mode 100644
index 000000000..fd8740e78
--- /dev/null
+++ b/data/mobileterminal/gcc42.diff
@@ -0,0 +1,31 @@
+diff -ru mobileterminal-273/ColorMap.m mobileterminal-273+iPhone/ColorMap.m
+--- mobileterminal-273/ColorMap.m	2007-10-01 08:23:11.000000000 +0000
++++ mobileterminal-273+iPhone/ColorMap.m	2008-04-09 11:57:06.000000000 +0000
+@@ -144,7 +144,7 @@
+ 
+ - (CGColorRef)colorForCode:(unsigned int) index
+ {
+-  CGColorRef color;
++  CGColorRef color = NULL;
+ 
+   if (index & DEFAULT_FG_COLOR_CODE) {  // special colors?
+     switch (index) {
+diff -ru mobileterminal-273/ShellKeyboard.m mobileterminal-273+iPhone/ShellKeyboard.m
+--- mobileterminal-273/ShellKeyboard.m	2007-10-01 08:23:11.000000000 +0000
++++ mobileterminal-273+iPhone/ShellKeyboard.m	2008-04-09 11:52:43.000000000 +0000
+@@ -37,6 +37,7 @@
+ - (BOOL)webView:(id)fp8 shouldDeleteDOMRange:(id)fp12
+ {
+   [shellKeyboard handleKeyPress:0x08];
++  return YES;
+ }
+ 
+ - (BOOL)webView:(id)fp8 shouldInsertText:(id)character
+@@ -48,6 +49,7 @@
+     return false;
+   }
+   [shellKeyboard handleKeyPress:[character characterAtIndex:0]];
++  return YES;
+ }
+ 
+ @end
diff --git a/data/mobileterminal/gliw.diff b/data/mobileterminal/gliw.diff
index d78e117d5..00753b5c0 100644
--- a/data/mobileterminal/gliw.diff
+++ b/data/mobileterminal/gliw.diff
@@ -1,7 +1,6 @@
-Only in mobileterminal+iPhone: ColorMap.o
-diff -ru mobileterminal/GestureView.m mobileterminal+iPhone/GestureView.m
---- mobileterminal/GestureView.m	2007-10-08 05:00:47.000000000 +0000
-+++ mobileterminal+iPhone/GestureView.m	2008-02-23 08:58:30.000000000 +0000
+diff -ru mobileterminal-273/GestureView.m mobileterminal-273+iPhone/GestureView.m
+--- mobileterminal-273/GestureView.m	2007-10-08 05:00:47.000000000 +0000
++++ mobileterminal-273+iPhone/GestureView.m	2008-04-09 12:02:22.000000000 +0000
 @@ -19,7 +19,7 @@
  - (void)mouseDown:(GSEvent *)event
  {
@@ -20,15 +19,3 @@ diff -ru mobileterminal/GestureView.m mobileterminal+iPhone/GestureView.m
    CGPoint vector = CGPointMake(end.x - start.x, end.y - start.y);
  
    float absx = (vector.x > 0) ? vector.x : -vector.x;
-Only in mobileterminal+iPhone: GestureView.o
-Only in mobileterminal+iPhone: main.o
-Only in mobileterminal+iPhone: MobileTerminal.o
-Only in mobileterminal+iPhone: PieView.o
-Only in mobileterminal+iPhone: PTYTextView.o
-Only in mobileterminal+iPhone: PTYTile.o
-Only in mobileterminal+iPhone: Settings.o
-Only in mobileterminal+iPhone: ShellKeyboard.o
-Only in mobileterminal+iPhone: SubProcess.o
-Only in mobileterminal+iPhone: Terminal
-Only in mobileterminal+iPhone: VT100Screen.o
-Only in mobileterminal+iPhone: VT100Terminal.o
diff --git a/data/mobileterminal/import.diff b/data/mobileterminal/import.diff
new file mode 100644
index 000000000..aacabb5fc
--- /dev/null
+++ b/data/mobileterminal/import.diff
@@ -0,0 +1,36 @@
+diff -ru mobileterminal-273/MobileTerminal.h mobileterminal-273+iPhone/MobileTerminal.h
+--- mobileterminal-273/MobileTerminal.h	2007-10-08 05:00:47.000000000 +0000
++++ mobileterminal-273+iPhone/MobileTerminal.h	2008-04-09 11:50:48.000000000 +0000
+@@ -1,5 +1,6 @@
+ // MobileTermina.h
+ #import <UIKit/UIKit.h>
++#import <Foundation/Foundation.h>
+ #import <GraphicsServices/GraphicsServices.h>
+ 
+ @class PTYTextView;
+diff -ru mobileterminal-273/PieView.m mobileterminal-273+iPhone/PieView.m
+--- mobileterminal-273/PieView.m	2007-10-08 05:00:47.000000000 +0000
++++ mobileterminal-273+iPhone/PieView.m	2008-04-09 12:06:49.000000000 +0000
+@@ -1,3 +1,4 @@
++#import <Foundation/Foundation.h>
+ #import "PieView.h"
+ 
+ @implementation PieView
+diff -ru mobileterminal-273/PTYTextView.h mobileterminal-273+iPhone/PTYTextView.h
+--- mobileterminal-273/PTYTextView.h	2007-10-01 08:23:11.000000000 +0000
++++ mobileterminal-273+iPhone/PTYTextView.h	2008-04-09 11:55:17.000000000 +0000
+@@ -1,4 +1,5 @@
+ // PTYTextView.h
++#import <CoreGraphics/CoreGraphics.h>
+ #import <UIKit/UIKit.h>
+ #import <UIKit/UITiledView.h>
+ 
+diff -ru mobileterminal-273/ShellKeyboard.h mobileterminal-273+iPhone/ShellKeyboard.h
+--- mobileterminal-273/ShellKeyboard.h	2007-10-08 05:00:47.000000000 +0000
++++ mobileterminal-273+iPhone/ShellKeyboard.h	2008-04-09 11:51:26.000000000 +0000
+@@ -1,4 +1,5 @@
+ // ShellKeyboard.h
++#import <Foundation/Foundation.h>
+ #import <UIKit/UIKit.h>
+ #import <UIKit/UITextView.h>
+ 
diff --git a/data/mobileterminal/mobileterminal-209.tgz b/data/mobileterminal/mobileterminal-209.tgz
deleted file mode 100644
index 15e4354c1..000000000
--- a/data/mobileterminal/mobileterminal-209.tgz
+++ /dev/null
diff --git a/data/mobileterminal/mobileterminal-273.tgz b/data/mobileterminal/mobileterminal-273.tgz
new file mode 100644
index 000000000..46894a65c
--- /dev/null
+++ b/data/mobileterminal/mobileterminal-273.tgz
diff --git a/data/mobileterminal/werror.diff b/data/mobileterminal/werror.diff
new file mode 100644
index 000000000..76f6a9ff3
--- /dev/null
+++ b/data/mobileterminal/werror.diff
@@ -0,0 +1,10 @@
+diff -ru mobileterminal-273/Makefile mobileterminal-273+iPhone/Makefile
+--- mobileterminal-273/Makefile	2007-10-01 08:23:11.000000000 +0000
++++ mobileterminal-273+iPhone/Makefile	2008-04-09 12:22:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ CC=arm-apple-darwin-gcc
+-CFLAGS=-Wall -Werror -O7
++CFLAGS=-Wall -O7
+ LDFLAGS=-lobjc -framework CoreFoundation -framework Foundation \
+         -framework UIKit -framework LayerKit -framework CoreGraphics \
+         -framework GraphicsServices -lcurses